Skip to content

Commit 918dbaa

Browse files
tyhickstyhicks
committed
Merge tag 'rolling-lts/wsl/5.10.74.3' into linux-msft-wsl-5.10.y
Signed-off-by: Tyler Hicks <[email protected]>
2 parents e445d06 + da6d2cb commit 918dbaa

File tree

1,340 files changed

+14843
-8400
lines changed

Some content is hidden

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

1,340 files changed

+14843
-8400
lines changed

‎Documentation/admin-guide/devices.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3003,10 +3003,10 @@
30033003
65 = /dev/infiniband/issm1 Second InfiniBand IsSM device
30043004
...
30053005
127 = /dev/infiniband/issm63 63rd InfiniBand IsSM device
3006-
128 = /dev/infiniband/uverbs0 First InfiniBand verbs device
3007-
129 = /dev/infiniband/uverbs1 Second InfiniBand verbs device
3006+
192 = /dev/infiniband/uverbs0 First InfiniBand verbs device
3007+
193 = /dev/infiniband/uverbs1 Second InfiniBand verbs device
30083008
...
3009-
159 = /dev/infiniband/uverbs31 31st InfiniBand verbs device
3009+
223 = /dev/infiniband/uverbs31 31st InfiniBand verbs device
30103010

30113011
232 char Biometric Devices
30123012
0 = /dev/biometric/sensor0/fingerprint first fingerprint sensor on first device

‎Documentation/devicetree/bindings/arm/tegra.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ properties:
5454
- const: toradex,apalis_t30
5555
- const: nvidia,tegra30
5656
- items:
57-
- const: toradex,apalis_t30-eval-v1.1
57+
- const: toradex,apalis_t30-v1.1-eval
5858
- const: toradex,apalis_t30-eval
5959
- const: toradex,apalis_t30-v1.1
6060
- const: toradex,apalis_t30

‎Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ properties:
1818
const: ti,sn65dsi86
1919

2020
reg:
21-
const: 0x2d
21+
enum: [ 0x2c, 0x2d ]
2222

2323
enable-gpios:
2424
maxItems: 1

‎Documentation/devicetree/bindings/mtd/gpmc-nand.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ on various other factors also like;
122122
so the device should have enough free bytes available its OOB/Spare
123123
area to accommodate ECC for entire page. In general following expression
124124
helps in determining if given device can accommodate ECC syndrome:
125-
"2 + (PAGESIZE / 512) * ECC_BYTES" >= OOBSIZE"
125+
"2 + (PAGESIZE / 512) * ECC_BYTES" <= OOBSIZE"
126126
where
127127
OOBSIZE number of bytes in OOB/spare area
128128
PAGESIZE number of bytes in main-area of device page

‎Documentation/devicetree/bindings/pinctrl/marvell,armada-37xx-pinctrl.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,19 @@ group emmc_nb
4343

4444
group pwm0
4545
- pin 11 (GPIO1-11)
46-
- functions pwm, gpio
46+
- functions pwm, led, gpio
4747

4848
group pwm1
4949
- pin 12
50-
- functions pwm, gpio
50+
- functions pwm, led, gpio
5151

5252
group pwm2
5353
- pin 13
54-
- functions pwm, gpio
54+
- functions pwm, led, gpio
5555

5656
group pwm3
5757
- pin 14
58-
- functions pwm, gpio
58+
- functions pwm, led, gpio
5959

6060
group pmic1
6161
- pin 7

‎Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ allOf:
2424
select:
2525
properties:
2626
compatible:
27-
items:
28-
- enum:
29-
- sifive,fu540-c000-ccache
27+
contains:
28+
enum:
29+
- sifive,fu540-c000-ccache
3030

3131
required:
3232
- compatible

‎Documentation/fault-injection/provoke-crashes.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ recur_count
2929
cpoint_name
3030
Where in the kernel to trigger the action. It can be
3131
one of INT_HARDWARE_ENTRY, INT_HW_IRQ_EN, INT_TASKLET_ENTRY,
32-
FS_DEVRW, MEM_SWAPOUT, TIMERADD, SCSI_DISPATCH_CMD,
32+
FS_DEVRW, MEM_SWAPOUT, TIMERADD, SCSI_QUEUE_RQ,
3333
IDE_CORE_CP, or DIRECT
3434

3535
cpoint_type

‎MSFT-Merge/log‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Name SHA1
22
---- ----
3-
feature/dxgkrnl 3e7da95cabd802dcb7efe0c8d87937577f339b0c
3+
feature/dxgkrnl 033834b77c45ba35458360b04138b64648868285
44
feature/hvlite_virtio_pmem 8ed02398963202256abd952bbf6d53f41eb9335b
5-
feature/hyperv-arm64 dbcb21895f2dec6effe8cce5e35849459c13bc1d
6-
feature/mm_discard a5aa98477440e9854b884213a2244041923888b7
5+
feature/hyperv-arm64 afa4d09ede9ba4f899d5db1a31bcfb0b1d908abd
6+
feature/mm_discard b1cf932ecc8462746454f55746701bc61422392c
77
feature/vpci 36ff104bbd687683baa2b83376fa4854da6f7b15
88
product/wsl/readme b12910a095ece9806def0331175720bc01c6a65f

‎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 = 10
4-
SUBLEVEL = 60
5-
EXTRAVERSION =.1
4+
SUBLEVEL = 74
5+
EXTRAVERSION =.3
66
NAME = Dare mighty things
77

88
# *DOCUMENTATION*

‎Microsoft/config-wsl‎

Lines changed: 14 additions & 3 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.10.60.1 Kernel Configuration
3+
# Linux/x86 5.10.74.3 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="x86_64-msft-linux-gcc (GCC) 9.3.0"
66
CONFIG_CC_IS_GCC=y
@@ -1572,6 +1572,8 @@ CONFIG_ALLOW_DEV_COREDUMP=y
15721572
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
15731573
CONFIG_GENERIC_CPU_AUTOPROBE=y
15741574
CONFIG_GENERIC_CPU_VULNERABILITIES=y
1575+
CONFIG_DMA_SHARED_BUFFER=y
1576+
# CONFIG_DMA_FENCE_TRACE is not set
15751577
# end of Generic Driver Options
15761578

15771579
#
@@ -2557,8 +2559,11 @@ CONFIG_RTC_DRV_CMOS=y
25572559
#
25582560
# DMABUF options
25592561
#
2560-
# CONFIG_SYNC_FILE is not set
2562+
CONFIG_SYNC_FILE=y
2563+
# CONFIG_SW_SYNC is not set
2564+
# CONFIG_UDMABUF is not set
25612565
# CONFIG_DMABUF_MOVE_NOTIFY is not set
2566+
# CONFIG_DMABUF_SELFTESTS is not set
25622567
# CONFIG_DMABUF_HEAPS is not set
25632568
# end of DMABUF options
25642569

@@ -3480,7 +3485,13 @@ CONFIG_DEBUG_BUGVERBOSE=y
34803485
#
34813486
# Compile-time checks and compiler options
34823487
#
3483-
# CONFIG_DEBUG_INFO is not set
3488+
CONFIG_DEBUG_INFO=y
3489+
# CONFIG_DEBUG_INFO_REDUCED is not set
3490+
# CONFIG_DEBUG_INFO_COMPRESSED is not set
3491+
# CONFIG_DEBUG_INFO_SPLIT is not set
3492+
# CONFIG_DEBUG_INFO_DWARF4 is not set
3493+
CONFIG_DEBUG_INFO_BTF=y
3494+
# CONFIG_GDB_SCRIPTS is not set
34843495
# CONFIG_ENABLE_MUST_CHECK is not set
34853496
CONFIG_FRAME_WARN=1024
34863497
# CONFIG_STRIP_ASM_SYMS is not set

0 commit comments

Comments
 (0)