apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge 4.7-rc4 into staging-next

Browse Source 
We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2016-06-20 08:25:44 -07:00
parent 25ed6a5e97 33688abb28
commit af52739b92
561 changed files with 5221 additions and 3344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.mailmap
+2
View File
@@ -89,6 +89,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
Linas Vepstas <linas@austin.ibm.com> Linas Vepstas <linas@austin.ibm.com>
Mark Brown <broonie@sirena.org.uk> Mark Brown <broonie@sirena.org.uk>
Matthieu CASTET <castet.matthieu@free.fr> Matthieu CASTET <castet.matthieu@free.fr>
Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com>
Mayuresh Janorkar <mayur@ti.com> Mayuresh Janorkar <mayur@ti.com>
Michael Buesch <m@bues.ch> Michael Buesch <m@bues.ch>
Michel Dänzer <michel@tungstengraphics.com> Michel Dänzer <michel@tungstengraphics.com>
@@ -122,6 +123,7 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org>
Sascha Hauer <s.hauer@pengutronix.de> Sascha Hauer <s.hauer@pengutronix.de>
S.Çağlar Onur <caglar@pardus.org.tr> S.Çağlar Onur <caglar@pardus.org.tr>
Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com> Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> <shuah.khan@hp.com> <shuahkh@osg.samsung.com> <shuah.kh@samsung.com>
Simon Kelley <simon@thekelleys.org.uk> Simon Kelley <simon@thekelleys.org.uk>
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr> Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
Stephen Hemminger <shemminger@osdl.org> Stephen Hemminger <shemminger@osdl.org>
CREDITS
+1
View File
@@ -649,6 +649,7 @@ D: Configure, Menuconfig, xconfig
N: Mauro Carvalho Chehab N: Mauro Carvalho Chehab
E: m.chehab@samsung.org E: m.chehab@samsung.org
E: mchehab@osg.samsung.com
E: mchehab@infradead.org E: mchehab@infradead.org
D: Media subsystem (V4L/DVB) drivers and core D: Media subsystem (V4L/DVB) drivers and core
D: EDAC drivers and EDAC 3.0 core rework D: EDAC drivers and EDAC 3.0 core rework
Documentation/ABI/testing/configfs-usb-gadget-uvc
+29 -29
View File
@@ -1,6 +1,6 @@
What: /config/usb-gadget/gadget/functions/uvc.name What: /config/usb-gadget/gadget/functions/uvc.name
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: UVC function directory Description: UVC function directory
streaming_maxburst - 0..15 (ss only) streaming_maxburst - 0..15 (ss only)
@@ -9,37 +9,37 @@ Description: UVC function directory
What: /config/usb-gadget/gadget/functions/uvc.name/control What: /config/usb-gadget/gadget/functions/uvc.name/control
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Control descriptors Description: Control descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/control/class What: /config/usb-gadget/gadget/functions/uvc.name/control/class
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Class descriptors Description: Class descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/control/class/ss What: /config/usb-gadget/gadget/functions/uvc.name/control/class/ss
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Super speed control class descriptors Description: Super speed control class descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/control/class/fs What: /config/usb-gadget/gadget/functions/uvc.name/control/class/fs
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Full speed control class descriptors Description: Full speed control class descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Terminal descriptors Description: Terminal descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/output What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/output
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Output terminal descriptors Description: Output terminal descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/output/default What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/output/default
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Default output terminal descriptors Description: Default output terminal descriptors
All attributes read only: All attributes read only:
@@ -53,12 +53,12 @@ Description: Default output terminal descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Camera terminal descriptors Description: Camera terminal descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera/default What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera/default
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Default camera terminal descriptors Description: Default camera terminal descriptors
All attributes read only: All attributes read only:
@@ -75,12 +75,12 @@ Description: Default camera terminal descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/control/processing What: /config/usb-gadget/gadget/functions/uvc.name/control/processing
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Processing unit descriptors Description: Processing unit descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/control/processing/default What: /config/usb-gadget/gadget/functions/uvc.name/control/processing/default
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Default processing unit descriptors Description: Default processing unit descriptors
All attributes read only: All attributes read only:
@@ -94,49 +94,49 @@ Description: Default processing unit descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/control/header What: /config/usb-gadget/gadget/functions/uvc.name/control/header
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Control header descriptors Description: Control header descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/control/header/name What: /config/usb-gadget/gadget/functions/uvc.name/control/header/name
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Specific control header descriptors Description: Specific control header descriptors
dwClockFrequency dwClockFrequency
bcdUVC bcdUVC
What: /config/usb-gadget/gadget/functions/uvc.name/streaming What: /config/usb-gadget/gadget/functions/uvc.name/streaming
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Streaming descriptors Description: Streaming descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Streaming class descriptors Description: Streaming class descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/ss What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/ss
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Super speed streaming class descriptors Description: Super speed streaming class descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/hs What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/hs
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: High speed streaming class descriptors Description: High speed streaming class descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/fs What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/fs
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Full speed streaming class descriptors Description: Full speed streaming class descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching What: /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Color matching descriptors Description: Color matching descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching/default What: /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching/default
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Default color matching descriptors Description: Default color matching descriptors
All attributes read only: All attributes read only:
@@ -150,12 +150,12 @@ Description: Default color matching descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg What: /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: MJPEG format descriptors Description: MJPEG format descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name What: /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Specific MJPEG format descriptors Description: Specific MJPEG format descriptors
All attributes read only, All attributes read only,
@@ -174,7 +174,7 @@ Description: Specific MJPEG format descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name/name What: /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name/name
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Specific MJPEG frame descriptors Description: Specific MJPEG frame descriptors
dwFrameInterval - indicates how frame interval can be dwFrameInterval - indicates how frame interval can be
@@ -196,12 +196,12 @@ Description: Specific MJPEG frame descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed What: /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Uncompressed format descriptors Description: Uncompressed format descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name What: /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Specific uncompressed format descriptors Description: Specific uncompressed format descriptors
bmaControls - this format's data for bmaControls in bmaControls - this format's data for bmaControls in
@@ -221,7 +221,7 @@ Description: Specific uncompressed format descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name/name What: /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name/name
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Specific uncompressed frame descriptors Description: Specific uncompressed frame descriptors
dwFrameInterval - indicates how frame interval can be dwFrameInterval - indicates how frame interval can be
@@ -243,12 +243,12 @@ Description: Specific uncompressed frame descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/header What: /config/usb-gadget/gadget/functions/uvc.name/streaming/header
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Streaming header descriptors Description: Streaming header descriptors
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/header/name What: /config/usb-gadget/gadget/functions/uvc.name/streaming/header/name
Date: Dec 2014 Date: Dec 2014
KernelVersion: 3.20 KernelVersion: 4.0
Description: Specific streaming header descriptors Description: Specific streaming header descriptors
All attributes read only: All attributes read only:
Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
+1 -1
View File
@@ -1,4 +1,4 @@
What /sys/bus/iio/devices/iio:deviceX/in_proximity_raw What /sys/bus/iio/devices/iio:deviceX/in_proximity_input
Date: March 2014 Date: March 2014
KernelVersion: 3.15 KernelVersion: 3.15
Contact: Matt Ranostay <mranostay@gmail.com> Contact: Matt Ranostay <mranostay@gmail.com>
Documentation/devicetree/bindings/hwmon/ina2xx.txt
+1
View File
@@ -7,6 +7,7 @@ Required properties:
- "ti,ina220" for ina220 - "ti,ina220" for ina220
- "ti,ina226" for ina226 - "ti,ina226" for ina226
- "ti,ina230" for ina230 - "ti,ina230" for ina230
- "ti,ina231" for ina231
- reg: I2C address - reg: I2C address
Optional properties: Optional properties:
Documentation/devicetree/bindings/i2c/i2c-arb-gpio-challenge.txt
+2 -2
View File
@@ -44,8 +44,8 @@ Required properties:
- our-claim-gpio: The GPIO that we use to claim the bus. - our-claim-gpio: The GPIO that we use to claim the bus.
- their-claim-gpios: The GPIOs that the other sides use to claim the bus. - their-claim-gpios: The GPIOs that the other sides use to claim the bus.
Note that some implementations may only support a single other master. Note that some implementations may only support a single other master.
- Standard I2C mux properties. See mux.txt in this directory. - Standard I2C mux properties. See i2c-mux.txt in this directory.
- Single I2C child bus node at reg 0. See mux.txt in this directory. - Single I2C child bus node at reg 0. See i2c-mux.txt in this directory.
Optional properties: Optional properties:
- slew-delay-us: microseconds to wait for a GPIO to go high. Default is 10 us. - slew-delay-us: microseconds to wait for a GPIO to go high. Default is 10 us.
Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.txt
+2 -1
View File
@@ -27,7 +27,8 @@ Required properties:
- i2c-bus-name: The name of this bus. Also needed as pinctrl-name for the I2C - i2c-bus-name: The name of this bus. Also needed as pinctrl-name for the I2C
parents. parents.
Furthermore, I2C mux properties and child nodes. See mux.txt in this directory. Furthermore, I2C mux properties and child nodes. See i2c-mux.txt in this
directory.
Example: Example:
Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt
+3 -3
View File
@@ -22,8 +22,8 @@ Required properties:
- i2c-parent: The phandle of the I2C bus that this multiplexer's master-side - i2c-parent: The phandle of the I2C bus that this multiplexer's master-side
port is connected to. port is connected to.
- mux-gpios: list of gpios used to control the muxer - mux-gpios: list of gpios used to control the muxer
* Standard I2C mux properties. See mux.txt in this directory. * Standard I2C mux properties. See i2c-mux.txt in this directory.
* I2C child bus nodes. See mux.txt in this directory. * I2C child bus nodes. See i2c-mux.txt in this directory.
Optional properties: Optional properties:
- idle-state: value to set the muxer to when idle. When no value is - idle-state: value to set the muxer to when idle. When no value is
@@ -33,7 +33,7 @@ For each i2c child node, an I2C child bus will be created. They will
be numbered based on their order in the device tree. be numbered based on their order in the device tree.
Whenever an access is made to a device on a child bus, the value set Whenever an access is made to a device on a child bus, the value set
in the revelant node's reg property will be output using the list of in the relevant node's reg property will be output using the list of
GPIOs, the first in the list holding the least-significant value. GPIOs, the first in the list holding the least-significant value.
If an idle state is defined, using the idle-state (optional) property, If an idle state is defined, using the idle-state (optional) property,
Documentation/devicetree/bindings/i2c/i2c-mux-pinctrl.txt
+2 -2
View File
@@ -28,9 +28,9 @@ Also required are:
* Standard pinctrl properties that specify the pin mux state for each child * Standard pinctrl properties that specify the pin mux state for each child
bus. See ../pinctrl/pinctrl-bindings.txt. bus. See ../pinctrl/pinctrl-bindings.txt.
* Standard I2C mux properties. See mux.txt in this directory. * Standard I2C mux properties. See i2c-mux.txt in this directory.
* I2C child bus nodes. See mux.txt in this directory. * I2C child bus nodes. See i2c-mux.txt in this directory.
For each named state defined in the pinctrl-names property, an I2C child bus For each named state defined in the pinctrl-names property, an I2C child bus
will be created. I2C child bus numbers are assigned based on the index into will be created. I2C child bus numbers are assigned based on the index into
Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt
+3 -3
View File
@@ -7,8 +7,8 @@ Required properties:
- compatible: i2c-mux-reg - compatible: i2c-mux-reg
- i2c-parent: The phandle of the I2C bus that this multiplexer's master-side - i2c-parent: The phandle of the I2C bus that this multiplexer's master-side
port is connected to. port is connected to.
* Standard I2C mux properties. See mux.txt in this directory. * Standard I2C mux properties. See i2c-mux.txt in this directory.
* I2C child bus nodes. See mux.txt in this directory. * I2C child bus nodes. See i2c-mux.txt in this directory.
Optional properties: Optional properties:
- reg: this pair of <offset size> specifies the register to control the mux. - reg: this pair of <offset size> specifies the register to control the mux.
@@ -24,7 +24,7 @@ Optional properties:
given, it defaults to the last value used. given, it defaults to the last value used.
Whenever an access is made to a device on a child bus, the value set Whenever an access is made to a device on a child bus, the value set
in the revelant node's reg property will be output to the register. in the relevant node's reg property will be output to the register.
If an idle state is defined, using the idle-state (optional) property, If an idle state is defined, using the idle-state (optional) property,
whenever an access is not being made to a device on a child bus, the whenever an access is not being made to a device on a child bus, the
Documentation/devicetree/bindings/net/marvell-bt-sd8xxx.txt
+4 -4
View File
@@ -13,10 +13,10 @@ Optional properties:
initialization. This is an array of 28 values(u8). initialization. This is an array of 28 values(u8).
- marvell,wakeup-pin: It represents wakeup pin number of the bluetooth chip. - marvell,wakeup-pin: It represents wakeup pin number of the bluetooth chip.
firmware will use the pin to wakeup host system. firmware will use the pin to wakeup host system (u16).
- marvell,wakeup-gap-ms: wakeup gap represents wakeup latency of the host - marvell,wakeup-gap-ms: wakeup gap represents wakeup latency of the host
platform. The value will be configured to firmware. This platform. The value will be configured to firmware. This
is needed to work chip's sleep feature as expected. is needed to work chip's sleep feature as expected (u16).
- interrupt-parent: phandle of the parent interrupt controller - interrupt-parent: phandle of the parent interrupt controller
- interrupts : interrupt pin number to the cpu. Driver will request an irq based - interrupts : interrupt pin number to the cpu. Driver will request an irq based
on this interrupt number. During system suspend, the irq will be on this interrupt number. During system suspend, the irq will be
@@ -50,7 +50,7 @@ calibration data is also available in below example.
0x37 0x01 0x1c 0x00 0xff 0xff 0xff 0xff 0x01 0x7f 0x04 0x02 0x37 0x01 0x1c 0x00 0xff 0xff 0xff 0xff 0x01 0x7f 0x04 0x02
0x00 0x00 0xba 0xce 0xc0 0xc6 0x2d 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0xba 0xce 0xc0 0xc6 0x2d 0x00 0x00 0x00 0x00 0x00
0x00 0x00 0xf0 0x00>; 0x00 0x00 0xf0 0x00>;
marvell,wakeup-pin = <0x0d>; marvell,wakeup-pin = /bits/ 16 <0x0d>;
marvell,wakeup-gap-ms = <0x64>; marvell,wakeup-gap-ms = /bits/ 16 <0x64>;
}; };
}; };
Documentation/devicetree/bindings/vendor-prefixes.txt
+2
View File
@@ -255,6 +255,7 @@ synology Synology, Inc.
SUNW Sun Microsystems, Inc SUNW Sun Microsystems, Inc
tbs TBS Technologies tbs TBS Technologies
tcl Toby Churchill Ltd. tcl Toby Churchill Ltd.
technexion TechNexion
technologic Technologic Systems technologic Technologic Systems
thine THine Electronics, Inc. thine THine Electronics, Inc.
ti Texas Instruments ti Texas Instruments
@@ -269,6 +270,7 @@ tronsmart Tronsmart
truly Truly Semiconductors Limited truly Truly Semiconductors Limited
tyan Tyan Computer Corporation tyan Tyan Computer Corporation
upisemi uPI Semiconductor Corp. upisemi uPI Semiconductor Corp.
uniwest United Western Technologies Corp (UniWest)
urt United Radiant Technology Corporation urt United Radiant Technology Corporation
usi Universal Scientific Industrial Co., Ltd. usi Universal Scientific Industrial Co., Ltd.
v3 V3 Semiconductor v3 V3 Semiconductor
Documentation/leds/leds-class.txt
+2 -2
View File
@@ -74,8 +74,8 @@ blink_set() function (see <linux/leds.h>). To set an LED to blinking,
however, it is better to use the API function led_blink_set(), as it however, it is better to use the API function led_blink_set(), as it
will check and implement software fallback if necessary. will check and implement software fallback if necessary.
To turn off blinking again, use the API function led_brightness_set() To turn off blinking, use the API function led_brightness_set()
as that will not just set the LED brightness but also stop any software with brightness value LED_OFF, which should stop any software
timers that may have been required for blinking. timers that may have been required for blinking.
The blink_set() function should choose a user friendly blinking value The blink_set() function should choose a user friendly blinking value
MAINTAINERS
+45 -23
View File
@@ -1159,6 +1159,7 @@ F: arch/arm/mach-footbridge/
ARM/FREESCALE IMX / MXC ARM ARCHITECTURE ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
M: Shawn Guo <shawnguo@kernel.org> M: Shawn Guo <shawnguo@kernel.org>
M: Sascha Hauer <kernel@pengutronix.de> M: Sascha Hauer <kernel@pengutronix.de>
R: Fabio Estevam <fabio.estevam@nxp.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
@@ -2242,7 +2243,8 @@ F: include/net/ax25.h
F: net/ax25/ F: net/ax25/
AZ6007 DVB DRIVER AZ6007 DVB DRIVER
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
W: https://linuxtv.org W: https://linuxtv.org
T: git git://linuxtv.org/media_tree.git T: git git://linuxtv.org/media_tree.git
@@ -2709,7 +2711,8 @@ F: Documentation/filesystems/btrfs.txt
F: fs/btrfs/ F: fs/btrfs/
BTTV VIDEO4LINUX DRIVER BTTV VIDEO4LINUX DRIVER
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
W: https://linuxtv.org W: https://linuxtv.org
T: git git://linuxtv.org/media_tree.git T: git git://linuxtv.org/media_tree.git
@@ -3086,6 +3089,7 @@ M: Stephen Boyd <sboyd@codeaurora.org>
L: linux-clk@vger.kernel.org L: linux-clk@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
S: Maintained S: Maintained
F: Documentation/devicetree/bindings/clock/
F: drivers/clk/ F: drivers/clk/
X: drivers/clk/clkdev.c X: drivers/clk/clkdev.c
F: include/linux/clk-pr* F: include/linux/clk-pr*
@@ -3343,7 +3347,8 @@ S: Maintained
F: drivers/media/dvb-frontends/cx24120* F: drivers/media/dvb-frontends/cx24120*
CX88 VIDEO4LINUX DRIVER CX88 VIDEO4LINUX DRIVER
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
W: https://linuxtv.org W: https://linuxtv.org
T: git git://linuxtv.org/media_tree.git T: git git://linuxtv.org/media_tree.git
@@ -3773,6 +3778,7 @@ Q: https://patchwork.kernel.org/project/linux-dmaengine/list/
S: Maintained S: Maintained
F: drivers/dma/ F: drivers/dma/
F: include/linux/dmaengine.h F: include/linux/dmaengine.h
F: Documentation/devicetree/bindings/dma/
F: Documentation/dmaengine/ F: Documentation/dmaengine/
T: git git://git.infradead.org/users/vkoul/slave-dma.git T: git git://git.infradead.org/users/vkoul/slave-dma.git
@@ -4290,7 +4296,8 @@ F: fs/ecryptfs/
EDAC-CORE EDAC-CORE
M: Doug Thompson <dougthompson@xmission.com> M: Doug Thompson <dougthompson@xmission.com>
M: Borislav Petkov <bp@alien8.de> M: Borislav Petkov <bp@alien8.de>
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
L: linux-edac@vger.kernel.org L: linux-edac@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next T: git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
@@ -4335,7 +4342,8 @@ S: Maintained
F: drivers/edac/e7xxx_edac.c F: drivers/edac/e7xxx_edac.c
EDAC-GHES EDAC-GHES
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
L: linux-edac@vger.kernel.org L: linux-edac@vger.kernel.org
S: Maintained S: Maintained
F: drivers/edac/ghes_edac.c F: drivers/edac/ghes_edac.c
@@ -4359,19 +4367,22 @@ S: Maintained
F: drivers/edac/i5000_edac.c F: drivers/edac/i5000_edac.c
EDAC-I5400 EDAC-I5400
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
L: linux-edac@vger.kernel.org L: linux-edac@vger.kernel.org
S: Maintained S: Maintained
F: drivers/edac/i5400_edac.c F: drivers/edac/i5400_edac.c
EDAC-I7300 EDAC-I7300
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
L: linux-edac@vger.kernel.org L: linux-edac@vger.kernel.org
S: Maintained S: Maintained
F: drivers/edac/i7300_edac.c F: drivers/edac/i7300_edac.c
EDAC-I7CORE EDAC-I7CORE
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
L: linux-edac@vger.kernel.org L: linux-edac@vger.kernel.org
S: Maintained S: Maintained
F: drivers/edac/i7core_edac.c F: drivers/edac/i7core_edac.c
@@ -4408,7 +4419,8 @@ S: Maintained
F: drivers/edac/r82600_edac.c F: drivers/edac/r82600_edac.c
EDAC-SBRIDGE EDAC-SBRIDGE
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
L: linux-edac@vger.kernel.org L: linux-edac@vger.kernel.org
S: Maintained S: Maintained
F: drivers/edac/sb_edac.c F: drivers/edac/sb_edac.c
@@ -4467,7 +4479,8 @@ S: Maintained
F: drivers/net/ethernet/ibm/ehea/ F: drivers/net/ethernet/ibm/ehea/
EM28XX VIDEO4LINUX DRIVER EM28XX VIDEO4LINUX DRIVER
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
W: https://linuxtv.org W: https://linuxtv.org
T: git git://linuxtv.org/media_tree.git T: git git://linuxtv.org/media_tree.git
@@ -6487,6 +6500,7 @@ F: include/uapi/linux/sunrpc/
KERNEL SELFTEST FRAMEWORK KERNEL SELFTEST FRAMEWORK
M: Shuah Khan <shuahkh@osg.samsung.com> M: Shuah Khan <shuahkh@osg.samsung.com>
M: Shuah Khan <shuah@kernel.org>
L: linux-kselftest@vger.kernel.org L: linux-kselftest@vger.kernel.org
T: git git://git.kernel.org/pub/scm/shuah/linux-kselftest T: git git://git.kernel.org/pub/scm/shuah/linux-kselftest
S: Maintained S: Maintained
@@ -7358,7 +7372,8 @@ S: Supported
F: drivers/media/pci/netup_unidvb/* F: drivers/media/pci/netup_unidvb/*
MEDIA INPUT INFRASTRUCTURE (V4L/DVB) MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
P: LinuxTV.org Project P: LinuxTV.org Project
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
W: https://linuxtv.org W: https://linuxtv.org
@@ -8009,6 +8024,7 @@ Q: http://patchwork.kernel.org/project/linux-wireless/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
S: Maintained S: Maintained
F: Documentation/devicetree/bindings/net/wireless/
F: drivers/net/wireless/ F: drivers/net/wireless/
NETXEN (1/10) GbE SUPPORT NETXEN (1/10) GbE SUPPORT
@@ -8406,10 +8422,9 @@ F: drivers/i2c/busses/i2c-ocores.c
OPEN FIRMWARE AND FLATTENED DEVICE TREE OPEN FIRMWARE AND FLATTENED DEVICE TREE
M: Rob Herring <robh+dt@kernel.org> M: Rob Herring <robh+dt@kernel.org>
M: Frank Rowand <frowand.list@gmail.com> M: Frank Rowand <frowand.list@gmail.com>
M: Grant Likely <grant.likely@linaro.org>
L: devicetree@vger.kernel.org L: devicetree@vger.kernel.org
W: http://www.devicetree.org/ W: http://www.devicetree.org/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
S: Maintained S: Maintained
F: drivers/of/ F: drivers/of/
F: include/linux/of*.h F: include/linux/of*.h
@@ -8417,12 +8432,10 @@ F: scripts/dtc/
OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
M: Rob Herring <robh+dt@kernel.org> M: Rob Herring <robh+dt@kernel.org>
M: Pawel Moll <pawel.moll@arm.com>
M: Mark Rutland <mark.rutland@arm.com> M: Mark Rutland <mark.rutland@arm.com>
M: Ian Campbell <ijc+devicetree@hellion.org.uk>
M: Kumar Gala <galak@codeaurora.org>
L: devicetree@vger.kernel.org L: devicetree@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
Q: http://patchwork.ozlabs.org/project/devicetree-bindings/list/
S: Maintained S: Maintained
F: Documentation/devicetree/ F: Documentation/devicetree/
F: arch/*/boot/dts/ F: arch/*/boot/dts/
@@ -9854,7 +9867,8 @@ S: Odd Fixes
F: drivers/media/i2c/saa6588* F: drivers/media/i2c/saa6588*
SAA7134 VIDEO4LINUX DRIVER SAA7134 VIDEO4LINUX DRIVER
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
W: https://linuxtv.org W: https://linuxtv.org
T: git git://linuxtv.org/media_tree.git T: git git://linuxtv.org/media_tree.git
@@ -10373,7 +10387,8 @@ S: Maintained
F: drivers/media/radio/si4713/radio-usb-si4713.c F: drivers/media/radio/si4713/radio-usb-si4713.c
SIANO DVB DRIVER SIANO DVB DRIVER
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
W: https://linuxtv.org W: https://linuxtv.org
T: git git://linuxtv.org/media_tree.git T: git git://linuxtv.org/media_tree.git
@@ -11140,7 +11155,8 @@ S: Maintained
F: drivers/media/i2c/tda9840* F: drivers/media/i2c/tda9840*
TEA5761 TUNER DRIVER TEA5761 TUNER DRIVER
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
W: https://linuxtv.org W: https://linuxtv.org
T: git git://linuxtv.org/media_tree.git T: git git://linuxtv.org/media_tree.git
@@ -11148,7 +11164,8 @@ S: Odd fixes
F: drivers/media/tuners/tea5761.* F: drivers/media/tuners/tea5761.*
TEA5767 TUNER DRIVER TEA5767 TUNER DRIVER
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
W: https://linuxtv.org W: https://linuxtv.org
T: git git://linuxtv.org/media_tree.git T: git git://linuxtv.org/media_tree.git
@@ -11535,7 +11552,8 @@ F: include/linux/shmem_fs.h
F: mm/shmem.c F: mm/shmem.c
TM6000 VIDEO4LINUX DRIVER TM6000 VIDEO4LINUX DRIVER
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
W: https://linuxtv.org W: https://linuxtv.org
T: git git://linuxtv.org/media_tree.git T: git git://linuxtv.org/media_tree.git
@@ -11889,7 +11907,8 @@ F: drivers/usb/common/usb-otg-fsm.c
USB OVER IP DRIVER USB OVER IP DRIVER
M: Valentina Manea <valentina.manea.m@gmail.com> M: Valentina Manea <valentina.manea.m@gmail.com>
M: Shuah Khan <shuah.kh@samsung.com> M: Shuah Khan <shuahkh@osg.samsung.com>
M: Shuah Khan <shuah@kernel.org>
L: linux-usb@vger.kernel.org L: linux-usb@vger.kernel.org
S: Maintained S: Maintained
F: Documentation/usb/usbip_protocol.txt F: Documentation/usb/usbip_protocol.txt
@@ -11960,6 +11979,7 @@ L: linux-usb@vger.kernel.org
W: http://www.linux-usb.org W: http://www.linux-usb.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
S: Supported S: Supported
F: Documentation/devicetree/bindings/usb/
F: Documentation/usb/ F: Documentation/usb/
F: drivers/usb/ F: drivers/usb/
F: include/linux/usb.h F: include/linux/usb.h
@@ -12133,6 +12153,7 @@ VIRTIO CORE, NET AND BLOCK DRIVERS
M: "Michael S. Tsirkin" <mst@redhat.com> M: "Michael S. Tsirkin" <mst@redhat.com>
L: virtualization@lists.linux-foundation.org L: virtualization@lists.linux-foundation.org
S: Maintained S: Maintained
F: Documentation/devicetree/bindings/virtio/
F: drivers/virtio/ F: drivers/virtio/
F: tools/virtio/ F: tools/virtio/
F: drivers/net/virtio_net.c F: drivers/net/virtio_net.c
@@ -12521,7 +12542,8 @@ S: Maintained
F: arch/x86/entry/vdso/ F: arch/x86/entry/vdso/
XC2028/3028 TUNER DRIVER XC2028/3028 TUNER DRIVER
M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
M: Mauro Carvalho Chehab <mchehab@kernel.org>
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
W: https://linuxtv.org W: https://linuxtv.org
T: git git://linuxtv.org/media_tree.git T: git git://linuxtv.org/media_tree.git
Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
VERSION = 4 VERSION = 4
PATCHLEVEL = 7 PATCHLEVEL = 7
SUBLEVEL = 0 SUBLEVEL = 0
EXTRAVERSION = -rc2 EXTRAVERSION = -rc4
NAME = Psychotic Stoned Sheep NAME = Psychotic Stoned Sheep
# *DOCUMENTATION* # *DOCUMENTATION*
arch/Kconfig
+3
View File
@@ -606,6 +606,9 @@ config HAVE_ARCH_HASH
file which provides platform-specific implementations of some file which provides platform-specific implementations of some
functions in <linux/hash.h> or fs/namei.c. functions in <linux/hash.h> or fs/namei.c.
config ISA_BUS_API
def_bool ISA
# #
# ABI hall of shame # ABI hall of shame
# #
arch/arc/Kconfig
+4 -27
View File
@@ -61,7 +61,7 @@ config RWSEM_GENERIC_SPINLOCK
def_bool y def_bool y
config ARCH_DISCONTIGMEM_ENABLE config ARCH_DISCONTIGMEM_ENABLE
def_bool y def_bool n
config ARCH_FLATMEM_ENABLE config ARCH_FLATMEM_ENABLE
def_bool y def_bool y
@@ -186,9 +186,6 @@ if SMP
config ARC_HAS_COH_CACHES config ARC_HAS_COH_CACHES
def_bool n def_bool n
config ARC_HAS_REENTRANT_IRQ_LV2
def_bool n
config ARC_MCIP config ARC_MCIP
bool "ARConnect Multicore IP (MCIP) Support " bool "ARConnect Multicore IP (MCIP) Support "
depends on ISA_ARCV2 depends on ISA_ARCV2
@@ -366,25 +363,10 @@ config NODES_SHIFT
if ISA_ARCOMPACT if ISA_ARCOMPACT
config ARC_COMPACT_IRQ_LEVELS config ARC_COMPACT_IRQ_LEVELS
bool "ARCompact IRQ Priorities: High(2)/Low(1)" bool "Setup Timer IRQ as high Priority"
default n default n
# Timer HAS to be high priority, for any other high priority config
select ARC_IRQ3_LV2
# if SMP, LV2 enabled ONLY if ARC implementation has LV2 re-entrancy # if SMP, LV2 enabled ONLY if ARC implementation has LV2 re-entrancy
depends on !SMP || ARC_HAS_REENTRANT_IRQ_LV2 depends on !SMP
if ARC_COMPACT_IRQ_LEVELS
config ARC_IRQ3_LV2
bool
config ARC_IRQ5_LV2
bool
config ARC_IRQ6_LV2
bool
endif #ARC_COMPACT_IRQ_LEVELS
config ARC_FPU_SAVE_RESTORE config ARC_FPU_SAVE_RESTORE
bool "Enable FPU state persistence across context switch" bool "Enable FPU state persistence across context switch"
@@ -407,11 +389,6 @@ config ARC_HAS_LLSC
default y default y
depends on !ARC_CANT_LLSC depends on !ARC_CANT_LLSC
config ARC_STAR_9000923308
bool "Workaround for llock/scond livelock"
default n
depends on ISA_ARCV2 && SMP && ARC_HAS_LLSC
config ARC_HAS_SWAPE config ARC_HAS_SWAPE
bool "Insn: SWAPE (endian-swap)" bool "Insn: SWAPE (endian-swap)"
default y default y
@@ -471,7 +448,7 @@ config LINUX_LINK_BASE
config HIGHMEM config HIGHMEM
bool "High Memory Support" bool "High Memory Support"
select DISCONTIGMEM select ARCH_DISCONTIGMEM_ENABLE
help help
With ARC 2G:2G address split, only upper 2G is directly addressable by With ARC 2G:2G address split, only upper 2G is directly addressable by
kernel. Enable this to potentially allow access to rest of 2G and PAE kernel. Enable this to potentially allow access to rest of 2G and PAE
arch/arc/Makefile
+1 -1
View File
@@ -127,7 +127,7 @@ libs-y += arch/arc/lib/ $(LIBGCC)
boot := arch/arc/boot boot := arch/arc/boot
#default target for make without any arguements. #default target for make without any arguments.
KBUILD_IMAGE := bootpImage KBUILD_IMAGE := bootpImage
all: $(KBUILD_IMAGE) all: $(KBUILD_IMAGE)
arch/arc/boot/dts/abilis_tb100.dtsi
-2
View File
@@ -23,8 +23,6 @@
/ { / {
clock-frequency = <500000000>; /* 500 MHZ */
soc100 { soc100 {
bus-frequency = <166666666>; bus-frequency = <166666666>;
arch/arc/boot/dts/abilis_tb101.dtsi
-2
View File
@@ -23,8 +23,6 @@
/ { / {
clock-frequency = <500000000>; /* 500 MHZ */
soc100 { soc100 {
bus-frequency = <166666666>; bus-frequency = <166666666>;

Some files were not shown because too many files have changed in this diff Show More