Skip to content

Commit 025f1c9

Browse files
ojedaojeda
authored
Merge pull request #521 from ojeda/sync
Sync with v5.15-rc5
2 parents a6d4c3f + 073b7cb commit 025f1c9

File tree

407 files changed

+4299
-2606
lines changed

Some content is hidden

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

407 files changed

+4299
-2606
lines changed

‎CREDITS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -971,6 +971,7 @@ D: PowerPC
971971
N: Daniel Drake
972972
E: [email protected]
973973
D: USBAT02 CompactFlash support in usb-storage
974+
D: ZD1211RW wireless driver
974975
S: UK
975976

976977
N: Oleg Drokin

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@
12661266
The VGA and EFI output is eventually overwritten by
12671267
the real console.
12681268

1269-
The xen output can only be used by Xen PV guests.
1269+
The xen option can only be used in Xen domains.
12701270

12711271
The sclp output can only be used on s390.
12721272

‎Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ properties:
5050
data-lanes:
5151
description: array of physical DSI data lane indexes.
5252
minItems: 1
53-
maxItems: 4
5453
items:
5554
- const: 1
5655
- const: 2
@@ -71,7 +70,6 @@ properties:
7170
data-lanes:
7271
description: array of physical DSI data lane indexes.
7372
minItems: 1
74-
maxItems: 4
7573
items:
7674
- const: 1
7775
- const: 2

‎Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ properties:
1818
const: ti,sn65dsi86
1919

2020
reg:
21-
const: 0x2d
21+
enum: [ 0x2c, 0x2d ]
2222

2323
enable-gpios:
2424
maxItems: 1

‎Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ properties:
2222
items:
2323
- enum:
2424
# ili9341 240*320 Color on stm32f429-disco board
25-
- st,sf-tc240t-9370-t
25+
- st,sf-tc240t-9370-t
2626
- const: ilitek,ili9341
2727

2828
reg: true

‎Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ properties:
3131

3232
clocks:
3333
minItems: 1
34-
maxItems: 3
34+
maxItems: 7
3535

3636
clock-names:
3737
minItems: 1
38-
maxItems: 3
38+
maxItems: 7
3939

4040
required:
4141
- compatible
@@ -72,6 +72,32 @@ allOf:
7272
contains:
7373
enum:
7474
- qcom,sdm660-a2noc
75+
then:
76+
properties:
77+
clocks:
78+
items:
79+
- description: Bus Clock.
80+
- description: Bus A Clock.
81+
- description: IPA Clock.
82+
- description: UFS AXI Clock.
83+
- description: Aggregate2 UFS AXI Clock.
84+
- description: Aggregate2 USB3 AXI Clock.
85+
- description: Config NoC USB2 AXI Clock.
86+
clock-names:
87+
items:
88+
- const: bus
89+
- const: bus_a
90+
- const: ipa
91+
- const: ufs_axi
92+
- const: aggre2_ufs_axi
93+
- const: aggre2_usb3_axi
94+
- const: cfg_noc_usb2_axi
95+
96+
- if:
97+
properties:
98+
compatible:
99+
contains:
100+
enum:
75101
- qcom,sdm660-bimc
76102
- qcom,sdm660-cnoc
77103
- qcom,sdm660-gnoc
@@ -91,6 +117,7 @@ examples:
91117
- |
92118
#include <dt-bindings/clock/qcom,rpmcc.h>
93119
#include <dt-bindings/clock/qcom,mmcc-sdm660.h>
120+
#include <dt-bindings/clock/qcom,gcc-sdm660.h>
94121
95122
bimc: interconnect@1008000 {
96123
compatible = "qcom,sdm660-bimc";
@@ -123,9 +150,20 @@ examples:
123150
compatible = "qcom,sdm660-a2noc";
124151
reg = <0x01704000 0xc100>;
125152
#interconnect-cells = <1>;
126-
clock-names = "bus", "bus_a";
153+
clock-names = "bus",
154+
"bus_a",
155+
"ipa",
156+
"ufs_axi",
157+
"aggre2_ufs_axi",
158+
"aggre2_usb3_axi",
159+
"cfg_noc_usb2_axi";
127160
clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>,
128-
<&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>;
161+
<&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>,
162+
<&rpmcc RPM_SMD_IPA_CLK>,
163+
<&gcc GCC_UFS_AXI_CLK>,
164+
<&gcc GCC_AGGRE2_UFS_AXI_CLK>,
165+
<&gcc GCC_AGGRE2_USB3_AXI_CLK>,
166+
<&gcc GCC_CFG_NOC_USB2_AXI_CLK>;
129167
};
130168
131169
mnoc: interconnect@1745000 {

‎Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ properties:
3131
maxItems: 1
3232

3333
port:
34-
$ref: /schemas/graph.yaml#/properties/port
34+
$ref: /schemas/graph.yaml#/$defs/port-base
3535
additionalProperties: false
3636

3737
properties:

‎Documentation/devicetree/bindings/media/i2c/ovti,ov9282.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ properties:
3838

3939
port:
4040
additionalProperties: false
41-
$ref: /schemas/graph.yaml#/properties/port
41+
$ref: /schemas/graph.yaml#/$defs/port-base
4242

4343
properties:
4444
endpoint:

‎Documentation/devicetree/bindings/media/i2c/sony,imx335.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ properties:
3838

3939
port:
4040
additionalProperties: false
41-
$ref: /schemas/graph.yaml#/properties/port
41+
$ref: /schemas/graph.yaml#/$defs/port-base
4242

4343
properties:
4444
endpoint:

‎Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ properties:
3838

3939
port:
4040
additionalProperties: false
41-
$ref: /schemas/graph.yaml#/properties/port
41+
$ref: /schemas/graph.yaml#/$defs/port-base
4242

4343
properties:
4444
endpoint:

‎Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ properties:
2020
- snps,dwcmshc-sdhci
2121

2222
reg:
23-
minItems: 1
24-
items:
25-
- description: Offset and length of the register set for the device
23+
maxItems: 1
2624

2725
interrupts:
2826
maxItems: 1

‎Documentation/devicetree/bindings/net/dsa/marvell.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Example:
8383
#interrupt-cells = <2>;
8484

8585
switch0: switch@0 {
86-
compatible = "marvell,mv88e6390";
86+
compatible = "marvell,mv88e6190";
8787
reg = <0>;
8888
reset-gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;
8989

‎Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ properties:
3434

3535
clocks:
3636
minItems: 3
37-
maxItems: 5
3837
items:
3938
- description: MAC host clock
4039
- description: MAC apb clock

‎Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ properties:
4141
- description: builtin MSI controller.
4242

4343
interrupt-names:
44-
minItems: 1
4544
items:
4645
- const: msi
4746

‎Documentation/gpu/amdgpu.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,8 @@ pcie_replay_count
300300
.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
301301
:doc: pcie_replay_count
302302

303-
+GPU SmartShift Information
304-
============================
303+
GPU SmartShift Information
304+
==========================
305305

306306
GPU SmartShift information via sysfs
307307

‎Documentation/gpu/drm-internals.rst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,6 @@ Component Helper Usage
111111
.. kernel-doc:: drivers/gpu/drm/drm_drv.c
112112
:doc: component helper usage recommendations
113113

114-
IRQ Helper Library
115-
~~~~~~~~~~~~~~~~~~
116-
117-
.. kernel-doc:: drivers/gpu/drm/drm_irq.c
118-
:doc: irq helpers
119-
120-
.. kernel-doc:: drivers/gpu/drm/drm_irq.c
121-
:export:
122-
123114
Memory Manager Initialization
124115
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
125116

‎Documentation/hwmon/k10temp.rst

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -132,20 +132,3 @@ On Family 17h and Family 18h CPUs, additional temperature sensors may report
132132
Core Complex Die (CCD) temperatures. Up to 8 such temperatures are reported
133133
as temp{3..10}_input, labeled Tccd{1..8}. Actual support depends on the CPU
134134
variant.
135-
136-
Various Family 17h and 18h CPUs report voltage and current telemetry
137-
information. The following attributes may be reported.
138-
139-
Attribute Label Description
140-
=============== ======= ================
141-
in0_input Vcore Core voltage
142-
in1_input Vsoc SoC voltage
143-
curr1_input Icore Core current
144-
curr2_input Isoc SoC current
145-
=============== ======= ================
146-
147-
Current values are raw (unscaled) as reported by the CPU. Core current is
148-
reported as multiples of 1A / LSB. SoC is reported as multiples of 0.25A
149-
/ LSB. The real current is board specific. Reported currents should be seen
150-
as rough guidance, and should be scaled using sensors3.conf as appropriate
151-
for a given board.

‎MAINTAINERS

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,6 +1276,7 @@ F: drivers/input/mouse/bcm5974.c
12761276

12771277
APPLE DART IOMMU DRIVER
12781278
M: Sven Peter <[email protected]>
1279+
R: Alyssa Rosenzweig <[email protected]>
12791280
L: [email protected]
12801281
S: Maintained
12811282
F: Documentation/devicetree/bindings/iommu/apple,dart.yaml
@@ -1712,6 +1713,8 @@ F: drivers/*/*alpine*
17121713

17131714
ARM/APPLE MACHINE SUPPORT
17141715
M: Hector Martin <[email protected]>
1716+
M: Sven Peter <[email protected]>
1717+
R: Alyssa Rosenzweig <[email protected]>
17151718
L: [email protected] (moderated for non-subscribers)
17161719
S: Maintained
17171720
W: https://asahilinux.org
@@ -2237,6 +2240,7 @@ F: arch/arm/mach-pxa/mioa701.c
22372240

22382241
ARM/MStar/Sigmastar Armv7 SoC support
22392242
M: Daniel Palmer <[email protected]>
2243+
M: Romain Perier <[email protected]>
22402244
L: [email protected] (moderated for non-subscribers)
22412245
S: Maintained
22422246
W: http://linux-chenxing.org/
@@ -2713,6 +2717,7 @@ F: drivers/power/reset/keystone-reset.c
27132717

27142718
ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE
27152719
M: Nishanth Menon <[email protected]>
2720+
M: Vignesh Raghavendra <[email protected]>
27162721
M: Tero Kristo <[email protected]>
27172722
L: [email protected] (moderated for non-subscribers)
27182723
S: Supported
@@ -4657,7 +4662,7 @@ W: http://linux-cifs.samba.org/
46574662
T: git git://git.samba.org/sfrench/cifs-2.6.git
46584663
F: Documentation/admin-guide/cifs/
46594664
F: fs/cifs/
4660-
F: fs/cifs_common/
4665+
F: fs/smbfs_common/
46614666

46624667
COMPACTPCI HOTPLUG CORE
46634668
M: Scott Murray <[email protected]>
@@ -8609,9 +8614,8 @@ F: Documentation/devicetree/bindings/iio/humidity/st,hts221.yaml
86098614
F: drivers/iio/humidity/hts221*
86108615

86118616
HUAWEI ETHERNET DRIVER
8612-
M: Bin Luo <[email protected]>
86138617
L: [email protected]
8614-
S: Supported
8618+
S: Orphan
86158619
F: Documentation/networking/device_drivers/ethernet/huawei/hinic.rst
86168620
F: drivers/net/ethernet/huawei/hinic/
86178621

@@ -10195,8 +10199,8 @@ M: Hyunchul Lee <[email protected]>
1019510199
L: [email protected]
1019610200
S: Maintained
1019710201
T: git git://git.samba.org/ksmbd.git
10198-
F: fs/cifs_common/
1019910202
F: fs/ksmbd/
10203+
F: fs/smbfs_common/
1020010204

1020110205
KERNEL UNIT TESTING FRAMEWORK (KUnit)
1020210206
M: Brendan Higgins <[email protected]>
@@ -17808,7 +17812,6 @@ F: drivers/staging/nvec/
1780817812

1780917813
STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
1781017814
M: Jens Frederich <[email protected]>
17811-
M: Daniel Drake <[email protected]>
1781217815
M: Jon Nettleton <[email protected]>
1781317816
S: Maintained
1781417817
W: http://wiki.laptop.org/go/DCON
@@ -20714,7 +20717,6 @@ S: Maintained
2071420717
F: mm/zbud.c
2071520718

2071620719
ZD1211RW WIRELESS DRIVER
20717-
M: Daniel Drake <[email protected]>
2071820720
M: Ulrich Kunitz <[email protected]>
2071920721
L: [email protected]
2072020722
L: [email protected] (subscribers-only)

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 5
33
PATCHLEVEL = 15
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc3
5+
EXTRAVERSION = -rc5
66
NAME = Opossums on Parade
77

88
# *DOCUMENTATION*

‎arch/arm/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1989,8 +1989,6 @@ config ARCH_HIBERNATION_POSSIBLE
19891989

19901990
endmenu
19911991

1992-
source "drivers/firmware/Kconfig"
1993-
19941992
if CRYPTO
19951993
source "arch/arm/crypto/Kconfig"
19961994
endif

‎arch/arm/boot/dts/at91-sama5d27_som1_ek.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
isc: isc@f0008000 {
7272
pinctrl-names = "default";
7373
pinctrl-0 = <&pinctrl_isc_base &pinctrl_isc_data_8bit &pinctrl_isc_data_9_10 &pinctrl_isc_data_11_12>;
74-
status = "okay";
7574
};
7675

7776
qspi1: spi@f0024000 {

0 commit comments

Comments
 (0)