Skip to content

Commit 55ed74e

Browse files
kelsey-steelekelsey-steele
committed
Merge tag 'rolling-lts/wsl/5.15.74.2' into linux-msft-wsl-5.15.y
Signed-off-by: Kelsey Steele <[email protected]>
2 parents b5fe163 + 54740df commit 55ed74e

File tree

379 files changed

+3120
-2168
lines changed

Some content is hidden

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

379 files changed

+3120
-2168
lines changed

‎Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ Example:
3434
Use specific request line passing from dma
3535
For example, MMC request line is 5
3636

37-
sdhci: sdhci@98e00000 {
38-
compatible = "moxa,moxart-sdhci";
37+
mmc: mmc@98e00000 {
38+
compatible = "moxa,moxart-mmc";
3939
reg = <0x98e00000 0x5C>;
4040
interrupts = <5 0>;
4141
clocks = <&clk_apb>;

‎Documentation/devicetree/bindings/iio/gyroscope/bosch,bmg160.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ properties:
2424

2525
interrupts:
2626
minItems: 1
27+
maxItems: 2
2728
description:
2829
Should be configured with type IRQ_TYPE_EDGE_RISING.
30+
If two interrupts are provided, expected order is INT1 and INT2.
2931

3032
required:
3133
- compatible

‎Documentation/input/joydev/joystick.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,7 @@ All I-Force devices are supported by the iforce module. This includes:
517517
* AVB Mag Turbo Force
518518
* AVB Top Shot Pegasus
519519
* AVB Top Shot Force Feedback Racing Wheel
520+
* Boeder Force Feedback Wheel
520521
* Logitech WingMan Force
521522
* Logitech WingMan Force Wheel
522523
* Guillemot Race Leader Force Feedback

‎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, Mishi Choudhary <mishi@linux.com>.
54+
reach out to our conflict mediator, Joanna Lee <joanna.lee@gesmer.com>.
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

‎MSFT-Merge/log‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ feature/arm64-hyperv-synthetic-clocks-timers/5.15 59db35e760b9bacc8596a3660a124
66
feature/dxgkrnl/5.15 411a9171ae715efe3817a05a1802f9367c04df33
77
feature/hvlite_virtio_pmem/5.15 9194f84de8a58bc1a83125054286d649e35054be
88
feature/vpci/5.15 d19bb684cca000b65a3b001964a3cc820cbbf9b5
9+
fix/vsock/5.15 c9e883dfbd7be1194e53133d888b435b277e2e5b
910
product/wsl/readme/5.15 0e1ddcfdc9986e1bf420a3663011abd79752c642
1011
product/wsl/security/5.15 ab2488a9f10a3b83b958103c9b3ed728eb57c564

‎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 = 68
5-
EXTRAVERSION = .1
4+
SUBLEVEL = 74
5+
EXTRAVERSION = .2
66
NAME = Trick or Treat
77

88
# *DOCUMENTATION*

‎Microsoft/config-wsl‎

Lines changed: 2 additions & 2 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.68.1 Kernel Configuration
3+
# Linux/x86 5.15.74.2 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="x86_64-msft-linux-gcc (GCC) 9.3.0"
66
CONFIG_CC_IS_GCC=y
@@ -1143,7 +1143,7 @@ CONFIG_NETFILTER_XT_MATCH_HL=y
11431143
CONFIG_NETFILTER_XT_MATCH_IPVS=y
11441144
# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
11451145
# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
1146-
# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
1146+
CONFIG_NETFILTER_XT_MATCH_LIMIT=y
11471147
# CONFIG_NETFILTER_XT_MATCH_MAC is not set
11481148
# CONFIG_NETFILTER_XT_MATCH_MARK is not set
11491149
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y

‎Microsoft/config-wsl-arm64‎

Lines changed: 2 additions & 2 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.68.1 Kernel Configuration
3+
# Linux/arm64 5.15.74.2 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="aarch64-msft-linux-gcc (GCC) 9.3.0"
66
CONFIG_CC_IS_GCC=y
@@ -1112,7 +1112,7 @@ CONFIG_NETFILTER_XT_MATCH_HL=y
11121112
CONFIG_NETFILTER_XT_MATCH_IPVS=y
11131113
# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
11141114
# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
1115-
# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
1115+
CONFIG_NETFILTER_XT_MATCH_LIMIT=y
11161116
# CONFIG_NETFILTER_XT_MATCH_MAC is not set
11171117
# CONFIG_NETFILTER_XT_MATCH_MARK is not set
11181118
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,8 +1500,7 @@
15001500
mmc1: mmc@0 {
15011501
compatible = "ti,am335-sdhci";
15021502
ti,needs-special-reset;
1503-
dmas = <&edma_xbar 24 0 0
1504-
&edma_xbar 25 0 0>;
1503+
dmas = <&edma 24 0>, <&edma 25 0>;
15051504
dma-names = "tx", "rx";
15061505
interrupts = <64>;
15071506
reg = <0x0 0x1000>;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
status = "disabled";
2626
};
2727

28+
&usb4_tm {
29+
status = "disabled";
30+
};
31+
2832
&atl_tm {
2933
status = "disabled";
3034
};

0 commit comments

Comments
 (0)