Skip to content

Commit 5b1ad68

Browse files
KAGA-KOKOKAGA-KOKO
committed
Merge branch 'linus' into x86/mm
Make sure to get the latest fixes before applying the ptdump enhancements.
2 parents 1013fe3 + 7089db8 commit 5b1ad68

File tree

389 files changed

+3340
-1994
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

389 files changed

+3340
-1994
lines changed

‎Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ Properties:
1515
Second cell specifies the irq distribution mode to cores
1616
0=Round Robin; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3
1717

18+
The second cell in interrupts property is deprecated and may be ignored by
19+
the kernel.
20+
1821
intc accessed via the special ARC AUX register interface, hence "reg" property
1922
is not specified.
2023

‎Documentation/media/uapi/cec/cec-func-close.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ Arguments
3333
Description
3434
===========
3535
36-
.. note::
37-
38-
This documents the proposed CEC API. This API is not yet finalized
39-
and is currently only available as a staging kernel module.
40-
4136
Closes the cec device. Resources associated with the file descriptor are
4237
freed. The device configuration remain unchanged.
4338

‎Documentation/media/uapi/cec/cec-func-ioctl.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ Arguments
3939
Description
4040
===========
4141
42-
.. note::
43-
44-
This documents the proposed CEC API. This API is not yet finalized
45-
and is currently only available as a staging kernel module.
46-
4742
The :c:func:`ioctl()` function manipulates cec device parameters. The
4843
argument ``fd`` must be an open file descriptor.
4944

‎Documentation/media/uapi/cec/cec-func-open.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ Arguments
4646
Description
4747
===========
4848
49-
.. note::
50-
51-
This documents the proposed CEC API. This API is not yet finalized
52-
and is currently only available as a staging kernel module.
53-
5449
To open a cec device applications call :c:func:`open()` with the
5550
desired device name. The function has no side effects; the device
5651
configuration remain unchanged.

‎Documentation/media/uapi/cec/cec-func-poll.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ Arguments
3939
Description
4040
===========
4141
42-
.. note::
43-
44-
This documents the proposed CEC API. This API is not yet finalized
45-
and is currently only available as a staging kernel module.
46-
4742
With the :c:func:`poll()` function applications can wait for CEC
4843
events.
4944

‎Documentation/media/uapi/cec/cec-intro.rst

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
Introduction
44
============
55

6-
.. note::
7-
8-
This documents the proposed CEC API. This API is not yet finalized
9-
and is currently only available as a staging kernel module.
10-
116
HDMI connectors provide a single pin for use by the Consumer Electronics
127
Control protocol. This protocol allows different devices connected by an
138
HDMI cable to communicate. The protocol for CEC version 1.4 is defined
@@ -31,3 +26,15 @@ control just the CEC pin.
3126
Drivers that support CEC will create a CEC device node (/dev/cecX) to
3227
give userspace access to the CEC adapter. The
3328
:ref:`CEC_ADAP_G_CAPS` ioctl will tell userspace what it is allowed to do.
29+
30+
In order to check the support and test it, it is suggested to download
31+
the `v4l-utils <https://git.linuxtv.org/v4l-utils.git/>`_ package. It
32+
provides three tools to handle CEC:
33+
34+
- cec-ctl: the Swiss army knife of CEC. Allows you to configure, transmit
35+
and monitor CEC messages.
36+
37+
- cec-compliance: does a CEC compliance test of a remote CEC device to
38+
determine how compliant the CEC implementation is.
39+
40+
- cec-follower: emulates a CEC follower.

‎Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ Arguments
2929
Description
3030
===========
3131
32-
.. note::
33-
34-
This documents the proposed CEC API. This API is not yet finalized
35-
and is currently only available as a staging kernel module.
36-
3732
All cec devices must support :ref:`ioctl CEC_ADAP_G_CAPS <CEC_ADAP_G_CAPS>`. To query
3833
device information, applications call the ioctl with a pointer to a
3934
struct :c:type:`cec_caps`. The driver fills the structure and

‎Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ Arguments
3535
Description
3636
===========
3737
38-
.. note::
39-
40-
This documents the proposed CEC API. This API is not yet finalized
41-
and is currently only available as a staging kernel module.
42-
4338
To query the current CEC logical addresses, applications call
4439
:ref:`ioctl CEC_ADAP_G_LOG_ADDRS <CEC_ADAP_G_LOG_ADDRS>` with a pointer to a
4540
struct :c:type:`cec_log_addrs` where the driver stores the logical addresses.

‎Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ Arguments
3535
Description
3636
===========
3737
38-
.. note::
39-
40-
This documents the proposed CEC API. This API is not yet finalized
41-
and is currently only available as a staging kernel module.
42-
4338
To query the current physical address applications call
4439
:ref:`ioctl CEC_ADAP_G_PHYS_ADDR <CEC_ADAP_G_PHYS_ADDR>` with a pointer to a __u16 where the
4540
driver stores the physical address.

‎Documentation/media/uapi/cec/cec-ioc-dqevent.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ Arguments
3030
Description
3131
===========
3232
33-
.. note::
34-
35-
This documents the proposed CEC API. This API is not yet finalized
36-
and is currently only available as a staging kernel module.
37-
3833
CEC devices can send asynchronous events. These can be retrieved by
3934
calling :c:func:`CEC_DQEVENT`. If the file descriptor is in
4035
non-blocking mode and no event is pending, then it will return -1 and

‎Documentation/media/uapi/cec/cec-ioc-g-mode.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ Arguments
3131
Description
3232
===========
3333
34-
.. note::
35-
36-
This documents the proposed CEC API. This API is not yet finalized
37-
and is currently only available as a staging kernel module.
38-
3934
By default any filehandle can use :ref:`CEC_TRANSMIT`, but in order to prevent
4035
applications from stepping on each others toes it must be possible to
4136
obtain exclusive access to the CEC adapter. This ioctl sets the

‎Documentation/media/uapi/cec/cec-ioc-receive.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ Arguments
3434
Description
3535
===========
3636
37-
.. note::
38-
39-
This documents the proposed CEC API. This API is not yet finalized
40-
and is currently only available as a staging kernel module.
41-
4237
To receive a CEC message the application has to fill in the
4338
``timeout`` field of struct :c:type:`cec_msg` and pass it to
4439
:ref:`ioctl CEC_RECEIVE <CEC_RECEIVE>`.

‎MAINTAINERS

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,7 @@ F: arch/arm/boot/dts/aspeed-*
10911091
F: drivers/*/*aspeed*
10921092

10931093
ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
1094-
M: Nicolas Ferre <nicolas.ferre@atmel.com>
1094+
M: Nicolas Ferre <nicolas.ferre@microchip.com>
10951095
M: Alexandre Belloni <alexandre.belloni@free-electrons.com>
10961096
M: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
10971097
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1773,7 +1773,7 @@ F: drivers/soc/renesas/
17731773
F: include/linux/soc/renesas/
17741774

17751775
ARM/SOCFPGA ARCHITECTURE
1776-
M: Dinh Nguyen <dinguyen@opensource.altera.com>
1776+
M: Dinh Nguyen <dinguyen@kernel.org>
17771777
S: Maintained
17781778
F: arch/arm/mach-socfpga/
17791779
F: arch/arm/boot/dts/socfpga*
@@ -1783,7 +1783,7 @@ W: http://www.rocketboards.org
17831783
T: git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
17841784

17851785
ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT
1786-
M: Dinh Nguyen <dinguyen@opensource.altera.com>
1786+
M: Dinh Nguyen <dinguyen@kernel.org>
17871787
S: Maintained
17881788
F: drivers/clk/socfpga/
17891789

@@ -2175,56 +2175,56 @@ F: include/linux/atm*
21752175
F: include/uapi/linux/atm*
21762176

21772177
ATMEL AT91 / AT32 MCI DRIVER
2178-
M: Ludovic Desroches <ludovic.desroches@atmel.com>
2178+
M: Ludovic Desroches <ludovic.desroches@microchip.com>
21792179
S: Maintained
21802180
F: drivers/mmc/host/atmel-mci.c
21812181

21822182
ATMEL AT91 SAMA5D2-Compatible Shutdown Controller
2183-
M: Nicolas Ferre <nicolas.ferre@atmel.com>
2183+
M: Nicolas Ferre <nicolas.ferre@microchip.com>
21842184
S: Supported
21852185
F: drivers/power/reset/at91-sama5d2_shdwc.c
21862186

21872187
ATMEL SAMA5D2 ADC DRIVER
2188-
M: Ludovic Desroches <ludovic.desroches@atmel.com>
2188+
M: Ludovic Desroches <ludovic.desroches@microchip.com>
21892189
L: linux-iio@vger.kernel.org
21902190
S: Supported
21912191
F: drivers/iio/adc/at91-sama5d2_adc.c
21922192

21932193
ATMEL Audio ALSA driver
2194-
M: Nicolas Ferre <nicolas.ferre@atmel.com>
2194+
M: Nicolas Ferre <nicolas.ferre@microchip.com>
21952195
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
21962196
S: Supported
21972197
F: sound/soc/atmel
21982198

21992199
ATMEL XDMA DRIVER
2200-
M: Ludovic Desroches <ludovic.desroches@atmel.com>
2200+
M: Ludovic Desroches <ludovic.desroches@microchip.com>
22012201
L: linux-arm-kernel@lists.infradead.org
22022202
L: dmaengine@vger.kernel.org
22032203
S: Supported
22042204
F: drivers/dma/at_xdmac.c
22052205

22062206
ATMEL I2C DRIVER
2207-
M: Ludovic Desroches <ludovic.desroches@atmel.com>
2207+
M: Ludovic Desroches <ludovic.desroches@microchip.com>
22082208
L: linux-i2c@vger.kernel.org
22092209
S: Supported
22102210
F: drivers/i2c/busses/i2c-at91.c
22112211

22122212
ATMEL ISI DRIVER
2213-
M: Ludovic Desroches <ludovic.desroches@atmel.com>
2213+
M: Ludovic Desroches <ludovic.desroches@microchip.com>
22142214
L: linux-media@vger.kernel.org
22152215
S: Supported
22162216
F: drivers/media/platform/soc_camera/atmel-isi.c
22172217
F: include/media/atmel-isi.h
22182218

22192219
ATMEL LCDFB DRIVER
2220-
M: Nicolas Ferre <nicolas.ferre@atmel.com>
2220+
M: Nicolas Ferre <nicolas.ferre@microchip.com>
22212221
L: linux-fbdev@vger.kernel.org
22222222
S: Maintained
22232223
F: drivers/video/fbdev/atmel_lcdfb.c
22242224
F: include/video/atmel_lcdc.h
22252225

22262226
ATMEL MACB ETHERNET DRIVER
2227-
M: Nicolas Ferre <nicolas.ferre@atmel.com>
2227+
M: Nicolas Ferre <nicolas.ferre@microchip.com>
22282228
S: Supported
22292229
F: drivers/net/ethernet/cadence/
22302230

@@ -2236,32 +2236,32 @@ S: Supported
22362236
F: drivers/mtd/nand/atmel_nand*
22372237

22382238
ATMEL SDMMC DRIVER
2239-
M: Ludovic Desroches <ludovic.desroches@atmel.com>
2239+
M: Ludovic Desroches <ludovic.desroches@microchip.com>
22402240
L: linux-mmc@vger.kernel.org
22412241
S: Supported
22422242
F: drivers/mmc/host/sdhci-of-at91.c
22432243

22442244
ATMEL SPI DRIVER
2245-
M: Nicolas Ferre <nicolas.ferre@atmel.com>
2245+
M: Nicolas Ferre <nicolas.ferre@microchip.com>
22462246
S: Supported
22472247
F: drivers/spi/spi-atmel.*
22482248

22492249
ATMEL SSC DRIVER
2250-
M: Nicolas Ferre <nicolas.ferre@atmel.com>
2250+
M: Nicolas Ferre <nicolas.ferre@microchip.com>
22512251
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
22522252
S: Supported
22532253
F: drivers/misc/atmel-ssc.c
22542254
F: include/linux/atmel-ssc.h
22552255

22562256
ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS
2257-
M: Nicolas Ferre <nicolas.ferre@atmel.com>
2257+
M: Nicolas Ferre <nicolas.ferre@microchip.com>
22582258
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
22592259
S: Supported
22602260
F: drivers/misc/atmel_tclib.c
22612261
F: drivers/clocksource/tcb_clksrc.c
22622262

22632263
ATMEL USBA UDC DRIVER
2264-
M: Nicolas Ferre <nicolas.ferre@atmel.com>
2264+
M: Nicolas Ferre <nicolas.ferre@microchip.com>
22652265
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
22662266
S: Supported
22672267
F: drivers/usb/gadget/udc/atmel_usba_udc.*
@@ -9736,7 +9736,7 @@ S: Maintained
97369736
F: drivers/pinctrl/pinctrl-at91.*
97379737

97389738
PIN CONTROLLER - ATMEL AT91 PIO4
9739-
M: Ludovic Desroches <ludovic.desroches@atmel.com>
9739+
M: Ludovic Desroches <ludovic.desroches@microchip.com>
97409740
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
97419741
L: linux-gpio@vger.kernel.org
97429742
S: Supported
@@ -10195,7 +10195,6 @@ F: drivers/media/tuners/qt1010*
1019510195
QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
1019610196
M: QCA ath9k Development <ath9k-devel@qca.qualcomm.com>
1019710197
L: linux-wireless@vger.kernel.org
10198-
L: ath9k-devel@lists.ath9k.org
1019910198
W: http://wireless.kernel.org/en/users/Drivers/ath9k
1020010199
S: Supported
1020110200
F: drivers/net/wireless/ath/ath9k/
@@ -13066,7 +13065,7 @@ F: drivers/input/serio/userio.c
1306613065
F: include/uapi/linux/userio.h
1306713066

1306813067
VIRTIO CONSOLE DRIVER
13069-
M: Amit Shah <amit.shah@redhat.com>
13068+
M: Amit Shah <amit@kernel.org>
1307013069
L: virtualization@lists.linux-foundation.org
1307113070
S: Maintained
1307213071
F: drivers/char/virtio_console.c

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
VERSION = 4
22
PATCHLEVEL = 10
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc5
5-
NAME = Anniversary Edition
4+
EXTRAVERSION = -rc8
5+
NAME = Fearless Coyote
66

77
# *DOCUMENTATION*
88
# To see a list of typical targets execute "make help"
@@ -797,7 +797,7 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types)
797797
KBUILD_ARFLAGS := $(call ar-option,D)
798798

799799
# check for 'asm goto'
800-
ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y)
800+
ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
801801
KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
802802
KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
803803
endif

‎arch/arc/include/asm/delay.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ static inline void __delay(unsigned long loops)
2626
" lp 1f \n"
2727
" nop \n"
2828
"1: \n"
29-
: : "r"(loops));
29+
:
30+
: "r"(loops)
31+
: "lp_count");
3032
}
3133

3234
extern void __bad_udelay(void);

‎arch/arc/kernel/head.S

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ ENTRY(stext)
7171
GET_CPU_ID r5
7272
cmp r5, 0
7373
mov.nz r0, r5
74-
#ifdef CONFIG_ARC_SMP_HALT_ON_RESET
75-
; Non-Master can proceed as system would be booted sufficiently
76-
jnz first_lines_of_secondary
77-
#else
74+
bz .Lmaster_proceed
75+
7876
; Non-Masters wait for Master to boot enough and bring them up
79-
jnz arc_platform_smp_wait_to_boot
80-
#endif
81-
; Master falls thru
77+
; when they resume, tail-call to entry point
78+
mov blink, @first_lines_of_secondary
79+
j arc_platform_smp_wait_to_boot
80+
81+
.Lmaster_proceed:
8282
#endif
8383

8484
; Clear BSS before updating any globals

0 commit comments

Comments
 (0)