Skip to content

Commit 38962d9

Browse files
committed
Merge mainline pipe changes
Mainline now contains various changes to pipes that are relevant for other pipe work this cycle. So merge them into the respective VFS tree. Signed-off-by: Christian Brauner <brauner@kernel.org>
2 parents 3d5b9f3 + 00a7d39 commit 38962d9

1,173 files changed

Lines changed: 14264 additions & 7593 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ Antonio Quartulli <antonio@mandelbit.com> <antonio@open-mesh.com>
8888
Antonio Quartulli <antonio@mandelbit.com> <antonio.quartulli@open-mesh.com>
8989
Antonio Quartulli <antonio@mandelbit.com> <ordex@autistici.org>
9090
Antonio Quartulli <antonio@mandelbit.com> <ordex@ritirata.org>
91-
Antonio Quartulli <antonio@mandelbit.com> <antonio@openvpn.net>
9291
Antonio Quartulli <antonio@mandelbit.com> <a@unstable.cc>
9392
Anup Patel <anup@brainfault.org> <anup.patel@wdc.com>
9493
Archit Taneja <archit@ti.com>
@@ -226,6 +225,7 @@ Fangrui Song <i@maskray.me> <maskray@google.com>
226225
Felipe W Damasio <felipewd@terra.com.br>
227226
Felix Kuhling <fxkuehl@gmx.de>
228227
Felix Moeller <felix@derklecks.de>
228+
Feng Tang <feng.79.tang@gmail.com> <feng.tang@intel.com>
229229
Fenglin Wu <quic_fenglinw@quicinc.com> <fenglinw@codeaurora.org>
230230
Filipe Lautert <filipe@icewall.org>
231231
Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>
@@ -317,6 +317,8 @@ Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com>
317317
Jean Tourrilhes <jt@hpl.hp.com>
318318
Jeevan Shriram <quic_jshriram@quicinc.com> <jshriram@codeaurora.org>
319319
Jeff Garzik <jgarzik@pretzel.yyz.us>
320+
Jeff Johnson <jeff.johnson@oss.qualcomm.com> <jjohnson@codeaurora.org>
321+
Jeff Johnson <jeff.johnson@oss.qualcomm.com> <quic_jjohnson@quicinc.com>
320322
Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
321323
Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>
322324
Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
@@ -376,6 +378,7 @@ Juha Yrjola <juha.yrjola@solidboot.com>
376378
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
377379
Iskren Chernev <me@iskren.info> <iskren.chernev@gmail.com>
378380
Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>
381+
Kalle Valo <kvalo@kernel.org> <quic_kvalo@quicinc.com>
379382
Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
380383
Karthikeyan Periyasamy <quic_periyasa@quicinc.com> <periyasa@codeaurora.org>
381384
Kathiravan T <quic_kathirav@quicinc.com> <kathirav@codeaurora.org>
@@ -518,6 +521,7 @@ Nadav Amit <nadav.amit@gmail.com> <namit@cs.technion.ac.il>
518521
Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>
519522
Naoya Horiguchi <nao.horiguchi@gmail.com> <n-horiguchi@ah.jp.nec.com>
520523
Naoya Horiguchi <nao.horiguchi@gmail.com> <naoya.horiguchi@nec.com>
524+
Natalie Vock <natalie.vock@gmx.de> <friedrich.vock@gmx.de>
521525
Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
522526
Naveen N Rao <naveen@kernel.org> <naveen.n.rao@linux.ibm.com>
523527
Naveen N Rao <naveen@kernel.org> <naveen.n.rao@linux.vnet.ibm.com>
@@ -530,6 +534,7 @@ Nicholas Piggin <npiggin@gmail.com> <npiggin@kernel.dk>
530534
Nicholas Piggin <npiggin@gmail.com> <npiggin@suse.de>
531535
Nicholas Piggin <npiggin@gmail.com> <nickpiggin@yahoo.com.au>
532536
Nicholas Piggin <npiggin@gmail.com> <piggin@cyberone.com.au>
537+
Nick Desaulniers <nick.desaulniers+lkml@gmail.com> <ndesaulniers@google.com>
533538
Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>
534539
Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
535540
Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
@@ -608,6 +613,8 @@ Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>
608613
Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>
609614
Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>
610615
Rocky Liao <quic_rjliao@quicinc.com> <rjliao@codeaurora.org>
616+
Rodrigo Siqueira <siqueira@igalia.com> <rodrigosiqueiramelo@gmail.com>
617+
Rodrigo Siqueira <siqueira@igalia.com> <Rodrigo.Siqueira@amd.com>
611618
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
612619
Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
613620
Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>

CREDITS

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2515,11 +2515,9 @@ D: SLS distribution
25152515
D: Initial implementation of VC's, pty's and select()
25162516

25172517
N: Pavel Machek
2518-
E: pavel@ucw.cz
2518+
E: pavel@kernel.org
25192519
P: 4096R/92DFCE96 4FA7 9EEF FCD4 C44F C585 B8C7 C060 2241 92DF CE96
2520-
D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd,
2521-
D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,
2522-
D: work on suspend-to-ram/disk, killing duplicates from ioctl32,
2520+
D: NBD, Sun4/330 port, USB, work on suspend-to-ram/disk,
25232521
D: Altera SoCFPGA and Nokia N900 support.
25242522
S: Czech Republic
25252523

Documentation/arch/arm64/gcs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ intended to be exhaustive.
3737
shadow stacks rather than GCS.
3838

3939
* Support for GCS is reported to userspace via HWCAP_GCS in the aux vector
40-
AT_HWCAP2 entry.
40+
AT_HWCAP entry.
4141

4242
* GCS is enabled per thread. While there is support for disabling GCS
4343
at runtime this should be done with great care.

Documentation/arch/powerpc/cxl.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Introduction
1818
both access system memory directly and with the same effective
1919
addresses.
2020

21+
**This driver is deprecated and will be removed in a future release.**
2122

2223
Hardware overview
2324
=================
@@ -453,7 +454,7 @@ Sysfs Class
453454

454455
A cxl sysfs class is added under /sys/class/cxl to facilitate
455456
enumeration and tuning of the accelerators. Its layout is
456-
described in Documentation/ABI/testing/sysfs-class-cxl
457+
described in Documentation/ABI/obsolete/sysfs-class-cxl
457458

458459

459460
Udev rules

Documentation/arch/x86/sva.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ to cache translations for virtual addresses. The IOMMU driver uses the
2525
mmu_notifier() support to keep the device TLB cache and the CPU cache in
2626
sync. When an ATS lookup fails for a virtual address, the device should
2727
use the PRI in order to request the virtual address to be paged into the
28-
CPU page tables. The device must use ATS again in order the fetch the
28+
CPU page tables. The device must use ATS again in order to fetch the
2929
translation before use.
3030

3131
Shared Hardware Workqueues
@@ -216,7 +216,7 @@ submitting work and processing completions.
216216

217217
Single Root I/O Virtualization (SR-IOV) focuses on providing independent
218218
hardware interfaces for virtualizing hardware. Hence, it's required to be
219-
almost fully functional interface to software supporting the traditional
219+
an almost fully functional interface to software supporting the traditional
220220
BARs, space for interrupts via MSI-X, its own register layout.
221221
Virtual Functions (VFs) are assisted by the Physical Function (PF)
222222
driver.

Documentation/devicetree/bindings/arm/rockchip/pmu.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,17 @@ properties:
5353
reg:
5454
maxItems: 1
5555

56+
power-controller:
57+
type: object
58+
59+
reboot-mode:
60+
type: object
61+
5662
required:
5763
- compatible
5864
- reg
5965

60-
additionalProperties: true
66+
additionalProperties: false
6167

6268
examples:
6369
- |

Documentation/devicetree/bindings/clock/qcom,gpucc.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ title: Qualcomm Graphics Clock & Reset Controller
88

99
maintainers:
1010
- Taniya Das <quic_tdas@quicinc.com>
11+
- Imran Shaik <quic_imrashai@quicinc.com>
1112

1213
description: |
1314
Qualcomm graphics clock control module provides the clocks, resets and power
@@ -23,10 +24,12 @@ description: |
2324
include/dt-bindings/clock/qcom,gpucc-sm8150.h
2425
include/dt-bindings/clock/qcom,gpucc-sm8250.h
2526
include/dt-bindings/clock/qcom,gpucc-sm8350.h
27+
include/dt-bindings/clock/qcom,qcs8300-gpucc.h
2628
2729
properties:
2830
compatible:
2931
enum:
32+
- qcom,qcs8300-gpucc
3033
- qcom,sdm845-gpucc
3134
- qcom,sa8775p-gpucc
3235
- qcom,sc7180-gpucc

Documentation/devicetree/bindings/clock/qcom,sa8775p-camcc.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,20 @@ title: Qualcomm Camera Clock & Reset Controller on SA8775P
88

99
maintainers:
1010
- Taniya Das <quic_tdas@quicinc.com>
11+
- Imran Shaik <quic_imrashai@quicinc.com>
1112

1213
description: |
1314
Qualcomm camera clock control module provides the clocks, resets and power
1415
domains on SA8775p.
1516
16-
See also: include/dt-bindings/clock/qcom,sa8775p-camcc.h
17+
See also:
18+
include/dt-bindings/clock/qcom,qcs8300-camcc.h
19+
include/dt-bindings/clock/qcom,sa8775p-camcc.h
1720
1821
properties:
1922
compatible:
2023
enum:
24+
- qcom,qcs8300-camcc
2125
- qcom,sa8775p-camcc
2226

2327
clocks:

Documentation/devicetree/bindings/clock/qcom,sa8775p-videocc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ description: |
1818
properties:
1919
compatible:
2020
enum:
21+
- qcom,qcs8300-videocc
2122
- qcom,sa8775p-videocc
2223

2324
clocks:
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/panel/powertip,hx8238a.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Powertip Electronic Technology Co. 320 x 240 LCD panel
8+
9+
maintainers:
10+
- Lukasz Majewski <lukma@denx.de>
11+
12+
allOf:
13+
- $ref: panel-dpi.yaml#
14+
15+
properties:
16+
compatible:
17+
items:
18+
- const: powertip,hx8238a
19+
- {} # panel-dpi, but not listed here to avoid false select
20+
21+
height-mm: true
22+
panel-timing: true
23+
port: true
24+
power-supply: true
25+
width-mm: true
26+
27+
additionalProperties: false
28+
29+
...

0 commit comments

Comments
 (0)