Skip to content

Commit 9e7f7f5

Browse files
author
Ingo Molnar
committed
Merge branch 'x86/mm' into x86/boot, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 6daa2ec + f80fd3a commit 9e7f7f5

File tree

727 files changed

+6789
-3938
lines changed

Some content is hidden

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

727 files changed

+6789
-3938
lines changed

‎.mailmap

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
2121
Andrew Morton <akpm@linux-foundation.org>
2222
Andrew Vasquez <andrew.vasquez@qlogic.com>
2323
Andy Adamson <andros@citi.umich.edu>
24+
Antoine Tenart <antoine.tenart@free-electrons.com>
2425
Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
2526
Archit Taneja <archit@ti.com>
2627
Arnaud Patard <arnaud.patard@rtp-net.org>
@@ -30,6 +31,9 @@ Axel Lin <axel.lin@gmail.com>
3031
Ben Gardner <bgardner@wabtec.com>
3132
Ben M Cahill <ben.m.cahill@intel.com>
3233
Björn Steinbrink <B.Steinbrink@gmx.de>
34+
Boris Brezillon <boris.brezillon@free-electrons.com>
35+
Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com>
36+
Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com>
3337
Brian Avery <b.avery@hp.com>
3438
Brian King <brking@us.ibm.com>
3539
Christoph Hellwig <hch@lst.de>
@@ -89,6 +93,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
8993
Linas Vepstas <linas@austin.ibm.com>
9094
Mark Brown <broonie@sirena.org.uk>
9195
Matthieu CASTET <castet.matthieu@free.fr>
96+
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>
9297
Mayuresh Janorkar <mayur@ti.com>
9398
Michael Buesch <m@bues.ch>
9499
Michel Dänzer <michel@tungstengraphics.com>
@@ -122,6 +127,7 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org>
122127
Sascha Hauer <s.hauer@pengutronix.de>
123128
S.Çağlar Onur <caglar@pardus.org.tr>
124129
Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
130+
Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> <shuah.khan@hp.com> <shuahkh@osg.samsung.com> <shuah.kh@samsung.com>
125131
Simon Kelley <simon@thekelleys.org.uk>
126132
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
127133
Stephen Hemminger <shemminger@osdl.org>

‎CREDITS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,7 @@ D: Configure, Menuconfig, xconfig
649649

650650
N: Mauro Carvalho Chehab
651651
E: m.chehab@samsung.org
652+
E: mchehab@osg.samsung.com
652653
E: mchehab@infradead.org
653654
D: Media subsystem (V4L/DVB) drivers and core
654655
D: EDAC drivers and EDAC 3.0 core rework

‎Documentation/ABI/testing/configfs-usb-gadget-uvc

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /config/usb-gadget/gadget/functions/uvc.name
22
Date: Dec 2014
3-
KernelVersion: 3.20
3+
KernelVersion: 4.0
44
Description: UVC function directory
55

66
streaming_maxburst - 0..15 (ss only)
@@ -9,37 +9,37 @@ Description: UVC function directory
99

1010
What: /config/usb-gadget/gadget/functions/uvc.name/control
1111
Date: Dec 2014
12-
KernelVersion: 3.20
12+
KernelVersion: 4.0
1313
Description: Control descriptors
1414

1515
What: /config/usb-gadget/gadget/functions/uvc.name/control/class
1616
Date: Dec 2014
17-
KernelVersion: 3.20
17+
KernelVersion: 4.0
1818
Description: Class descriptors
1919

2020
What: /config/usb-gadget/gadget/functions/uvc.name/control/class/ss
2121
Date: Dec 2014
22-
KernelVersion: 3.20
22+
KernelVersion: 4.0
2323
Description: Super speed control class descriptors
2424

2525
What: /config/usb-gadget/gadget/functions/uvc.name/control/class/fs
2626
Date: Dec 2014
27-
KernelVersion: 3.20
27+
KernelVersion: 4.0
2828
Description: Full speed control class descriptors
2929

3030
What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal
3131
Date: Dec 2014
32-
KernelVersion: 3.20
32+
KernelVersion: 4.0
3333
Description: Terminal descriptors
3434

3535
What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/output
3636
Date: Dec 2014
37-
KernelVersion: 3.20
37+
KernelVersion: 4.0
3838
Description: Output terminal descriptors
3939

4040
What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/output/default
4141
Date: Dec 2014
42-
KernelVersion: 3.20
42+
KernelVersion: 4.0
4343
Description: Default output terminal descriptors
4444

4545
All attributes read only:
@@ -53,12 +53,12 @@ Description: Default output terminal descriptors
5353

5454
What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera
5555
Date: Dec 2014
56-
KernelVersion: 3.20
56+
KernelVersion: 4.0
5757
Description: Camera terminal descriptors
5858

5959
What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera/default
6060
Date: Dec 2014
61-
KernelVersion: 3.20
61+
KernelVersion: 4.0
6262
Description: Default camera terminal descriptors
6363

6464
All attributes read only:
@@ -75,12 +75,12 @@ Description: Default camera terminal descriptors
7575

7676
What: /config/usb-gadget/gadget/functions/uvc.name/control/processing
7777
Date: Dec 2014
78-
KernelVersion: 3.20
78+
KernelVersion: 4.0
7979
Description: Processing unit descriptors
8080

8181
What: /config/usb-gadget/gadget/functions/uvc.name/control/processing/default
8282
Date: Dec 2014
83-
KernelVersion: 3.20
83+
KernelVersion: 4.0
8484
Description: Default processing unit descriptors
8585

8686
All attributes read only:
@@ -94,49 +94,49 @@ Description: Default processing unit descriptors
9494

9595
What: /config/usb-gadget/gadget/functions/uvc.name/control/header
9696
Date: Dec 2014
97-
KernelVersion: 3.20
97+
KernelVersion: 4.0
9898
Description: Control header descriptors
9999

100100
What: /config/usb-gadget/gadget/functions/uvc.name/control/header/name
101101
Date: Dec 2014
102-
KernelVersion: 3.20
102+
KernelVersion: 4.0
103103
Description: Specific control header descriptors
104104

105105
dwClockFrequency
106106
bcdUVC
107107
What: /config/usb-gadget/gadget/functions/uvc.name/streaming
108108
Date: Dec 2014
109-
KernelVersion: 3.20
109+
KernelVersion: 4.0
110110
Description: Streaming descriptors
111111

112112
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class
113113
Date: Dec 2014
114-
KernelVersion: 3.20
114+
KernelVersion: 4.0
115115
Description: Streaming class descriptors
116116

117117
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/ss
118118
Date: Dec 2014
119-
KernelVersion: 3.20
119+
KernelVersion: 4.0
120120
Description: Super speed streaming class descriptors
121121

122122
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/hs
123123
Date: Dec 2014
124-
KernelVersion: 3.20
124+
KernelVersion: 4.0
125125
Description: High speed streaming class descriptors
126126

127127
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/fs
128128
Date: Dec 2014
129-
KernelVersion: 3.20
129+
KernelVersion: 4.0
130130
Description: Full speed streaming class descriptors
131131

132132
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching
133133
Date: Dec 2014
134-
KernelVersion: 3.20
134+
KernelVersion: 4.0
135135
Description: Color matching descriptors
136136

137137
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching/default
138138
Date: Dec 2014
139-
KernelVersion: 3.20
139+
KernelVersion: 4.0
140140
Description: Default color matching descriptors
141141

142142
All attributes read only:
@@ -150,12 +150,12 @@ Description: Default color matching descriptors
150150

151151
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg
152152
Date: Dec 2014
153-
KernelVersion: 3.20
153+
KernelVersion: 4.0
154154
Description: MJPEG format descriptors
155155

156156
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name
157157
Date: Dec 2014
158-
KernelVersion: 3.20
158+
KernelVersion: 4.0
159159
Description: Specific MJPEG format descriptors
160160

161161
All attributes read only,
@@ -174,7 +174,7 @@ Description: Specific MJPEG format descriptors
174174

175175
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name/name
176176
Date: Dec 2014
177-
KernelVersion: 3.20
177+
KernelVersion: 4.0
178178
Description: Specific MJPEG frame descriptors
179179

180180
dwFrameInterval - indicates how frame interval can be
@@ -196,12 +196,12 @@ Description: Specific MJPEG frame descriptors
196196

197197
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed
198198
Date: Dec 2014
199-
KernelVersion: 3.20
199+
KernelVersion: 4.0
200200
Description: Uncompressed format descriptors
201201

202202
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name
203203
Date: Dec 2014
204-
KernelVersion: 3.20
204+
KernelVersion: 4.0
205205
Description: Specific uncompressed format descriptors
206206

207207
bmaControls - this format's data for bmaControls in
@@ -221,7 +221,7 @@ Description: Specific uncompressed format descriptors
221221

222222
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name/name
223223
Date: Dec 2014
224-
KernelVersion: 3.20
224+
KernelVersion: 4.0
225225
Description: Specific uncompressed frame descriptors
226226

227227
dwFrameInterval - indicates how frame interval can be
@@ -243,12 +243,12 @@ Description: Specific uncompressed frame descriptors
243243

244244
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/header
245245
Date: Dec 2014
246-
KernelVersion: 3.20
246+
KernelVersion: 4.0
247247
Description: Streaming header descriptors
248248

249249
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/header/name
250250
Date: Dec 2014
251-
KernelVersion: 3.20
251+
KernelVersion: 4.0
252252
Description: Specific streaming header descriptors
253253

254254
All attributes read only:

‎Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What /sys/bus/iio/devices/iio:deviceX/in_proximity_raw
1+
What /sys/bus/iio/devices/iio:deviceX/in_proximity_input
22
Date: March 2014
33
KernelVersion: 3.15
44
Contact: Matt Ranostay <mranostay@gmail.com>

‎Documentation/leds/leds-class.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ blink_set() function (see <linux/leds.h>). To set an LED to blinking,
7474
however, it is better to use the API function led_blink_set(), as it
7575
will check and implement software fallback if necessary.
7676

77-
To turn off blinking again, use the API function led_brightness_set()
78-
as that will not just set the LED brightness but also stop any software
77+
To turn off blinking, use the API function led_brightness_set()
78+
with brightness value LED_OFF, which should stop any software
7979
timers that may have been required for blinking.
8080

8181
The blink_set() function should choose a user friendly blinking value

‎Documentation/scsi/scsi_eh.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,19 +263,23 @@ scmd->allowed.
263263

264264
3. scmd recovered
265265
ACTION: scsi_eh_finish_cmd() is invoked to EH-finish scmd
266-
- shost->host_failed--
267266
- clear scmd->eh_eflags
268267
- scsi_setup_cmd_retry()
269268
- move from local eh_work_q to local eh_done_q
270269
LOCKING: none
270+
CONCURRENCY: at most one thread per separate eh_work_q to
271+
keep queue manipulation lockless
271272

272273
4. EH completes
273274
ACTION: scsi_eh_flush_done_q() retries scmds or notifies upper
274-
layer of failure.
275+
layer of failure. May be called concurrently but must have
276+
a no more than one thread per separate eh_work_q to
277+
manipulate the queue locklessly
275278
- scmd is removed from eh_done_q and scmd->eh_entry is cleared
276279
- if retry is necessary, scmd is requeued using
277280
scsi_queue_insert()
278281
- otherwise, scsi_finish_command() is invoked for scmd
282+
- zero shost->host_failed
279283
LOCKING: queue or finish function performs appropriate locking
280284

281285

0 commit comments

Comments
 (0)