Skip to content

Commit 1a50d14

Browse files
committed
Merge tag 'v6.10-rc6' into for-6.11/block-post
Pull in v6.10-rc6 to resolve a conflict for the integrity cleanups. * tag 'v6.10-rc6': (778 commits) Linux 6.10-rc6 ata: ahci: Clean up sysfs file on error ata: libata-core: Fix double free on error ata,scsi: libata-core: Do not leak memory for ata_port struct members ata: libata-core: Fix null pointer dereference on error x86-32: fix cmpxchg8b_emu build error with clang x86: stop playing stack games in profile_pc() i2c: testunit: discard write requests while old command is running i2c: testunit: don't erase registers after STOP tty: mxser: Remove __counted_by from mxser_board.ports[] randomize_kstack: Remove non-functional per-arch entropy filtering string: kunit: add missing MODULE_DESCRIPTION() macros ata: libata-core: Add ATA_HORKAGE_NOLPM for all Crucial BX SSD1 models MAINTAINERS: Update IOMMU tree location tools/power turbostat: Add local build_bug.h header for snapshot target tools/power turbostat: Fix unc freq columns not showing with '-q' or '-l' tools/power turbostat: option '-n' is ambiguous drm/drm_file: Fix pid refcounting race kallsyms: rework symbol lookup return codes gpiolib: cdev: Ignore reconfiguration without direction ... Signed-off-by: Jens Axboe <[email protected]>
2 parents 98d34c0 + 22a40d1 commit 1a50d14

File tree

800 files changed

+10278
-5565
lines changed

Some content is hidden

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

800 files changed

+10278
-5565
lines changed

.editorconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ root = true
55
[{*.{awk,c,dts,dtsi,dtso,h,mk,s,S},Kconfig,Makefile,Makefile.*}]
66
charset = utf-8
77
end_of_line = lf
8-
trim_trailing_whitespace = true
98
insert_final_newline = true
109
indent_style = tab
1110
indent_size = 8
1211

1312
[*.{json,py,rs}]
1413
charset = utf-8
1514
end_of_line = lf
16-
trim_trailing_whitespace = true
1715
insert_final_newline = true
1816
indent_style = space
1917
indent_size = 4
@@ -26,7 +24,6 @@ indent_size = 8
2624
[*.yaml]
2725
charset = utf-8
2826
end_of_line = lf
29-
trim_trailing_whitespace = unset
3027
insert_final_newline = true
3128
indent_style = space
3229
indent_size = 2

.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ Andrey Ryabinin <[email protected]> <[email protected]>
7272
7373
7474
Andy Adamson <[email protected]>
75+
76+
7577
7678
7779
@@ -217,6 +219,7 @@ Geliang Tang <[email protected]> <[email protected]>
217219
218220
219221
222+
220223
221224
222225
@@ -605,6 +608,7 @@ Simon Kelley <[email protected]>
605608
Sricharan Ramabadhran <[email protected]> <[email protected]>
606609
607610
611+
Stanislav Fomichev <[email protected]> <[email protected]>
608612
609613
Stéphane Witzmann <[email protected]>
610614

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -788,25 +788,6 @@
788788
Documentation/networking/netconsole.rst for an
789789
alternative.
790790

791-
<DEVNAME>:<n>.<n>[,options]
792-
Use the specified serial port on the serial core bus.
793-
The addressing uses DEVNAME of the physical serial port
794-
device, followed by the serial core controller instance,
795-
and the serial port instance. The options are the same
796-
as documented for the ttyS addressing above.
797-
798-
The mapping of the serial ports to the tty instances
799-
can be viewed with:
800-
801-
$ ls -d /sys/bus/serial-base/devices/*:*.*/tty/*
802-
/sys/bus/serial-base/devices/00:04:0.0/tty/ttyS0
803-
804-
In the above example, the console can be addressed with
805-
console=00:04:0.0. Note that a console addressed this
806-
way will only get added when the related device driver
807-
is ready. The use of an earlycon parameter in addition to
808-
the console may be desired for console output early on.
809-
810791
uart[8250],io,<addr>[,options]
811792
uart[8250],mmio,<addr>[,options]
812793
uart[8250],mmio16,<addr>[,options]
@@ -2192,12 +2173,6 @@
21922173
Format: 0 | 1
21932174
Default set by CONFIG_INIT_ON_FREE_DEFAULT_ON.
21942175

2195-
init_mlocked_on_free= [MM] Fill freed userspace memory with zeroes if
2196-
it was mlock'ed and not explicitly munlock'ed
2197-
afterwards.
2198-
Format: 0 | 1
2199-
Default set by CONFIG_INIT_MLOCKED_ON_FREE_DEFAULT_ON
2200-
22012176
init_pkru= [X86] Specify the default memory protection keys rights
22022177
register contents for all processes. 0x55555554 by
22032178
default (disallow access to all but pkey 0). Can

Documentation/devicetree/bindings/dma/fsl,edma.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ properties:
5959
- 3
6060

6161
dma-channels:
62-
minItems: 1
63-
maxItems: 64
62+
minimum: 1
63+
maximum: 64
6464

6565
clocks:
6666
minItems: 1

Documentation/devicetree/bindings/i2c/atmel,at91sam-i2c.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ required:
7777
- clocks
7878

7979
allOf:
80-
- $ref: i2c-controller.yaml
80+
- $ref: /schemas/i2c/i2c-controller.yaml#
8181
- if:
8282
properties:
8383
compatible:

Documentation/devicetree/bindings/i2c/google,cros-ec-i2c-tunnel.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ description: |
2121
google,cros-ec-spi or google,cros-ec-i2c.
2222
2323
allOf:
24-
- $ref: i2c-controller.yaml#
24+
- $ref: /schemas/i2c/i2c-controller.yaml#
2525

2626
properties:
2727
compatible:

Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ allOf:
139139
Voltage output range of the channel as <minimum, maximum>
140140
Required connections:
141141
Rfb1x for: 0 to 2.5 V; 0 to 3V; 0 to 5 V;
142-
Rfb2x for: 0 to 10 V; 2.5 to 7.5V; -5 to 5 V;
142+
Rfb2x for: 0 to 10 V; -2.5 to 7.5V; -5 to 5 V;
143143
oneOf:
144144
- items:
145145
- const: 0

Documentation/devicetree/bindings/net/fsl,fman-dtsec.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ required:
128128
- cell-index
129129
- reg
130130
- fsl,fman-ports
131-
- ptp-timer
132131

133132
dependencies:
134133
pcs-handle-names:

Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ properties:
2929
- qcom,pm7325-gpio
3030
- qcom,pm7550ba-gpio
3131
- qcom,pm8005-gpio
32-
- qcom,pm8008-gpio
3332
- qcom,pm8018-gpio
3433
- qcom,pm8019-gpio
3534
- qcom,pm8038-gpio
@@ -126,7 +125,6 @@ allOf:
126125
compatible:
127126
contains:
128127
enum:
129-
- qcom,pm8008-gpio
130128
- qcom,pmi8950-gpio
131129
- qcom,pmr735d-gpio
132130
then:
@@ -448,7 +446,6 @@ $defs:
448446
- gpio1-gpio10 for pm7325
449447
- gpio1-gpio8 for pm7550ba
450448
- gpio1-gpio4 for pm8005
451-
- gpio1-gpio2 for pm8008
452449
- gpio1-gpio6 for pm8018
453450
- gpio1-gpio12 for pm8038
454451
- gpio1-gpio40 for pm8058

Documentation/devicetree/bindings/usb/realtek,rts5411.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ patternProperties:
6565
description: The hard wired USB devices
6666
type: object
6767
$ref: /schemas/usb/usb-device.yaml
68+
additionalProperties: true
6869

6970
required:
7071
- peer-hub

0 commit comments

Comments
 (0)