Skip to content

Commit c21a03b

Browse files
committed
Merge tag 'rolling-lts/wsl/6.18.33.2' into linux-msft-wsl-6.18.y
Linux rolling-lts/wsl/6.18.33.2 Signed-off-by: Mitchell Levy <levymitchell0@gmail.com>
2 parents ceac005 + 25d408f commit c21a03b

727 files changed

Lines changed: 4065 additions & 8058 deletions

File tree

Some content is hidden

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

Documentation/admin-guide/pm/intel_pstate.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -348,12 +348,11 @@ HyperThreading (HT) in the context of Intel processors, is enabled on at least
348348
one core, ``intel_pstate`` assigns performance-based priorities to CPUs. Namely,
349349
the priority of a given CPU reflects its highest HWP performance level which
350350
causes the CPU scheduler to generally prefer more performant CPUs, so the less
351-
performant CPUs are used when the other ones are fully loaded. SMT siblings
352-
(that is, logical CPUs sharing one physical core) are given the same priority.
353-
The scheduler can pull tasks from lower-priority cores and place them on any
354-
sibling. Since the scheduler spreads tasks among physical cores, tasks will be
355-
placed on the SMT siblings of physical cores only after all physical cores are
356-
busy.
351+
performant CPUs are used when the other ones are fully loaded. However, SMT
352+
siblings (that is, logical CPUs sharing one physical core) are treated in a
353+
special way such that if one of them is in use, the effective priority of the
354+
other ones is lowered below the priorities of the CPUs located in the other
355+
physical cores.
357356

358357
This approach maximizes performance in the majority of cases, but unfortunately
359358
it also leads to excessive energy usage in some important scenarios, like video

Documentation/crypto/krb5.rst

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -158,22 +158,13 @@ returned.
158158
When a message has been received, the location and size of the data with the
159159
message can be determined by calling::
160160

161-
int crypto_krb5_where_is_the_data(const struct krb5_enctype *krb5,
162-
enum krb5_crypto_mode mode,
163-
size_t *_offset, size_t *_len);
161+
void crypto_krb5_where_is_the_data(const struct krb5_enctype *krb5,
162+
enum krb5_crypto_mode mode,
163+
size_t *_offset, size_t *_len);
164164

165165
The caller provides the offset and length of the message to the function, which
166166
then alters those values to indicate the region containing the data (plus any
167-
padding). It is up to the caller to determine how much padding there is. The
168-
function returns an error if the length is too small or if the mode is
169-
unsupported. An additional function::
170-
171-
int crypto_krb5_check_data_len(const struct krb5_enctype *krb5,
172-
enum krb5_crypto_mode mode,
173-
size_t len, size_t min_content);
174-
175-
is provided to just do a basic check that the decrypted/verified message would
176-
have a sufficient minimum payload.
167+
padding). It is up to the caller to determine how much padding there is.
177168

178169
Preparation Functions
179170
---------------------

Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,23 @@ description: |
1313
maintainers:
1414
- Nicolas Saenz Julienne <nsaenz@kernel.org>
1515

16+
allOf:
17+
- $ref: /schemas/watchdog/watchdog.yaml#
18+
1619
properties:
1720
compatible:
1821
items:
1922
- enum:
2023
- brcm,bcm2835-pm
2124
- brcm,bcm2711-pm
22-
- brcm,bcm2712-pm
2325
- const: brcm,bcm2835-pm-wdt
2426

2527
reg:
26-
minItems: 1
28+
minItems: 2
2729
maxItems: 3
2830

2931
reg-names:
30-
minItems: 1
32+
minItems: 2
3133
items:
3234
- const: pm
3335
- const: asb
@@ -60,35 +62,7 @@ required:
6062
- reg
6163
- "#power-domain-cells"
6264
- "#reset-cells"
63-
64-
allOf:
65-
- $ref: /schemas/watchdog/watchdog.yaml#
66-
67-
- if:
68-
properties:
69-
compatible:
70-
contains:
71-
enum:
72-
- brcm,bcm2835-pm
73-
- brcm,bcm2711-pm
74-
then:
75-
required:
76-
- clocks
77-
78-
properties:
79-
reg:
80-
minItems: 2
81-
82-
reg-names:
83-
minItems: 2
84-
85-
else:
86-
properties:
87-
reg:
88-
maxItems: 1
89-
90-
reg-names:
91-
maxItems: 1
65+
- clocks
9266

9367
additionalProperties: false
9468

Documentation/gpu/drm-kms-helpers.rst

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,6 @@ GEM Atomic Helper Reference
9292
.. kernel-doc:: drivers/gpu/drm/drm_gem_atomic_helper.c
9393
:export:
9494

95-
VBLANK Helper Reference
96-
-----------------------
97-
98-
.. kernel-doc:: drivers/gpu/drm/drm_vblank_helper.c
99-
:doc: overview
100-
101-
.. kernel-doc:: include/drm/drm_vblank_helper.h
102-
:internal:
103-
104-
.. kernel-doc:: drivers/gpu/drm/drm_vblank_helper.c
105-
:export:
106-
10795
Simple KMS Helper Reference
10896
===========================
10997

Documentation/netlink/genetlink-c.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,6 @@ properties:
6969
header:
7070
description: For C-compatible languages, header which already defines this value.
7171
type: string
72-
scope:
73-
description: |
74-
Visibility of this definition. "uapi" (default) renders into
75-
the uAPI header, "kernel" renders into the kernel-side
76-
generated header, "user" renders into the user-side
77-
generated header. When combined with `header:`, the
78-
definition is not rendered, and the named header is
79-
included only by code matching the scope.
80-
enum: [ uapi, kernel, user ]
8172
type:
8273
enum: [ const, enum, flags ]
8374
doc:

Documentation/netlink/genetlink-legacy.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,6 @@ properties:
8383
header:
8484
description: For C-compatible languages, header which already defines this value.
8585
type: string
86-
scope:
87-
description: |
88-
Visibility of this definition. "uapi" (default) renders into
89-
the uAPI header, "kernel" renders into the kernel-side
90-
generated header, "user" renders into the user-side
91-
generated header. When combined with `header:`, the
92-
definition is not rendered, and the named header is
93-
included only by code matching the scope.
94-
enum: [ uapi, kernel, user ]
9586
type:
9687
enum: [ const, enum, flags, struct ] # Trim
9788
doc:

Documentation/netlink/genetlink.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,6 @@ properties:
5555
header:
5656
description: For C-compatible languages, header which already defines this value.
5757
type: string
58-
scope:
59-
description: |
60-
Visibility of this definition. "uapi" (default) renders into
61-
the uAPI header, "kernel" renders into the kernel-side
62-
generated header, "user" renders into the user-side
63-
generated header. When combined with `header:`, the
64-
definition is not rendered, and the named header is
65-
included only by code matching the scope.
66-
enum: [ uapi, kernel, user ]
6758
type:
6859
enum: [ const, enum, flags ]
6960
doc:

Documentation/netlink/netlink-raw.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,6 @@ properties:
8181
header:
8282
description: For C-compatible languages, header which already defines this value.
8383
type: string
84-
scope:
85-
description: |
86-
Visibility of this definition. "uapi" (default) renders into
87-
the uAPI header, "kernel" renders into the kernel-side
88-
generated header, "user" renders into the user-side
89-
generated header. When combined with `header:`, the
90-
definition is not rendered, and the named header is
91-
included only by code matching the scope.
92-
enum: [ uapi, kernel, user ]
9384
type:
9485
enum: [ const, enum, flags, struct ] # Trim
9586
doc:

Documentation/netlink/specs/handshake.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ protocol: genetlink
1212
doc: Netlink protocol to request a transport layer security handshake.
1313

1414
definitions:
15-
-
16-
type: const
17-
name: max-errno
18-
value: 4095
19-
header: linux/err.h
20-
scope: kernel
2115
-
2216
type: enum
2317
name: handler-class
@@ -86,8 +80,6 @@ attribute-sets:
8680
-
8781
name: status
8882
type: u32
89-
checks:
90-
max: max-errno
9183
-
9284
name: sockfd
9385
type: s32

MSFT-Merge/log

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ Name SHA1
22
---- ----
33
config/wsl-6.18 47e6dda87358a7a45087a75021a559eaf2798fb8
44
feature/arm64-hyperv-hypercall-interface/6.18 712c88941ba7cfd3c9eec3a58eef4c231226d66f
5-
feature/arm64-hyperv-synthetic-clocks-timers/6.18 ea0cd9a5b6202ef81b45f137c37b17478a54f382
5+
feature/arm64-hyperv-synthetic-clocks-timers/6.18 73049104541866f41d5497d7a4cb23541812dc39
66
feature/wsl-module-script/6.18 9c6d7c0a3fadd2ce32c90dad74429ed7e463ad4a
77
feature/dxgkrnl/6.18 7c88b83ba02950b628c6e9cd47c6ec1c2517d9f7
88
feature/swiotlb-pool/6.18 372aaab4b6fd2031a90cc04d7417223839479db1
99
product/wsl/readme/6.18 bbf044c25e1203bed3182cedae466235420e7e96
1010
product/wsl/security/6.18 20778f3fd73f259549f66a8bea0227dbdfe3e170
1111
fix/virtiofs-dax-hang/6.18 668def1339349ba0ff85f22b6244066a8369b022
12-
fix/virtiofs-clamp-max-pages-dma/6.18 3586f43a9a33f5f12306de85b51f696194778156
12+
fix/hv_sock_eio/6.18 e256ef5ed9ce517323be79ad3268ec698533dca3

0 commit comments

Comments
 (0)