Skip to content

Commit b84bc94

Browse files
danvetdanvet
committed
Merge v6.9-rc6 into drm-next
Thomas needs the defio fixes, Maíra needs the vkms fixes and Joonas has some fun with i915-gem conflicts. Signed-off-by: Daniel Vetter <[email protected]>
2 parents 2236a61 + e67572c commit b84bc94

File tree

355 files changed

+3033
-1900
lines changed

Some content is hidden

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

355 files changed

+3033
-1900
lines changed

‎.mailmap

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ Alexei Starovoitov <[email protected]> <[email protected]>
3838
Alexei Starovoitov <[email protected]> <[email protected]>
3939
Alexei Starovoitov <[email protected]> <[email protected]>
4040
Alexey Makhalov <[email protected]> <[email protected]>
41+
Alex Elder <[email protected]>
42+
Alex Elder <[email protected]> <[email protected]>
43+
Alex Elder <[email protected]> <[email protected]>
44+
Alex Elder <[email protected]> <[email protected]>
45+
Alex Elder <[email protected]> <[email protected]>
46+
Alex Elder <[email protected]> <[email protected]>
47+
Alex Elder <[email protected]> <[email protected]>
48+
Alex Elder <[email protected]> <[email protected]>
49+
Alex Elder <[email protected]> <[email protected]>
50+
Alex Elder <[email protected]> <[email protected]>
4151
Alex Hung <[email protected]> <[email protected]>
4252
Alex Shi <[email protected]> <[email protected]>
4353
Alex Shi <[email protected]> <[email protected]>
@@ -98,6 +108,8 @@ Ben Widawsky <[email protected]> <[email protected]>
98108
Ben Widawsky <[email protected]> <[email protected]>
99109
Ben Widawsky <[email protected]> <[email protected]>
100110
Benjamin Poirier <[email protected]> <[email protected]>
111+
Benjamin Tissoires <[email protected]> <[email protected]>
112+
Benjamin Tissoires <[email protected]> <[email protected]>
101113
Bjorn Andersson <[email protected]> <[email protected]>
102114
Bjorn Andersson <[email protected]> <[email protected]>
103115
Bjorn Andersson <[email protected]> <[email protected]>

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3423,6 +3423,9 @@
34233423
arch-independent options, each of which is an
34243424
aggregation of existing arch-specific options.
34253425

3426+
Note, "mitigations" is supported if and only if the
3427+
kernel was built with CPU_MITIGATIONS=y.
3428+
34263429
off
34273430
Disable all optional CPU mitigations. This
34283431
improves system performance, but it may also

‎Documentation/admin-guide/verify-bugs-and-bisect-regressions.rst

Lines changed: 417 additions & 180 deletions
Large diffs are not rendered by default.

‎Documentation/devicetree/bindings/eeprom/at24.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,10 @@ properties:
6868
pattern: cs16$
6969
- items:
7070
pattern: c32$
71-
- items:
72-
pattern: c32d-wl$
7371
- items:
7472
pattern: cs32$
7573
- items:
7674
pattern: c64$
77-
- items:
78-
pattern: c64d-wl$
7975
- items:
8076
pattern: cs64$
8177
- items:
@@ -136,6 +132,7 @@ properties:
136132
- renesas,r1ex24128
137133
- samsung,s524ad0xd1
138134
- const: atmel,24c128
135+
- pattern: '^atmel,24c(32|64)d-wl$' # Actual vendor is st
139136

140137
label:
141138
description: Descriptive name of the EEPROM.

‎Documentation/devicetree/bindings/soc/rockchip/grf.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ allOf:
171171
unevaluatedProperties: false
172172

173173
pcie-phy:
174+
type: object
174175
description:
175176
Documentation/devicetree/bindings/phy/rockchip-pcie-phy.txt
176177

‎Documentation/rust/arch-support.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ support corresponds to ``S`` values in the ``MAINTAINERS`` file.
1616
Architecture Level of support Constraints
1717
============= ================ ==============================================
1818
``arm64`` Maintained Little Endian only.
19-
``loongarch`` Maintained -
19+
``loongarch`` Maintained \-
2020
``um`` Maintained ``x86_64`` only.
2121
``x86`` Maintained ``x86_64`` only.
2222
============= ================ ==============================================

‎Documentation/timers/no_hz.rst

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,8 @@ adaptive-tick CPUs: At least one non-adaptive-tick CPU must remain
129129
online to handle timekeeping tasks in order to ensure that system
130130
calls like gettimeofday() returns accurate values on adaptive-tick CPUs.
131131
(This is not an issue for CONFIG_NO_HZ_IDLE=y because there are no running
132-
user processes to observe slight drifts in clock rate.) Therefore, the
133-
boot CPU is prohibited from entering adaptive-ticks mode. Specifying a
134-
"nohz_full=" mask that includes the boot CPU will result in a boot-time
135-
error message, and the boot CPU will be removed from the mask. Note that
136-
this means that your system must have at least two CPUs in order for
132+
user processes to observe slight drifts in clock rate.) Note that this
133+
means that your system must have at least two CPUs in order for
137134
CONFIG_NO_HZ_FULL=y to do anything for you.
138135

139136
Finally, adaptive-ticks CPUs must have their RCU callbacks offloaded.

‎MAINTAINERS

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7849,9 +7849,8 @@ W: http://aeschi.ch.eu.org/efs/
78497849
F: fs/efs/
78507850

78517851
EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
7852-
M: Douglas Miller <[email protected]>
78537852
L: [email protected]
7854-
S: Maintained
7853+
S: Orphan
78557854
F: drivers/net/ethernet/ibm/ehea/
78567855

78577856
ELM327 CAN NETWORK DRIVER
@@ -9596,7 +9595,7 @@ F: kernel/power/
95969595

95979596
HID CORE LAYER
95989597
M: Jiri Kosina <[email protected]>
9599-
M: Benjamin Tissoires <[email protected]>
9598+
M: Benjamin Tissoires <[email protected]>
96009599
L: [email protected]
96019600
S: Maintained
96029601
T: git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
@@ -16827,12 +16826,6 @@ S: Maintained
1682716826
F: drivers/leds/leds-pca9532.c
1682816827
F: include/linux/leds-pca9532.h
1682916828

16830-
PCA9541 I2C BUS MASTER SELECTOR DRIVER
16831-
M: Guenter Roeck <[email protected]>
16832-
L: [email protected]
16833-
S: Maintained
16834-
F: drivers/i2c/muxes/i2c-mux-pca9541.c
16835-
1683616829
PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
1683716830
M: Thomas Petazzoni <[email protected]>
1683816831
M: Pali Rohár <[email protected]>
@@ -17901,7 +17894,7 @@ F: Documentation/devicetree/bindings/leds/irled/pwm-ir-tx.yaml
1790117894
F: drivers/media/rc/pwm-ir-tx.c
1790217895

1790317896
PWM SUBSYSTEM
17904-
M: Uwe Kleine-König <[email protected]>
17897+
M: Uwe Kleine-König <[email protected]>
1790517898
L: [email protected]
1790617899
S: Maintained
1790717900
Q: https://patchwork.ozlabs.org/project/linux-pwm/list/
@@ -20205,7 +20198,6 @@ F: include/linux/platform_data/simplefb.h
2020520198

2020620199
SIOX
2020720200
M: Thorsten Scherer <[email protected]>
20208-
M: Uwe Kleine-König <[email protected]>
2020920201
R: Pengutronix Kernel Team <[email protected]>
2021020202
S: Supported
2021120203
F: drivers/gpio/gpio-siox.c
@@ -22867,7 +22859,7 @@ F: drivers/usb/host/ehci*
2286722859

2286822860
USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
2286922861
M: Jiri Kosina <[email protected]>
22870-
M: Benjamin Tissoires <[email protected]>
22862+
M: Benjamin Tissoires <[email protected]>
2287122863
L: [email protected]
2287222864
S: Maintained
2287322865
T: git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 9
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc5
5+
EXTRAVERSION = -rc6
66
NAME = Hurr durr I'ma ninja sloth
77

88
# *DOCUMENTATION*

‎arch/Kconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
#
1010
source "arch/$(SRCARCH)/Kconfig"
1111

12+
config ARCH_CONFIGURES_CPU_MITIGATIONS
13+
bool
14+
15+
if !ARCH_CONFIGURES_CPU_MITIGATIONS
16+
config CPU_MITIGATIONS
17+
def_bool y
18+
endif
19+
1220
menu "General architecture-dependent options"
1321

1422
config ARCH_HAS_SUBPAGE_FAULTS

0 commit comments

Comments
 (0)