Skip to content

Commit 292031a

Browse files
kelsey-steelekelsey-steele
committed
Merge tag 'rolling-lts/wsl/5.15.83.1' into linux-msft-wsl-5.15.y
Signed-off-by: Kelsey Steele <[email protected]>
2 parents 7ade21a + a33738a commit 292031a

File tree

607 files changed

+6314
-3467
lines changed

Some content is hidden

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

607 files changed

+6314
-3467
lines changed

‎Documentation/process/code-of-conduct-interpretation.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ the Technical Advisory Board (TAB) or other maintainers if you're
5151
uncertain how to handle situations that come up. It will not be
5252
considered a violation report unless you want it to be. If you are
5353
uncertain about approaching the TAB or any other maintainers, please
54-
reach out to our conflict mediator, Joanna Lee <[email protected]>.
54+
reach out to our conflict mediator, Joanna Lee <[email protected]>.
5555

5656
In the end, "be kind to each other" is really what the end goal is for
5757
everybody. We know everyone is human and we all fail at times, but the

‎MAINTAINERS‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7244,9 +7244,6 @@ F: include/linux/fs.h
72447244
F: include/linux/fs_types.h
72457245
F: include/uapi/linux/fs.h
72467246
F: include/uapi/linux/openat2.h
7247-
X: fs/io-wq.c
7248-
X: fs/io-wq.h
7249-
X: fs/io_uring.c
72507247

72517248
FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
72527249
M: Riku Voipio <[email protected]>
@@ -9825,9 +9822,7 @@ L: [email protected]
98259822
S: Maintained
98269823
T: git git://git.kernel.dk/linux-block
98279824
T: git git://git.kernel.dk/liburing
9828-
F: fs/io-wq.c
9829-
F: fs/io-wq.h
9830-
F: fs/io_uring.c
9825+
F: io_uring/
98319826
F: include/linux/io_uring.h
98329827
F: include/uapi/linux/io_uring.h
98339828
F: tools/io_uring/

‎Makefile‎

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

@@ -1150,7 +1150,9 @@ export MODORDER := $(extmod_prefix)modules.order
11501150
export MODULES_NSDEPS := $(extmod_prefix)modules.nsdeps
11511151

11521152
ifeq ($(KBUILD_EXTMOD),)
1153-
core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/
1153+
core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/
1154+
core-$(CONFIG_BLOCK) += block/
1155+
core-$(CONFIG_IO_URING) += io_uring/
11541156

11551157
vmlinux-dirs := $(patsubst %/,%,$(filter %/, \
11561158
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \

‎Microsoft/config-wsl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86 5.15.79.1 Kernel Configuration
3+
# Linux/x86 5.15.83.1 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="x86_64-msft-linux-gcc (GCC) 9.3.0"
66
CONFIG_CC_IS_GCC=y
@@ -194,7 +194,7 @@ CONFIG_CGROUP_MISC=y
194194
CONFIG_SOCK_CGROUP_DATA=y
195195
CONFIG_NAMESPACES=y
196196
CONFIG_UTS_NS=y
197-
# CONFIG_TIME_NS is not set
197+
CONFIG_TIME_NS=y
198198
CONFIG_IPC_NS=y
199199
CONFIG_USER_NS=y
200200
CONFIG_PID_NS=y
@@ -965,6 +965,7 @@ CONFIG_INET_ESP=y
965965
# CONFIG_INET_ESP_OFFLOAD is not set
966966
# CONFIG_INET_ESPINTCP is not set
967967
# CONFIG_INET_IPCOMP is not set
968+
CONFIG_INET_TABLE_PERTURB_ORDER=16
968969
CONFIG_INET_TUNNEL=y
969970
CONFIG_INET_DIAG=y
970971
CONFIG_INET_TCP_DIAG=y
@@ -4112,7 +4113,6 @@ CONFIG_UPROBE_EVENTS=y
41124113
CONFIG_BPF_EVENTS=y
41134114
CONFIG_DYNAMIC_EVENTS=y
41144115
CONFIG_PROBE_EVENTS=y
4115-
# CONFIG_BPF_KPROBE_OVERRIDE is not set
41164116
CONFIG_FTRACE_MCOUNT_RECORD=y
41174117
CONFIG_FTRACE_MCOUNT_USE_CC=y
41184118
# CONFIG_SYNTH_EVENTS is not set
@@ -4163,7 +4163,7 @@ CONFIG_UNWINDER_ORC=y
41634163
#
41644164
# CONFIG_KUNIT is not set
41654165
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
4166-
CONFIG_FUNCTION_ERROR_INJECTION=y
4166+
# CONFIG_FUNCTION_ERROR_INJECTION is not set
41674167
# CONFIG_FAULT_INJECTION is not set
41684168
CONFIG_ARCH_HAS_KCOV=y
41694169
CONFIG_CC_HAS_SANCOV_TRACE_PC=y

‎Microsoft/config-wsl-arm64‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 5.15.79.1 Kernel Configuration
3+
# Linux/arm64 5.15.83.1 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="aarch64-msft-linux-gcc (GCC) 9.3.0"
66
CONFIG_CC_IS_GCC=y
@@ -174,7 +174,7 @@ CONFIG_CGROUP_MISC=y
174174
CONFIG_SOCK_CGROUP_DATA=y
175175
CONFIG_NAMESPACES=y
176176
CONFIG_UTS_NS=y
177-
# CONFIG_TIME_NS is not set
177+
CONFIG_TIME_NS=y
178178
CONFIG_IPC_NS=y
179179
CONFIG_USER_NS=y
180180
CONFIG_PID_NS=y
@@ -745,7 +745,6 @@ CONFIG_BLOCK_HOLDER_DEPRECATED=y
745745
# CONFIG_IOSCHED_BFQ is not set
746746
# end of IO Schedulers
747747

748-
CONFIG_PADATA=y
749748
CONFIG_ASN1=y
750749
CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y
751750
CONFIG_ARCH_INLINE_SPIN_TRYLOCK_BH=y
@@ -865,7 +864,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
865864
# CONFIG_ZPOOL is not set
866865
# CONFIG_ZSMALLOC is not set
867866
CONFIG_GENERIC_EARLY_IOREMAP=y
868-
CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
867+
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
869868
# CONFIG_IDLE_PAGE_TRACKING is not set
870869
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
871870
CONFIG_ARCH_HAS_PTE_DEVMAP=y
@@ -936,6 +935,7 @@ CONFIG_INET_ESP=y
936935
# CONFIG_INET_ESP_OFFLOAD is not set
937936
# CONFIG_INET_ESPINTCP is not set
938937
# CONFIG_INET_IPCOMP is not set
938+
CONFIG_INET_TABLE_PERTURB_ORDER=16
939939
CONFIG_INET_TUNNEL=y
940940
CONFIG_INET_DIAG=y
941941
CONFIG_INET_TCP_DIAG=y
@@ -4236,7 +4236,6 @@ CONFIG_UPROBE_EVENTS=y
42364236
CONFIG_BPF_EVENTS=y
42374237
CONFIG_DYNAMIC_EVENTS=y
42384238
CONFIG_PROBE_EVENTS=y
4239-
# CONFIG_BPF_KPROBE_OVERRIDE is not set
42404239
CONFIG_FTRACE_MCOUNT_RECORD=y
42414240
CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
42424241
# CONFIG_SYNTH_EVENTS is not set
@@ -4268,7 +4267,7 @@ CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
42684267
#
42694268
# CONFIG_KUNIT is not set
42704269
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
4271-
CONFIG_FUNCTION_ERROR_INJECTION=y
4270+
# CONFIG_FUNCTION_ERROR_INJECTION is not set
42724271
# CONFIG_FAULT_INJECTION is not set
42734272
CONFIG_ARCH_HAS_KCOV=y
42744273
CONFIG_CC_HAS_SANCOV_TRACE_PC=y

‎arch/arm/boot/dts/am335x-pcm-953.dtsi‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,20 @@
1212
compatible = "phytec,am335x-pcm-953", "phytec,am335x-phycore-som", "ti,am33xx";
1313

1414
/* Power */
15-
regulators {
16-
vcc3v3: fixedregulator@1 {
17-
compatible = "regulator-fixed";
18-
regulator-name = "vcc3v3";
19-
regulator-min-microvolt = <3300000>;
20-
regulator-max-microvolt = <3300000>;
21-
regulator-boot-on;
22-
};
15+
vcc3v3: fixedregulator1 {
16+
compatible = "regulator-fixed";
17+
regulator-name = "vcc3v3";
18+
regulator-min-microvolt = <3300000>;
19+
regulator-max-microvolt = <3300000>;
20+
regulator-boot-on;
21+
};
2322

24-
vcc1v8: fixedregulator@2 {
25-
compatible = "regulator-fixed";
26-
regulator-name = "vcc1v8";
27-
regulator-min-microvolt = <1800000>;
28-
regulator-max-microvolt = <1800000>;
29-
regulator-boot-on;
30-
};
23+
vcc1v8: fixedregulator2 {
24+
compatible = "regulator-fixed";
25+
regulator-name = "vcc1v8";
26+
regulator-min-microvolt = <1800000>;
27+
regulator-max-microvolt = <1800000>;
28+
regulator-boot-on;
3129
};
3230

3331
/* User IO */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@
660660
compatible = "atmel,at91rm9200-udc";
661661
reg = <0xfffb0000 0x4000>;
662662
interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>;
663-
clocks = <&pmc PMC_TYPE_PERIPHERAL 11>, <&pmc PMC_TYPE_SYSTEM 2>;
663+
clocks = <&pmc PMC_TYPE_PERIPHERAL 11>, <&pmc PMC_TYPE_SYSTEM 1>;
664664
clock-names = "pclk", "hclk";
665665
status = "disabled";
666666
};

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@
3939

4040
};
4141

42+
usb1 {
43+
pinctrl_usb1_vbus_gpio: usb1_vbus_gpio {
44+
atmel,pins =
45+
<AT91_PIOC 5 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PC5 GPIO */
46+
};
47+
};
48+
4249
mmc0_slot1 {
4350
pinctrl_board_mmc0_slot1: mmc0_slot1-board {
4451
atmel,pins =
@@ -84,6 +91,8 @@
8491
};
8592

8693
usb1: gadget@fffa4000 {
94+
pinctrl-0 = <&pinctrl_usb1_vbus_gpio>;
95+
pinctrl-names = "default";
8796
atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
8897
status = "okay";
8998
};

‎arch/arm/boot/dts/imx6q-prti6q.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,8 @@
364364
pinctrl-names = "default";
365365
pinctrl-0 = <&pinctrl_wifi>;
366366
interrupts-extended = <&gpio1 30 IRQ_TYPE_LEVEL_HIGH>;
367-
ref-clock-frequency = "38400000";
368-
tcxo-clock-frequency = "19200000";
367+
ref-clock-frequency = <38400000>;
368+
tcxo-clock-frequency = <19200000>;
369369
};
370370
};
371371

‎arch/arm/boot/dts/rk3036-evb.dts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,10 @@
3131
&i2c1 {
3232
status = "okay";
3333

34-
hym8563: hym8563@51 {
34+
hym8563: rtc@51 {
3535
compatible = "haoyu,hym8563";
3636
reg = <0x51>;
3737
#clock-cells = <0>;
38-
clock-frequency = <32768>;
3938
clock-output-names = "xin32k";
4039
};
4140
};

0 commit comments

Comments
 (0)