Skip to content

Commit f60f36d

Browse files
chessturochessturo
committed
Merge tag 'rolling-lts/wsl/6.6.87.1' into user/chessturo/6.6.87.1
Linux rolling-lts/wsl/6.6.87.1 Signed-off-by: Mitchell Levy <[email protected]>
2 parents f6f9c9a + ca020ef commit f60f36d

File tree

374 files changed

+3468
-1889
lines changed

Some content is hidden

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

374 files changed

+3468
-1889
lines changed

‎Documentation/devicetree/bindings/vendor-prefixes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,8 @@ patternProperties:
524524
description: GlobalTop Technology, Inc.
525525
"^gmt,.*":
526526
description: Global Mixed-mode Technology, Inc.
527+
"^gocontroll,.*":
528+
description: GOcontroll Modular Embedded Electronics B.V.
527529
"^goldelico,.*":
528530
description: Golden Delicious Computers GmbH & Co. KG
529531
"^goodix,.*":

‎MSFT-Merge/log‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Name SHA1
22
---- ----
3-
config/wsl-6.6 2e4107a7ac87f36f6de6340915cd70f7a519e41d
3+
config/wsl-6.6 6ef5424f03866bdc448beb946751bb85233cbace
44
feature/arm64-hyperv-hypercall-interface/6.6 8db985fdc14b63b0520d4286eaf57b04b25e00a4
55
feature/arm64-hyperv-synthetic-clocks-timers/6.6 27ff58a87b8e8f33461b2443efe4dfa6487ad352
6-
feature/dxgkrnl/6.6 b75d75bf0bc7c5a3e33e9e08e6b9a82af0dc2719
7-
feature/hvlite_virtio_pmem/6.6 7d955beb0207d880fa1862b1ace8487057b5aa6c
6+
feature/dxgkrnl/6.6 d4ec8a2216634e7c0ca058214febce3a2f029bc6
7+
feature/hvlite_virtio_pmem/6.6 ed182130a52524b3225bd20f88dbdec80b8f5bbe
88
feature/wsl-module-script/6.6 c313d7377ddbf534848625cce7f175389e553e48
99
fix/hv_utils_clock/6.6 a34090e9209d3d3db3d97aa567bb323ebc7620a4
1010
product/wsl/readme/6.6 3c7e4de9ac43d3e052f8d9247cbd79fed1d8999f

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 6
4-
SUBLEVEL = 84
4+
SUBLEVEL = 87
55
EXTRAVERSION = .1
66
NAME = Pinguïn Aangedreven
77

‎arch/arm/boot/dts/broadcom/bcm2711.dtsi‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
clocks = <&clocks BCM2835_CLOCK_UART>,
135135
<&clocks BCM2835_CLOCK_VPU>;
136136
clock-names = "uartclk", "apb_pclk";
137-
arm,primecell-periphid = <0x00241011>;
137+
arm,primecell-periphid = <0x00341011>;
138138
status = "disabled";
139139
};
140140

@@ -145,7 +145,7 @@
145145
clocks = <&clocks BCM2835_CLOCK_UART>,
146146
<&clocks BCM2835_CLOCK_VPU>;
147147
clock-names = "uartclk", "apb_pclk";
148-
arm,primecell-periphid = <0x00241011>;
148+
arm,primecell-periphid = <0x00341011>;
149149
status = "disabled";
150150
};
151151

@@ -156,7 +156,7 @@
156156
clocks = <&clocks BCM2835_CLOCK_UART>,
157157
<&clocks BCM2835_CLOCK_VPU>;
158158
clock-names = "uartclk", "apb_pclk";
159-
arm,primecell-periphid = <0x00241011>;
159+
arm,primecell-periphid = <0x00341011>;
160160
status = "disabled";
161161
};
162162

@@ -167,7 +167,7 @@
167167
clocks = <&clocks BCM2835_CLOCK_UART>,
168168
<&clocks BCM2835_CLOCK_VPU>;
169169
clock-names = "uartclk", "apb_pclk";
170-
arm,primecell-periphid = <0x00241011>;
170+
arm,primecell-periphid = <0x00341011>;
171171
status = "disabled";
172172
};
173173

@@ -451,8 +451,6 @@
451451
IRQ_TYPE_LEVEL_LOW)>,
452452
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) |
453453
IRQ_TYPE_LEVEL_LOW)>;
454-
/* This only applies to the ARMv7 stub */
455-
arm,cpu-registers-not-fw-configured;
456454
};
457455

458456
cpus: cpus {
@@ -1155,6 +1153,7 @@
11551153
};
11561154

11571155
&uart0 {
1156+
arm,primecell-periphid = <0x00341011>;
11581157
interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
11591158
};
11601159

‎arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@
101101
};
102102
};
103103

104+
poweroff {
105+
compatible = "regulator-poweroff";
106+
cpu-supply = <&vgen2_reg>;
107+
};
108+
104109
reg_module_3v3: regulator-module-3v3 {
105110
compatible = "regulator-fixed";
106111
regulator-always-on;
@@ -220,10 +225,6 @@
220225
status = "disabled";
221226
};
222227

223-
&clks {
224-
fsl,pmic-stby-poweroff;
225-
};
226-
227228
/* Apalis SPI1 */
228229
&ecspi1 {
229230
cs-gpios = <&gpio5 25 GPIO_ACTIVE_LOW>;
@@ -511,7 +512,6 @@
511512

512513
pmic: pmic@8 {
513514
compatible = "fsl,pfuze100";
514-
fsl,pmic-stby-poweroff;
515515
reg = <0x08>;
516516

517517
regulators {

‎arch/arm/mach-davinci/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ config ARCH_DAVINCI_DA830
2727

2828
config ARCH_DAVINCI_DA850
2929
bool "DA850/OMAP-L138/AM18x based system"
30+
select ARCH_DAVINCI_DA8XX
3031
select DAVINCI_CP_INTC
3132

3233
config ARCH_DAVINCI_DA8XX

‎arch/arm/mach-omap1/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ menuconfig ARCH_OMAP1
99
select ARCH_OMAP
1010
select CLKSRC_MMIO
1111
select FORCE_PCI if PCCARD
12+
select GENERIC_IRQ_CHIP
1213
select GPIOLIB
1314
help
1415
Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)

‎arch/arm/mach-shmobile/headsmp.S‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ ENDPROC(shmobile_smp_sleep)
136136
.long shmobile_smp_arg - 1b
137137

138138
.bss
139+
.align 2
139140
.globl shmobile_smp_mpidr
140141
shmobile_smp_mpidr:
141142
.space NR_CPUS * 4

‎arch/arm/mm/fault.c‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@
2727

2828
#ifdef CONFIG_MMU
2929

30+
bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size)
31+
{
32+
unsigned long addr = (unsigned long)unsafe_src;
33+
34+
return addr >= TASK_SIZE && ULONG_MAX - addr >= size;
35+
}
36+
3037
/*
3138
* This is useful to dump out the page tables associated with
3239
* 'addr' in mm 'mm'.
@@ -556,6 +563,7 @@ do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
556563
if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
557564
return;
558565

566+
pr_alert("8<--- cut here ---\n");
559567
pr_alert("Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
560568
inf->name, ifsr, addr);
561569

‎arch/arm64/boot/dts/freescale/imx8mm-verdin-dahlia.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"Headphone Jack", "HPOUTR",
1717
"IN2L", "Line In Jack",
1818
"IN2R", "Line In Jack",
19-
"Headphone Jack", "MICBIAS",
20-
"IN1L", "Headphone Jack";
19+
"Microphone Jack", "MICBIAS",
20+
"IN1L", "Microphone Jack";
2121
simple-audio-card,widgets =
22-
"Microphone", "Headphone Jack",
22+
"Microphone", "Microphone Jack",
2323
"Headphone", "Headphone Jack",
2424
"Line", "Line In Jack";
2525

0 commit comments

Comments
 (0)