Skip to content

Commit c4b767f

Browse files
author
Alexei Starovoitov
committed
Merge branch 'bpf-next/master' into bpf-next/for-next
Trivial conflict: drivers/net/dsa/vitesse-vsc73xx-core.c Signed-off-by: Alexei Starovoitov <ast@kernel.org>
2 parents 1696704 + 50c374c commit c4b767f

File tree

870 files changed

+9997
-5424
lines changed

Some content is hidden

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

870 files changed

+9997
-5424
lines changed

‎.mailmap

+1
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
166166
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
167167
David Brownell <david-b@pacbell.net>
168168
David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
169+
David Heidelberg <david@ixit.cz> <d.okias@gmail.com>
169170
David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>
170171
David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>
171172
David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>

‎Documentation/ABI/testing/sysfs-bus-i2c-devices-turris-omnia-mcu

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ Description: (RW) The front button on the Turris Omnia router can be
3232
interrupt.
3333

3434
This file switches between these two modes:
35-
- "mcu" makes the button press event be handled by the MCU to
36-
change the LEDs panel intensity.
37-
- "cpu" makes the button press event be handled by the CPU.
35+
- ``mcu`` makes the button press event be handled by the MCU to
36+
change the LEDs panel intensity.
37+
- ``cpu`` makes the button press event be handled by the CPU.
3838

3939
Format: %s.
4040

‎Documentation/ABI/testing/sysfs-devices-system-cpu

+2-1
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,8 @@ Description: Control Symmetric Multi Threading (SMT)
562562
================ =========================================
563563

564564
If control status is "forceoff" or "notsupported" writes
565-
are rejected.
565+
are rejected. Note that enabling SMT on PowerPC skips
566+
offline cores.
566567

567568
What: /sys/devices/system/cpu/cpuX/power/energy_perf_bias
568569
Date: March 2019

‎Documentation/admin-guide/cifs/usage.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ SecurityFlags Flags which control security negotiation and
742742
may use NTLMSSP 0x00080
743743
must use NTLMSSP 0x80080
744744
seal (packet encryption) 0x00040
745-
must seal (not implemented yet) 0x40040
745+
must seal 0x40040
746746

747747
cifsFYI If set to non-zero value, additional debug information
748748
will be logged to the system error log. This field

‎Documentation/admin-guide/device-mapper/dm-crypt.rst

+8-7
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,14 @@ iv_large_sectors
162162

163163

164164
Module parameters::
165-
max_read_size
166-
max_write_size
167-
Maximum size of read or write requests. When a request larger than this size
168-
is received, dm-crypt will split the request. The splitting improves
169-
concurrency (the split requests could be encrypted in parallel by multiple
170-
cores), but it also causes overhead. The user should tune these parameters to
171-
fit the actual workload.
165+
166+
max_read_size
167+
max_write_size
168+
Maximum size of read or write requests. When a request larger than this size
169+
is received, dm-crypt will split the request. The splitting improves
170+
concurrency (the split requests could be encrypted in parallel by multiple
171+
cores), but it also causes overhead. The user should tune these parameters to
172+
fit the actual workload.
172173

173174

174175
Example scripts

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -4798,11 +4798,9 @@
47984798

47994799
profile= [KNL] Enable kernel profiling via /proc/profile
48004800
Format: [<profiletype>,]<number>
4801-
Param: <profiletype>: "schedule", "sleep", or "kvm"
4801+
Param: <profiletype>: "schedule" or "kvm"
48024802
[defaults to kernel profiling]
48034803
Param: "schedule" - profile schedule points.
4804-
Param: "sleep" - profile D-state sleeping (millisecs).
4805-
Requires CONFIG_SCHEDSTATS
48064804
Param: "kvm" - profile VM exits.
48074805
Param: <number> - step/bucket size as a power of 2 for
48084806
statistical time based profiling.

‎Documentation/arch/arm64/silicon-errata.rst

+18
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,18 @@ stable kernels.
122122
+----------------+-----------------+-----------------+-----------------------------+
123123
| ARM | Cortex-A76 | #1490853 | N/A |
124124
+----------------+-----------------+-----------------+-----------------------------+
125+
| ARM | Cortex-A76 | #3324349 | ARM64_ERRATUM_3194386 |
126+
+----------------+-----------------+-----------------+-----------------------------+
125127
| ARM | Cortex-A77 | #1491015 | N/A |
126128
+----------------+-----------------+-----------------+-----------------------------+
127129
| ARM | Cortex-A77 | #1508412 | ARM64_ERRATUM_1508412 |
128130
+----------------+-----------------+-----------------+-----------------------------+
131+
| ARM | Cortex-A77 | #3324348 | ARM64_ERRATUM_3194386 |
132+
+----------------+-----------------+-----------------+-----------------------------+
133+
| ARM | Cortex-A78 | #3324344 | ARM64_ERRATUM_3194386 |
134+
+----------------+-----------------+-----------------+-----------------------------+
135+
| ARM | Cortex-A78C | #3324346,3324347| ARM64_ERRATUM_3194386 |
136+
+----------------+-----------------+-----------------+-----------------------------+
129137
| ARM | Cortex-A710 | #2119858 | ARM64_ERRATUM_2119858 |
130138
+----------------+-----------------+-----------------+-----------------------------+
131139
| ARM | Cortex-A710 | #2054223 | ARM64_ERRATUM_2054223 |
@@ -138,8 +146,14 @@ stable kernels.
138146
+----------------+-----------------+-----------------+-----------------------------+
139147
| ARM | Cortex-A720 | #3456091 | ARM64_ERRATUM_3194386 |
140148
+----------------+-----------------+-----------------+-----------------------------+
149+
| ARM | Cortex-A725 | #3456106 | ARM64_ERRATUM_3194386 |
150+
+----------------+-----------------+-----------------+-----------------------------+
141151
| ARM | Cortex-X1 | #1502854 | N/A |
142152
+----------------+-----------------+-----------------+-----------------------------+
153+
| ARM | Cortex-X1 | #3324344 | ARM64_ERRATUM_3194386 |
154+
+----------------+-----------------+-----------------+-----------------------------+
155+
| ARM | Cortex-X1C | #3324346 | ARM64_ERRATUM_3194386 |
156+
+----------------+-----------------+-----------------+-----------------------------+
143157
| ARM | Cortex-X2 | #2119858 | ARM64_ERRATUM_2119858 |
144158
+----------------+-----------------+-----------------+-----------------------------+
145159
| ARM | Cortex-X2 | #2224489 | ARM64_ERRATUM_2224489 |
@@ -160,6 +174,8 @@ stable kernels.
160174
+----------------+-----------------+-----------------+-----------------------------+
161175
| ARM | Neoverse-N1 | #1542419 | ARM64_ERRATUM_1542419 |
162176
+----------------+-----------------+-----------------+-----------------------------+
177+
| ARM | Neoverse-N1 | #3324349 | ARM64_ERRATUM_3194386 |
178+
+----------------+-----------------+-----------------+-----------------------------+
163179
| ARM | Neoverse-N2 | #2139208 | ARM64_ERRATUM_2139208 |
164180
+----------------+-----------------+-----------------+-----------------------------+
165181
| ARM | Neoverse-N2 | #2067961 | ARM64_ERRATUM_2067961 |
@@ -170,6 +186,8 @@ stable kernels.
170186
+----------------+-----------------+-----------------+-----------------------------+
171187
| ARM | Neoverse-V1 | #1619801 | N/A |
172188
+----------------+-----------------+-----------------+-----------------------------+
189+
| ARM | Neoverse-V1 | #3324341 | ARM64_ERRATUM_3194386 |
190+
+----------------+-----------------+-----------------+-----------------------------+
173191
| ARM | Neoverse-V2 | #3324336 | ARM64_ERRATUM_3194386 |
174192
+----------------+-----------------+-----------------+-----------------------------+
175193
| ARM | Neoverse-V3 | #3312417 | ARM64_ERRATUM_3194386 |

‎Documentation/arch/riscv/hwprobe.rst

+22-14
Original file line numberDiff line numberDiff line change
@@ -239,25 +239,33 @@ The following keys are defined:
239239
ratified in commit 98918c844281 ("Merge pull request #1217 from
240240
riscv/zawrs") of riscv-isa-manual.
241241

242-
* :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: A bitmask that contains performance
243-
information about the selected set of processors.
242+
* :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: Deprecated. Returns similar values to
243+
:c:macro:`RISCV_HWPROBE_KEY_MISALIGNED_SCALAR_PERF`, but the key was
244+
mistakenly classified as a bitmask rather than a value.
244245

245-
* :c:macro:`RISCV_HWPROBE_MISALIGNED_UNKNOWN`: The performance of misaligned
246-
accesses is unknown.
246+
* :c:macro:`RISCV_HWPROBE_KEY_MISALIGNED_SCALAR_PERF`: An enum value describing
247+
the performance of misaligned scalar native word accesses on the selected set
248+
of processors.
247249

248-
* :c:macro:`RISCV_HWPROBE_MISALIGNED_EMULATED`: Misaligned accesses are
249-
emulated via software, either in or below the kernel. These accesses are
250-
always extremely slow.
250+
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SCALAR_UNKNOWN`: The performance of
251+
misaligned scalar accesses is unknown.
251252

252-
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SLOW`: Misaligned accesses are slower
253-
than equivalent byte accesses. Misaligned accesses may be supported
254-
directly in hardware, or trapped and emulated by software.
253+
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SCALAR_EMULATED`: Misaligned scalar
254+
accesses are emulated via software, either in or below the kernel. These
255+
accesses are always extremely slow.
255256

256-
* :c:macro:`RISCV_HWPROBE_MISALIGNED_FAST`: Misaligned accesses are faster
257-
than equivalent byte accesses.
257+
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SCALAR_SLOW`: Misaligned scalar native
258+
word sized accesses are slower than the equivalent quantity of byte
259+
accesses. Misaligned accesses may be supported directly in hardware, or
260+
trapped and emulated by software.
258261

259-
* :c:macro:`RISCV_HWPROBE_MISALIGNED_UNSUPPORTED`: Misaligned accesses are
260-
not supported at all and will generate a misaligned address fault.
262+
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SCALAR_FAST`: Misaligned scalar native
263+
word sized accesses are faster than the equivalent quantity of byte
264+
accesses.
265+
266+
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SCALAR_UNSUPPORTED`: Misaligned scalar
267+
accesses are not supported at all and will generate a misaligned address
268+
fault.
261269

262270
* :c:macro:`RISCV_HWPROBE_KEY_ZICBOZ_BLOCK_SIZE`: An unsigned int which
263271
represents the size of the Zicboz block in bytes.

‎Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ properties:
3535
ports-implemented:
3636
const: 1
3737

38+
power-domains:
39+
maxItems: 1
40+
3841
sata-port@0:
3942
$ref: /schemas/ata/snps,dwc-ahci-common.yaml#/$defs/dwc-ahci-port
4043

‎Documentation/devicetree/bindings/clock/qcom,dispcc-sm6350.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Display Clock & Reset Controller on SM6350
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@somainline.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm display clock control module provides the clocks, resets and power

‎Documentation/devicetree/bindings/clock/qcom,gcc-msm8994.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Global Clock & Reset Controller on MSM8994
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@somainline.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm global clock control module provides the clocks, resets and power

‎Documentation/devicetree/bindings/clock/qcom,gcc-sm6125.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Global Clock & Reset Controller on SM6125
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@somainline.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm global clock control module provides the clocks, resets and power

‎Documentation/devicetree/bindings/clock/qcom,gcc-sm6350.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Global Clock & Reset Controller on SM6350
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@somainline.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm global clock control module provides the clocks, resets and power

‎Documentation/devicetree/bindings/clock/qcom,sm6115-gpucc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Graphics Clock & Reset Controller on SM6115
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@linaro.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm graphics clock control module provides clocks, resets and power

‎Documentation/devicetree/bindings/clock/qcom,sm6125-gpucc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Graphics Clock & Reset Controller on SM6125
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@linaro.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm graphics clock control module provides clocks and power domains on

‎Documentation/devicetree/bindings/clock/qcom,sm6350-camcc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Camera Clock & Reset Controller on SM6350
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@linaro.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm camera clock control module provides the clocks, resets and power

‎Documentation/devicetree/bindings/clock/qcom,sm6375-dispcc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Display Clock & Reset Controller on SM6375
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@linaro.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm display clock control module provides the clocks, resets and power

‎Documentation/devicetree/bindings/clock/qcom,sm6375-gcc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Global Clock & Reset Controller on SM6375
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@somainline.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm global clock control module provides the clocks, resets and power

‎Documentation/devicetree/bindings/clock/qcom,sm6375-gpucc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Graphics Clock & Reset Controller on SM6375
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@linaro.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm graphics clock control module provides clocks, resets and power

‎Documentation/devicetree/bindings/clock/qcom,sm8350-videocc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm SM8350 Video Clock & Reset Controller
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@linaro.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm video clock control module provides the clocks, resets and power

‎Documentation/devicetree/bindings/clock/qcom,sm8450-gpucc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Graphics Clock & Reset Controller on SM8450
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@linaro.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm graphics clock control module provides the clocks, resets and power

‎Documentation/devicetree/bindings/display/msm/qcom,sm6375-mdss.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm SM6375 Display MDSS
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@linaro.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description:
1313
SM6375 MSM Mobile Display Subsystem (MDSS), which encapsulates sub-blocks

‎Documentation/devicetree/bindings/display/panel/asus,z00t-tm5p5-nt35596.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: ASUS Z00T TM5P5 NT35596 5.5" 1080×1920 LCD Panel
88

99
maintainers:
10-
- Konrad Dybcio <konradybcio@gmail.com>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |+
1313
This panel seems to only be found in the Asus Z00T

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@ properties:
1717
oneOf:
1818
# Samsung 13.3" FHD (1920x1080 pixels) eDP AMOLED panel
1919
- const: samsung,atna33xc20
20-
# Samsung 14.5" WQXGA+ (2880x1800 pixels) eDP AMOLED panel
2120
- items:
22-
- const: samsung,atna45af01
21+
- enum:
22+
# Samsung 14.5" WQXGA+ (2880x1800 pixels) eDP AMOLED panel
23+
- samsung,atna45af01
24+
# Samsung 14.5" 3K (2944x1840 pixels) eDP AMOLED panel
25+
- samsung,atna45dc02
2326
- const: samsung,atna33xc20
2427

2528
enable-gpios: true

‎Documentation/devicetree/bindings/display/panel/sony,td4353-jdi.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Sony TD4353 JDI 5 / 5.7" 2160x1080 MIPI-DSI Panel
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@somainline.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
The Sony TD4353 JDI is a 5 (XZ2c) / 5.7 (XZ2) inch 2160x1080

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

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ properties:
2828
- anvo,anv32e61w
2929
- atmel,at25256B
3030
- fujitsu,mb85rs1mt
31+
- fujitsu,mb85rs256
3132
- fujitsu,mb85rs64
3233
- microchip,at25160bn
3334
- microchip,25lc040

‎Documentation/devicetree/bindings/interconnect/qcom,sc7280-rpmh.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Qualcomm RPMh Network-On-Chip Interconnect on SC7280
88

99
maintainers:
1010
- Bjorn Andersson <andersson@kernel.org>
11-
- Konrad Dybcio <konrad.dybcio@linaro.org>
11+
- Konrad Dybcio <konradybcio@kernel.org>
1212

1313
description: |
1414
RPMh interconnect providers support system bandwidth requirements through

‎Documentation/devicetree/bindings/interconnect/qcom,sc8280xp-rpmh.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Qualcomm RPMh Network-On-Chip Interconnect on SC8280XP
88

99
maintainers:
1010
- Bjorn Andersson <andersson@kernel.org>
11-
- Konrad Dybcio <konrad.dybcio@linaro.org>
11+
- Konrad Dybcio <konradybcio@kernel.org>
1212

1313
description: |
1414
RPMh interconnect providers support system bandwidth requirements through

‎Documentation/devicetree/bindings/interconnect/qcom,sm8450-rpmh.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Qualcomm RPMh Network-On-Chip Interconnect on SM8450
88

99
maintainers:
1010
- Bjorn Andersson <andersson@kernel.org>
11-
- Konrad Dybcio <konrad.dybcio@linaro.org>
11+
- Konrad Dybcio <konradybcio@kernel.org>
1212

1313
description: |
1414
RPMh interconnect providers support system bandwidth requirements through

‎Documentation/devicetree/bindings/iommu/qcom,iommu.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Technologies legacy IOMMU implementations
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@linaro.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm "B" family devices which are not compatible with arm-smmu have

‎Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ properties:
3838

3939
managed: true
4040

41+
phys:
42+
description: A reference to the SerDes lane(s)
43+
maxItems: 1
44+
4145
required:
4246
- reg
4347

‎Documentation/devicetree/bindings/pinctrl/qcom,mdm9607-tlmm.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Technologies, Inc. MDM9607 TLMM block
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@somainline.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description:
1313
Top Level Mode Multiplexer pin controller in Qualcomm MDM9607 SoC.

0 commit comments

Comments
 (0)