Skip to content

Commit 79a21d5

Browse files
KAGA-KOKOKAGA-KOKO
committed
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent
Pull a single UEFI fix from Ard: - Reduce the severity of the notice that appears when the ESRT table points to memory that is not covered by the memory map. It is scaring our users and interfering with their nice splash screens. Note that the ESRT may still be perfectly usable, and is currently (to my knowledge) not widely used to begin with.
2 parents d1eb981 + 822f584 commit 79a21d5

File tree

2,035 files changed

+45282
-16019
lines changed

Some content is hidden

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

2,035 files changed

+45282
-16019
lines changed

‎Documentation/DocBook/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
# list of DOCBOOKS.
88

99
DOCBOOKS := z8530book.xml \
10-
kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
10+
kernel-hacking.xml kernel-locking.xml \
1111
writing_usb_driver.xml networking.xml \
1212
kernel-api.xml filesystems.xml lsm.xml kgdb.xml \
1313
gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
1414
genericirq.xml s390-drivers.xml scsi.xml \
15-
sh.xml regulator.xml w1.xml \
15+
sh.xml w1.xml \
1616
writing_musb_glue_layer.xml
1717

1818
ifeq ($(DOCBOOKS),)

‎Documentation/PCI/pcieaer-howto.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ After reboot with new kernel or insert the module, a device file named
256256

257257
Then, you need a user space tool named aer-inject, which can be gotten
258258
from:
259-
http://www.kernel.org/pub/linux/utils/pci/aer-inject/
259+
https://git.kernel.org/cgit/linux/kernel/git/gong.chen/aer-inject.git/
260260

261261
More information about aer-inject can be found in the document comes
262262
with its source code.

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,9 @@
653653
cpuidle.off=1 [CPU_IDLE]
654654
disable the cpuidle sub-system
655655

656+
cpufreq.off=1 [CPU_FREQ]
657+
disable the cpufreq sub-system
658+
656659
cpu_init_udelay=N
657660
[X86] Delay for N microsec between assert and de-assert
658661
of APIC INIT to start processors. This delay occurs
@@ -1183,6 +1186,12 @@
11831186
functions that can be changed at run time by the
11841187
set_graph_notrace file in the debugfs tracing directory.
11851188

1189+
ftrace_graph_max_depth=<uint>
1190+
[FTRACE] Used with the function graph tracer. This is
1191+
the max depth it will trace into a function. This value
1192+
can be changed at run time by the max_graph_depth file
1193+
in the tracefs tracing directory. default: 0 (no limit)
1194+
11861195
gamecon.map[2|3]=
11871196
[HW,JOY] Multisystem joystick and NES/SNES/PSX pad
11881197
support via parallel port (up to 5 devices per port)

‎Documentation/arm64/silicon-errata.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,4 @@ stable kernels.
6868
| | | | |
6969
| Qualcomm Tech. | Falkor v1 | E1003 | QCOM_FALKOR_ERRATUM_1003 |
7070
| Qualcomm Tech. | Falkor v1 | E1009 | QCOM_FALKOR_ERRATUM_1009 |
71+
| Qualcomm Tech. | QDF2400 ITS | E0065 | QCOM_QDF2400_ERRATUM_0065 |

‎Documentation/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
# If true, `todo` and `todoList` produce output, else they produce nothing.
136136
todo_include_todos = False
137137

138-
primary_domain = 'C'
138+
primary_domain = 'c'
139139
highlight_language = 'none'
140140

141141
# -- Options for HTML output ----------------------------------------------

‎Documentation/dev-tools/kcov.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Note that kcov does not aim to collect as much coverage as possible. It aims
1010
to collect more or less stable coverage that is function of syscall inputs.
1111
To achieve this goal it does not collect coverage in soft/hard interrupts
1212
and instrumentation of some inherently non-deterministic parts of kernel is
13-
disbled (e.g. scheduler, locking).
13+
disabled (e.g. scheduler, locking).
1414

1515
Usage
1616
-----

‎Documentation/devicetree/bindings/arm/amlogic.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ Board compatible values:
4040
- "hardkernel,odroid-c2" (Meson gxbb)
4141
- "amlogic,p200" (Meson gxbb)
4242
- "amlogic,p201" (Meson gxbb)
43+
- "wetek,hub" (Meson gxbb)
44+
- "wetek,play2" (Meson gxbb)
4345
- "amlogic,p212" (Meson gxl s905x)
4446
- "amlogic,p230" (Meson gxl s905d)
4547
- "amlogic,p231" (Meson gxl s905d)

‎Documentation/devicetree/bindings/opp/opp.txt

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,14 @@ Example 1: Single cluster Dual-core ARM cortex A9, switch DVFS states together.
188188

189189
opp@1000000000 {
190190
opp-hz = /bits/ 64 <1000000000>;
191-
opp-microvolt = <970000 975000 985000>;
191+
opp-microvolt = <975000 970000 985000>;
192192
opp-microamp = <70000>;
193193
clock-latency-ns = <300000>;
194194
opp-suspend;
195195
};
196196
opp@1100000000 {
197197
opp-hz = /bits/ 64 <1100000000>;
198-
opp-microvolt = <980000 1000000 1010000>;
198+
opp-microvolt = <1000000 980000 1010000>;
199199
opp-microamp = <80000>;
200200
clock-latency-ns = <310000>;
201201
};
@@ -267,14 +267,14 @@ independently.
267267

268268
opp@1000000000 {
269269
opp-hz = /bits/ 64 <1000000000>;
270-
opp-microvolt = <970000 975000 985000>;
270+
opp-microvolt = <975000 970000 985000>;
271271
opp-microamp = <70000>;
272272
clock-latency-ns = <300000>;
273273
opp-suspend;
274274
};
275275
opp@1100000000 {
276276
opp-hz = /bits/ 64 <1100000000>;
277-
opp-microvolt = <980000 1000000 1010000>;
277+
opp-microvolt = <1000000 980000 1010000>;
278278
opp-microamp = <80000>;
279279
clock-latency-ns = <310000>;
280280
};
@@ -343,14 +343,14 @@ DVFS state together.
343343

344344
opp@1000000000 {
345345
opp-hz = /bits/ 64 <1000000000>;
346-
opp-microvolt = <970000 975000 985000>;
346+
opp-microvolt = <975000 970000 985000>;
347347
opp-microamp = <70000>;
348348
clock-latency-ns = <300000>;
349349
opp-suspend;
350350
};
351351
opp@1100000000 {
352352
opp-hz = /bits/ 64 <1100000000>;
353-
opp-microvolt = <980000 1000000 1010000>;
353+
opp-microvolt = <1000000 980000 1010000>;
354354
opp-microamp = <80000>;
355355
clock-latency-ns = <310000>;
356356
};
@@ -369,7 +369,7 @@ DVFS state together.
369369

370370
opp@1300000000 {
371371
opp-hz = /bits/ 64 <1300000000>;
372-
opp-microvolt = <1045000 1050000 1055000>;
372+
opp-microvolt = <1050000 1045000 1055000>;
373373
opp-microamp = <95000>;
374374
clock-latency-ns = <400000>;
375375
opp-suspend;
@@ -382,7 +382,7 @@ DVFS state together.
382382
};
383383
opp@1500000000 {
384384
opp-hz = /bits/ 64 <1500000000>;
385-
opp-microvolt = <1010000 1100000 1110000>;
385+
opp-microvolt = <1100000 1010000 1110000>;
386386
opp-microamp = <95000>;
387387
clock-latency-ns = <400000>;
388388
turbo-mode;
@@ -424,9 +424,9 @@ Example 4: Handling multiple regulators
424424

425425
opp@1000000000 {
426426
opp-hz = /bits/ 64 <1000000000>;
427-
opp-microvolt = <970000 975000 985000>, /* Supply 0 */
428-
<960000 965000 975000>, /* Supply 1 */
429-
<960000 965000 975000>; /* Supply 2 */
427+
opp-microvolt = <975000 970000 985000>, /* Supply 0 */
428+
<965000 960000 975000>, /* Supply 1 */
429+
<965000 960000 975000>; /* Supply 2 */
430430
opp-microamp = <70000>, /* Supply 0 */
431431
<70000>, /* Supply 1 */
432432
<70000>; /* Supply 2 */
@@ -437,9 +437,9 @@ Example 4: Handling multiple regulators
437437

438438
opp@1000000000 {
439439
opp-hz = /bits/ 64 <1000000000>;
440-
opp-microvolt = <970000 975000 985000>, /* Supply 0 */
441-
<960000 965000 975000>, /* Supply 1 */
442-
<960000 965000 975000>; /* Supply 2 */
440+
opp-microvolt = <975000 970000 985000>, /* Supply 0 */
441+
<965000 960000 975000>, /* Supply 1 */
442+
<965000 960000 975000>; /* Supply 2 */
443443
opp-microamp = <70000>, /* Supply 0 */
444444
<0>, /* Supply 1 doesn't need this */
445445
<70000>; /* Supply 2 */
@@ -474,7 +474,7 @@ Example 5: opp-supported-hw
474474
*/
475475
opp-supported-hw = <0xF 0xFFFFFFFF 0xFFFFFFFF>
476476
opp-hz = /bits/ 64 <600000000>;
477-
opp-microvolt = <900000 915000 925000>;
477+
opp-microvolt = <915000 900000 925000>;
478478
...
479479
};
480480

@@ -487,7 +487,7 @@ Example 5: opp-supported-hw
487487
*/
488488
opp-supported-hw = <0x20 0xff0000ff 0x0000f4f0>
489489
opp-hz = /bits/ 64 <800000000>;
490-
opp-microvolt = <900000 915000 925000>;
490+
opp-microvolt = <915000 900000 925000>;
491491
...
492492
};
493493
};
@@ -512,18 +512,18 @@ Example 6: opp-microvolt-<name>, opp-microamp-<name>:
512512

513513
opp@1000000000 {
514514
opp-hz = /bits/ 64 <1000000000>;
515-
opp-microvolt-slow = <900000 915000 925000>;
516-
opp-microvolt-fast = <970000 975000 985000>;
515+
opp-microvolt-slow = <915000 900000 925000>;
516+
opp-microvolt-fast = <975000 970000 985000>;
517517
opp-microamp-slow = <70000>;
518518
opp-microamp-fast = <71000>;
519519
};
520520

521521
opp@1200000000 {
522522
opp-hz = /bits/ 64 <1200000000>;
523-
opp-microvolt-slow = <900000 915000 925000>, /* Supply vcc0 */
524-
<910000 925000 935000>; /* Supply vcc1 */
525-
opp-microvolt-fast = <970000 975000 985000>, /* Supply vcc0 */
526-
<960000 965000 975000>; /* Supply vcc1 */
523+
opp-microvolt-slow = <915000 900000 925000>, /* Supply vcc0 */
524+
<925000 910000 935000>; /* Supply vcc1 */
525+
opp-microvolt-fast = <975000 970000 985000>, /* Supply vcc0 */
526+
<965000 960000 975000>; /* Supply vcc1 */
527527
opp-microamp = <70000>; /* Will be used for both slow/fast */
528528
};
529529
};

‎Documentation/devicetree/bindings/regulator/ti-abb-regulator.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Required Properties:
4545
Optional Properties:
4646
- reg-names: In addition to the required properties, the following are optional
4747
- "efuse-address" - Contains efuse base address used to pick up ABB info.
48-
- "ldo-address" - Contains address of ABB LDO overide register address.
48+
- "ldo-address" - Contains address of ABB LDO override register.
4949
"efuse-address" is required for this.
5050
- ti,ldovbb-vset-mask - Required if ldo-address is set, mask for LDO override
5151
register to provide override vset value.

‎Documentation/devicetree/bindings/usb/usb251xb.txt

Lines changed: 18 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ Required properties :
77
- compatible : Should be "microchip,usb251xb" or one of the specific types:
88
"microchip,usb2512b", "microchip,usb2512bi", "microchip,usb2513b",
99
"microchip,usb2513bi", "microchip,usb2514b", "microchip,usb2514bi"
10-
- hub-reset-gpios : Should specify the gpio for hub reset
10+
- reset-gpios : Should specify the gpio for hub reset
11+
- reg : I2C address on the selected bus (default is <0x2C>)
1112

1213
Optional properties :
13-
- reg : I2C address on the selected bus (default is <0x2C>)
1414
- skip-config : Skip Hub configuration, but only send the USB-Attach command
15-
- vendor-id : USB Vendor ID of the hub (16 bit, default is 0x0424)
16-
- product-id : USB Product ID of the hub (16 bit, default depends on type)
17-
- device-id : USB Device ID of the hub (16 bit, default is 0x0bb3)
18-
- language-id : USB Language ID (16 bit, default is 0x0000)
19-
- manufacturer : USB Manufacturer string (max 31 characters long)
20-
- product : USB Product string (max 31 characters long)
21-
- serial : USB Serial string (max 31 characters long)
15+
- vendor-id : Set USB Vendor ID of the hub (16 bit, default is 0x0424)
16+
- product-id : Set USB Product ID of the hub (16 bit, default depends on type)
17+
- device-id : Set USB Device ID of the hub (16 bit, default is 0x0bb3)
18+
- language-id : Set USB Language ID (16 bit, default is 0x0000)
19+
- manufacturer : Set USB Manufacturer string (max 31 characters long)
20+
- product : Set USB Product string (max 31 characters long)
21+
- serial : Set USB Serial string (max 31 characters long)
2222
- {bus,self}-powered : selects between self- and bus-powered operation (default
2323
is self-powered)
2424
- disable-hi-speed : disable USB Hi-Speed support
@@ -31,43 +31,26 @@ Optional properties :
3131
(default is individual)
3232
- dynamic-power-switching : enable auto-switching from self- to bus-powered
3333
operation if the local power source is removed or unavailable
34-
- oc-delay-{100us,4ms,8ms,16ms} : set over current timer delay (default is 8ms)
35-
- compound-device : indicated the hub is part of a compound device
34+
- oc-delay-us : Delay time (in microseconds) for filtering the over-current
35+
sense inputs. Valid values are 100, 4000, 8000 (default) and 16000. If
36+
an invalid value is given, the default is used instead.
37+
- compound-device : indicate the hub is part of a compound device
3638
- port-mapping-mode : enable port mapping mode
3739
- string-support : enable string descriptor support (required for manufacturer,
3840
product and serial string configuration)
3941
- non-removable-ports : Should specify the ports which have a non-removable
4042
device connected.
4143
- sp-disabled-ports : Specifies the ports which will be self-power disabled
4244
- bp-disabled-ports : Specifies the ports which will be bus-power disabled
43-
- max-sp-power : Specifies the maximum current the hub consumes from an
44-
upstream port when operating as self-powered hub including the power
45-
consumption of a permanently attached peripheral if the hub is
46-
configured as a compound device. The value is given in mA in a 0 - 500
47-
range (default is 2).
48-
- max-bp-power : Specifies the maximum current the hub consumes from an
49-
upstream port when operating as bus-powered hub including the power
50-
consumption of a permanently attached peripheral if the hub is
51-
configured as a compound device. The value is given in mA in a 0 - 500
52-
range (default is 100).
53-
- max-sp-current : Specifies the maximum current the hub consumes from an
54-
upstream port when operating as self-powered hub EXCLUDING the power
55-
consumption of a permanently attached peripheral if the hub is
56-
configured as a compound device. The value is given in mA in a 0 - 500
57-
range (default is 2).
58-
- max-bp-current : Specifies the maximum current the hub consumes from an
59-
upstream port when operating as bus-powered hub EXCLUDING the power
60-
consumption of a permanently attached peripheral if the hub is
61-
configured as a compound device. The value is given in mA in a 0 - 500
62-
range (default is 100).
63-
- power-on-time : Specifies the time it takes from the time the host initiates
64-
the power-on sequence to a port until the port has adequate power. The
65-
value is given in ms in a 0 - 510 range (default is 100ms).
45+
- power-on-time-ms : Specifies the time it takes from the time the host
46+
initiates the power-on sequence to a port until the port has adequate
47+
power. The value is given in ms in a 0 - 510 range (default is 100ms).
6648

6749
Examples:
6850
usb2512b@2c {
6951
compatible = "microchip,usb2512b";
70-
hub-reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
52+
reg = <0x2c>;
53+
reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
7154
};
7255

7356
usb2514b@2c {

‎Documentation/devicetree/bindings/vendor-prefixes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ virtio Virtual I/O Device Specification, developed by the OASIS consortium
332332
vivante Vivante Corporation
333333
voipac Voipac Technologies s.r.o.
334334
wd Western Digital Corp.
335+
wetek WeTek Electronics, limited.
335336
wexler Wexler
336337
winbond Winbond Electronics corp.
337338
wlf Wolfson Microelectronics

‎Documentation/filesystems/Locking

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ prototypes:
5858
int (*permission) (struct inode *, int, unsigned int);
5959
int (*get_acl)(struct inode *, int);
6060
int (*setattr) (struct dentry *, struct iattr *);
61-
int (*getattr) (struct vfsmount *, struct dentry *, struct kstat *);
61+
int (*getattr) (const struct path *, struct dentry *, struct kstat *,
62+
u32, unsigned int);
6263
ssize_t (*listxattr) (struct dentry *, char *, size_t);
6364
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len);
6465
void (*update_time)(struct inode *, struct timespec *, int);

‎Documentation/filesystems/vfs.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,8 @@ struct inode_operations {
382382
int (*permission) (struct inode *, int);
383383
int (*get_acl)(struct inode *, int);
384384
int (*setattr) (struct dentry *, struct iattr *);
385-
int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
385+
int (*getattr) (const struct path *, struct dentry *, struct kstat *,
386+
u32, unsigned int);
386387
ssize_t (*listxattr) (struct dentry *, char *, size_t);
387388
void (*update_time)(struct inode *, struct timespec *, int);
388389
int (*atomic_open)(struct inode *, struct dentry *, struct file *,

‎Documentation/media/v4l-drivers/bttv.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ information out of a register+stack dump printed by the kernel on
312312
protection faults (so-called "kernel oops").
313313

314314
If you run into some kind of deadlock, you can try to dump a call trace
315-
for each process using sysrq-t (see Documentation/sysrq.txt).
315+
for each process using sysrq-t (see Documentation/admin-guide/sysrq.rst).
316316
This way it is possible to figure where *exactly* some process in "D"
317317
state is stuck.
318318

‎Documentation/power/pm_qos_interface.txt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@ of flags and remove sysfs attributes pm_qos_no_power_off and pm_qos_remote_wakeu
163163
under the device's power directory.
164164

165165
Notification mechanisms:
166-
The per-device PM QoS framework has 2 different and distinct notification trees:
167-
a per-device notification tree and a global notification tree.
166+
The per-device PM QoS framework has a per-device notification tree.
168167

169168
int dev_pm_qos_add_notifier(device, notifier):
170169
Adds a notification callback function for the device.
@@ -174,16 +173,6 @@ is changed (for resume latency device PM QoS only).
174173
int dev_pm_qos_remove_notifier(device, notifier):
175174
Removes the notification callback function for the device.
176175

177-
int dev_pm_qos_add_global_notifier(notifier):
178-
Adds a notification callback function in the global notification tree of the
179-
framework.
180-
The callback is called when the aggregated value for any device is changed
181-
(for resume latency device PM QoS only).
182-
183-
int dev_pm_qos_remove_global_notifier(notifier):
184-
Removes the notification callback function from the global notification tree
185-
of the framework.
186-
187176

188177
Active state latency tolerance
189178

‎Documentation/power/runtime_pm.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ knows what to do to handle the device).
100100
* If the suspend callback returns an error code different from -EBUSY and
101101
-EAGAIN, the PM core regards this as a fatal error and will refuse to run
102102
the helper functions described in Section 4 for the device until its status
103-
is directly set to either'active', or 'suspended' (the PM core provides
103+
is directly set to either 'active', or 'suspended' (the PM core provides
104104
special helper functions for this purpose).
105105

106106
In particular, if the driver requires remote wakeup capability (i.e. hardware
@@ -217,7 +217,7 @@ defined in include/linux/pm.h:
217217
one to complete
218218

219219
spinlock_t lock;
220-
- lock used for synchronisation
220+
- lock used for synchronization
221221

222222
atomic_t usage_count;
223223
- the usage counter of the device
@@ -565,7 +565,7 @@ appropriate to ensure that the device is not put back to sleep during the
565565
probe. This can happen with systems such as the network device layer.
566566

567567
It may be desirable to suspend the device once ->probe() has finished.
568-
Therefore the driver core uses the asyncronous pm_request_idle() to submit a
568+
Therefore the driver core uses the asynchronous pm_request_idle() to submit a
569569
request to execute the subsystem-level idle callback for the device at that
570570
time. A driver that makes use of the runtime autosuspend feature, may want to
571571
update the last busy mark before returning from ->probe().

0 commit comments

Comments
 (0)