Skip to content

Commit 50470d3

Browse files
committed
Merge remote-tracking branch 'vfs/stable-struct_fd'
Merge Al Viro's struct fd refactorings. Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
2 parents 4a4c013 + de12c33 commit 50470d3

File tree

483 files changed

+8959
-3672
lines changed

Some content is hidden

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

483 files changed

+8959
-3672
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com>
260260
Jakub Kicinski <kuba@kernel.org> <jakub.kicinski@netronome.com>
261261
James Bottomley <jejb@mulgrave.(none)>
262262
James Bottomley <jejb@titanic.il.steeleye.com>
263+
James Clark <james.clark@linaro.org> <james.clark@arm.com>
263264
James E Wilson <wilson@specifix.com>
264265
James Hogan <jhogan@kernel.org> <james@albanarts.com>
265266
James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>

Documentation/ABI/testing/debugfs-cxl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ Description:
1414
event to its internal Informational Event log, updates the
1515
Event Status register, and if configured, interrupts the host.
1616
It is not an error to inject poison into an address that
17-
already has poison present and no error is returned. The
18-
inject_poison attribute is only visible for devices supporting
19-
the capability.
17+
already has poison present and no error is returned. If the
18+
device returns 'Inject Poison Limit Reached' an -EBUSY error
19+
is returned to the user. The inject_poison attribute is only
20+
visible for devices supporting the capability.
2021

2122

2223
What: /sys/kernel/debug/memX/clear_poison

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3830,9 +3830,6 @@
38303830

38313831
noalign [KNL,ARM]
38323832

3833-
noaltinstr [S390,EARLY] Disables alternative instructions
3834-
patching (CPU alternatives feature).
3835-
38363833
noapic [SMP,APIC,EARLY] Tells the kernel to not make use of any
38373834
IOAPICs that may be present in the system.
38383835

Documentation/arch/riscv/hwprobe.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,3 +264,5 @@ The following keys are defined:
264264

265265
* :c:macro:`RISCV_HWPROBE_KEY_HIGHEST_VIRT_ADDRESS`: An unsigned long which
266266
represent the highest userspace virtual address usable.
267+
268+
* :c:macro:`RISCV_HWPROBE_KEY_TIME_CSR_FREQ`: Frequency (in Hz) of `time CSR`.

Documentation/arch/riscv/vm-layout.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,12 @@ RISC-V Linux Kernel SV39
4747
| Kernel-space virtual memory, shared between all processes:
4848
____________________________________________________________|___________________________________________________________
4949
| | | |
50-
ffffffc6fea00000 | -228 GB | ffffffc6feffffff | 6 MB | fixmap
51-
ffffffc6ff000000 | -228 GB | ffffffc6ffffffff | 16 MB | PCI io
52-
ffffffc700000000 | -228 GB | ffffffc7ffffffff | 4 GB | vmemmap
53-
ffffffc800000000 | -224 GB | ffffffd7ffffffff | 64 GB | vmalloc/ioremap space
54-
ffffffd800000000 | -160 GB | fffffff6ffffffff | 124 GB | direct mapping of all physical memory
50+
ffffffc4fea00000 | -236 GB | ffffffc4feffffff | 6 MB | fixmap
51+
ffffffc4ff000000 | -236 GB | ffffffc4ffffffff | 16 MB | PCI io
52+
ffffffc500000000 | -236 GB | ffffffc5ffffffff | 4 GB | vmemmap
53+
ffffffc600000000 | -232 GB | ffffffd5ffffffff | 64 GB | vmalloc/ioremap space
54+
ffffffd600000000 | -168 GB | fffffff5ffffffff | 128 GB | direct mapping of all physical memory
55+
| | | |
5556
fffffff700000000 | -36 GB | fffffffeffffffff | 32 GB | kasan
5657
__________________|____________|__________________|_________|____________________________________________________________
5758
|

Documentation/devicetree/bindings/arm/arm,coresight-dummy-sink.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ description: |
3030
maintainers:
3131
- Mike Leach <mike.leach@linaro.org>
3232
- Suzuki K Poulose <suzuki.poulose@arm.com>
33-
- James Clark <james.clark@arm.com>
33+
- James Clark <james.clark@linaro.org>
3434
- Mao Jinlong <quic_jinlmao@quicinc.com>
3535
- Hao Zhang <quic_hazha@quicinc.com>
3636

Documentation/devicetree/bindings/arm/arm,coresight-dummy-source.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ description: |
2929
maintainers:
3030
- Mike Leach <mike.leach@linaro.org>
3131
- Suzuki K Poulose <suzuki.poulose@arm.com>
32-
- James Clark <james.clark@arm.com>
32+
- James Clark <james.clark@linaro.org>
3333
- Mao Jinlong <quic_jinlmao@quicinc.com>
3434
- Hao Zhang <quic_hazha@quicinc.com>
3535

Documentation/devicetree/bindings/display/panel/samsung,atna33xc20.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,13 @@ allOf:
1414

1515
properties:
1616
compatible:
17-
const: samsung,atna33xc20
17+
oneOf:
18+
# Samsung 13.3" FHD (1920x1080 pixels) eDP AMOLED panel
19+
- const: samsung,atna33xc20
20+
# Samsung 14.5" WQXGA+ (2880x1800 pixels) eDP AMOLED panel
21+
- items:
22+
- const: samsung,atna45af01
23+
- const: samsung,atna33xc20
1824

1925
enable-gpios: true
2026
port: true

Documentation/devicetree/bindings/i3c/i3c.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ patternProperties:
9191
- const: 0
9292
- description: |
9393
Shall encode the I3C LVR (Legacy Virtual Register):
94+
See include/dt-bindings/i3c/i3c.h
9495
bit[31:8]: unused/ignored
9596
bit[7:5]: I2C device index. Possible values:
9697
* 0: I2C device has a 50 ns spike filter
@@ -153,6 +154,8 @@ additionalProperties: true
153154

154155
examples:
155156
- |
157+
#include <dt-bindings/i3c/i3c.h>
158+
156159
i3c@d040000 {
157160
compatible = "cdns,i3c-master";
158161
clocks = <&coreclock>, <&i3csysclock>;
@@ -166,7 +169,7 @@ examples:
166169
/* I2C device. */
167170
eeprom@57 {
168171
compatible = "atmel,24c01";
169-
reg = <0x57 0x0 0x10>;
172+
reg = <0x57 0x0 (I2C_FM | I2C_FILTER)>;
170173
pagesize = <0x8>;
171174
};
172175

Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,16 @@ properties:
2020
maxItems: 1
2121

2222
clocks:
23-
maxItems: 1
23+
minItems: 1
24+
items:
25+
- description: Core clock
26+
- description: APB clock
27+
28+
clock-names:
29+
minItems: 1
30+
items:
31+
- const: core
32+
- const: apb
2433

2534
interrupts:
2635
maxItems: 1

0 commit comments

Comments
 (0)