Skip to content

Commit 7e60905

Browse files
kelsey-steelekelsey-steele
committed
Merge tag 'rolling-lts/wsl/5.15.137.3' into linux-msft-wsl-5.15.y
Linux rolling-lts/wsl/5.15.137.3 Signed-off-by: Kelsey Steele <[email protected]>
2 parents fb467c7 + 90d4d49 commit 7e60905

File tree

648 files changed

+5559
-3909
lines changed

Some content is hidden

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

648 files changed

+5559
-3909
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5920,6 +5920,16 @@
59205920
first trust source as a backend which is initialized
59215921
successfully during iteration.
59225922

5923+
trusted.rng= [KEYS]
5924+
Format: <string>
5925+
The RNG used to generate key material for trusted keys.
5926+
Can be one of:
5927+
- "kernel"
5928+
- the same value as trusted.source: "tpm" or "tee"
5929+
- "default"
5930+
If not specified, "default" is used. In this case,
5931+
the RNG's choice is left to each individual trust source.
5932+
59235933
tsc= Disable clocksource stability checks for TSC.
59245934
Format: <string>
59255935
[x86] reliable: mark tsc clocksource as reliable, this

‎Documentation/admin-guide/sysctl/net.rst‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ see only some of them, depending on your kernel's configuration.
3131

3232
Table : Subdirectories in /proc/sys/net
3333

34-
========= =================== = ========== ==================
34+
========= =================== = ========== ===================
3535
Directory Content Directory Content
36-
========= =================== = ========== ==================
37-
802 E802 protocol mptcp Multipath TCP
38-
appletalk Appletalk protocol netfilter Network Filter
36+
========= =================== = ========== ===================
37+
802 E802 protocol mptcp Multipath TCP
38+
appletalk Appletalk protocol netfilter Network Filter
3939
ax25 AX25 netrom NET/ROM
40-
bridge Bridging rose X.25 PLP layer
41-
core General parameter tipc TIPC
42-
ethernet Ethernet protocol unix Unix domain sockets
43-
ipv4 IP version 4 x25 X.25 protocol
40+
bridge Bridging rose X.25 PLP layer
41+
core General parameter tipc TIPC
42+
ethernet Ethernet protocol unix Unix domain sockets
43+
ipv4 IP version 4 x25 X.25 protocol
4444
ipv6 IP version 6
45-
========= =================== = ========== ==================
45+
========= =================== = ========== ===================
4646

4747
1. /proc/sys/net/core - Network core options
4848
============================================

‎Documentation/networking/ip-sysctl.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2070,6 +2070,14 @@ accept_ra_min_hop_limit - INTEGER
20702070

20712071
Default: 1
20722072

2073+
accept_ra_min_lft - INTEGER
2074+
Minimum acceptable lifetime value in Router Advertisement.
2075+
2076+
RA sections with a lifetime less than this value shall be
2077+
ignored. Zero lifetimes stay unaffected.
2078+
2079+
Default: 0
2080+
20732081
accept_ra_pinfo - BOOLEAN
20742082
Learn Prefix Information in Router Advertisement.
20752083

‎Documentation/security/keys/trusted-encrypted.rst‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,22 +87,26 @@ Key Generation
8787
Trusted Keys
8888
------------
8989

90-
New keys are created from random numbers generated in the trust source. They
91-
are encrypted/decrypted using a child key in the storage key hierarchy.
92-
Encryption and decryption of the child key must be protected by a strong
93-
access control policy within the trust source.
90+
New keys are created from random numbers. They are encrypted/decrypted using
91+
a child key in the storage key hierarchy. Encryption and decryption of the
92+
child key must be protected by a strong access control policy within the
93+
trust source. The random number generator in use differs according to the
94+
selected trust source:
9495

95-
* TPM (hardware device) based RNG
96+
* TPM: hardware device based RNG
9697

97-
Strength of random numbers may vary from one device manufacturer to
98-
another.
98+
Keys are generated within the TPM. Strength of random numbers may vary
99+
from one device manufacturer to another.
99100

100-
* TEE (OP-TEE based on Arm TrustZone) based RNG
101+
* TEE: OP-TEE based on Arm TrustZone based RNG
101102

102103
RNG is customizable as per platform needs. It can either be direct output
103104
from platform specific hardware RNG or a software based Fortuna CSPRNG
104105
which can be seeded via multiple entropy sources.
105106

107+
Users may override this by specifying ``trusted.rng=kernel`` on the kernel
108+
command-line to override the used RNG with the kernel's random number pool.
109+
106110
Encrypted Keys
107111
--------------
108112

‎MSFT-Merge/log‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Name SHA1
22
---- ----
3-
config/wsl ddef5ed2d6dfff99665fdccc896226dbf06da6bd
3+
config/wsl b2374d6060af2fbfd4ce3bf658e9653d971d7ac1
44
feature/arm64-hyperv-hypercall-interface/5.15 3e314b48254cb9c3eeac699356ac605193b4b6fa
55
feature/arm64-hyperv-synthetic-clocks-timers/5.15 59db35e760b9bacc8596a3660a12420f1fa5318f
66
feature/dxgkrnl/5.15 26d29d8377a78f1b0014f6c9ba6df9ed5763f885

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 5
33
PATCHLEVEL = 15
4-
SUBLEVEL = 133
5-
EXTRAVERSION = .1
4+
SUBLEVEL = 137
5+
EXTRAVERSION = .3
66
NAME = Trick or Treat
77

88
# *DOCUMENTATION*

‎arch/arm/boot/dts/am33xx.dtsi‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
12
/*
23
* Device Tree Source for AM33XX SoC
34
*
45
* Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/
5-
*
6-
* This file is licensed under the terms of the GNU General Public License
7-
* version 2. This program is licensed "as is" without any warranty of any
8-
* kind, whether express or implied.
96
*/
107

118
#include <dt-bindings/bus/ti-sysc.h>

‎arch/arm/boot/dts/am3517.dtsi‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
12
/*
23
* Device Tree Source for am3517 SoC
34
*
45
* Copyright (C) 2013 Texas Instruments Incorporated - https://www.ti.com/
5-
*
6-
* This file is licensed under the terms of the GNU General Public License
7-
* version 2. This program is licensed "as is" without any warranty of any
8-
* kind, whether express or implied.
96
*/
107

118
#include "omap3.dtsi"

‎arch/arm/boot/dts/am4372.dtsi‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
12
/*
23
* Device Tree Source for AM4372 SoC
34
*
45
* Copyright (C) 2013 Texas Instruments Incorporated - https://www.ti.com/
5-
*
6-
* This file is licensed under the terms of the GNU General Public License
7-
* version 2. This program is licensed "as is" without any warranty of any
8-
* kind, whether express or implied.
96
*/
107

118
#include <dt-bindings/bus/ti-sysc.h>

‎arch/arm/boot/dts/artpec6-devboard.dts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
/*
2-
* Axis ARTPEC-6 development board.
3-
*
4-
* This file is licensed under the terms of the GNU General Public License
5-
* version 2. This program is licensed "as is" without any warranty of any
6-
* kind, whether express or implied.
7-
*/
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
// Axis ARTPEC-6 development board.
83

94
/dts-v1/;
105
#include "artpec6.dtsi"

0 commit comments

Comments
 (0)