Skip to content

Commit 48c7d73

Browse files
committed
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent
Pull another handful of EFI fixes for v5.2 from Arnd: - Fix a potential crash after kexec on arm64 with GICv3 - Fix a build warning on x86 - Stop policing the BGRT feature flags - Use a non-blocking version of SetVariable() in the boot control driver
2 parents 88447c5 + 975a616 commit 48c7d73

File tree

12,110 files changed

+19077
-100437
lines changed

Some content is hidden

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

12,110 files changed

+19077
-100437
lines changed

CREDITS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3364,6 +3364,14 @@ S: Braunschweiger Strasse 79
33643364
S: 31134 Hildesheim
33653365
S: Germany
33663366

3367+
N: Martin Schwidefsky
3368+
D: Martin was the most significant contributor to the initial s390
3369+
D: port of the Linux Kernel and later the maintainer of the s390
3370+
D: architecture backend for almost two decades.
3371+
D: He passed away in 2019, and will be greatly missed.
3372+
S: Germany
3373+
W: https://lwn.net/Articles/789028/
3374+
33673375
N: Marcel Selhorst
33683376
33693377
D: TPM driver

Documentation/ABI/testing/sysfs-bus-mdio

Lines changed: 0 additions & 29 deletions
This file was deleted.

Documentation/ABI/testing/sysfs-class-net-phydev

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,31 @@ Date: February 2014
1111
KernelVersion: 3.15
1212
1313
Description:
14-
Boolean value indicating whether the PHY device has
15-
any fixups registered against it (phy_register_fixup)
14+
This attribute contains the boolean value whether a given PHY
15+
device has had any "fixup" workaround running on it, encoded as
16+
a boolean. This information is provided to help troubleshooting
17+
PHY configurations.
1618

1719
What: /sys/class/mdio_bus/<bus>/<device>/phy_id
1820
Date: November 2012
1921
KernelVersion: 3.8
2022
2123
Description:
22-
32-bit hexadecimal value corresponding to the PHY device's OUI,
23-
model and revision number.
24+
This attribute contains the 32-bit PHY Identifier as reported
25+
by the device during bus enumeration, encoded in hexadecimal.
26+
This ID is used to match the device with the appropriate
27+
driver.
2428

2529
What: /sys/class/mdio_bus/<bus>/<device>/phy_interface
2630
Date: February 2014
2731
KernelVersion: 3.15
2832
2933
Description:
30-
String value indicating the PHY interface, possible
31-
values are:.
34+
This attribute contains the PHY interface as configured by the
35+
Ethernet driver during bus enumeration, encoded in string.
36+
This interface mode is used to configure the Ethernet MAC with the
37+
appropriate mode for its data lines to the PHY hardware.
38+
Possible values are:
3239
<empty> (not available), mii, gmii, sgmii, tbi, rev-mii,
3340
rmii, rgmii, rgmii-id, rgmii-rxid, rgmii-txid, rtbi, smii
3441
xgmii, moca, qsgmii, trgmii, 1000base-x, 2500base-x, rxaui,

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,15 @@ cgroup v2 currently supports the following mount options.
177177
ignored on non-init namespace mounts. Please refer to the
178178
Delegation section for details.
179179

180+
memory_localevents
181+
182+
Only populate memory.events with data for the current cgroup,
183+
and not any subtrees. This is legacy behaviour, the default
184+
behaviour without this option is to include subtree counts.
185+
This option is system wide and can only be set on mount or
186+
modified through remount from the init namespace. The mount
187+
option is ignored on non-init namespace mounts.
188+
180189

181190
Organizing Processes and Threads
182191
--------------------------------

Documentation/admin-guide/mm/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ the Linux memory management.
3131
ksm
3232
memory-hotplug
3333
numa_memory_policy
34+
numaperf
3435
pagemap
3536
soft-dirty
3637
transhuge

Documentation/admin-guide/mm/numaperf.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ characteristics. Some memory may share the same node as a CPU, and others
1515
are provided as memory only nodes. While memory only nodes do not provide
1616
CPUs, they may still be local to one or more compute nodes relative to
1717
other nodes. The following diagram shows one such example of two compute
18-
nodes with local memory and a memory only node for each of compute node:
18+
nodes with local memory and a memory only node for each of compute node::
1919

2020
+------------------+ +------------------+
2121
| Compute Node 0 +-----+ Compute Node 1 |

Documentation/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', 'kfigure', 'sphinx.ext.ifconfig']
3838

3939
# The name of the math extension changed on Sphinx 1.4
40-
if major == 1 and minor > 3:
40+
if (major == 1 and minor > 3) or (major > 1):
4141
extensions.append("sphinx.ext.imgmath")
4242
else:
4343
extensions.append("sphinx.ext.pngmath")

Documentation/filesystems/overlayfs.txt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,20 @@ the copied layers will fail the verification of the lower root file handle.
336336
Non-standard behavior
337337
---------------------
338338

339-
Overlayfs can now act as a POSIX compliant filesystem with the following
340-
features turned on:
339+
Current version of overlayfs can act as a mostly POSIX compliant
340+
filesystem.
341+
342+
This is the list of cases that overlayfs doesn't currently handle:
343+
344+
a) POSIX mandates updating st_atime for reads. This is currently not
345+
done in the case when the file resides on a lower layer.
346+
347+
b) If a file residing on a lower layer is opened for read-only and then
348+
memory mapped with MAP_SHARED, then subsequent changes to the file are not
349+
reflected in the memory mapping.
350+
351+
The following options allow overlayfs to act more like a standards
352+
compliant filesystem:
341353

342354
1) "redirect_dir"
343355

Documentation/firmware-guide/acpi/enumeration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ will be enumerated to depends on the device ID returned by _HID.
423423

424424
For example, the following ACPI sample might be used to enumerate an lm75-type
425425
I2C temperature sensor and match it to the driver using the Device Tree
426-
namespace link:
426+
namespace link::
427427

428428
Device (TMP0)
429429
{
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
.. SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
3+
Vendor Device Drivers
4+
=====================
5+
6+
Contents:
7+
8+
.. toctree::
9+
:maxdepth: 2
10+
11+
freescale/dpaa2/index
12+
intel/e100
13+
intel/e1000
14+
intel/e1000e
15+
intel/fm10k
16+
intel/igb
17+
intel/igbvf
18+
intel/ixgb
19+
intel/ixgbe
20+
intel/ixgbevf
21+
intel/i40e
22+
intel/iavf
23+
intel/ice
24+
25+
.. only:: subproject
26+
27+
Indices
28+
=======
29+
30+
* :ref:`genindex`

0 commit comments

Comments
 (0)