Skip to content

Commit

Permalink
Merge tag 'v5.15-rc6' into asoc-5.16
Browse files Browse the repository at this point in the history 
Linux 5.15-rc6
  • Loading branch information
Mark Brown committed Oct 18, 2021
2 parents 4e52cb9 + 519d819 commit b8f3b56
Show file tree
Hide file tree
Showing 1,513 changed files with 17,361 additions and 9,920 deletions.
1 change: 1 addition & 0 deletions CREDITS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -971,6 +971,7 @@ D: PowerPC
N: Daniel Drake
E: dsd@gentoo.org
D: USBAT02 CompactFlash support in usb-storage
D: ZD1211RW wireless driver
S: UK

N: Oleg Drokin
Expand Down
2 changes: 1 addition & 1 deletion Documentation/admin-guide/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ Configuring the kernel
Compiling the kernel
--------------------

- Make sure you have at least gcc 4.9 available.
- Make sure you have at least gcc 5.1 available.
For more information, refer to :ref:`Documentation/process/changes.rst <changes>`.

Please note that you can still run a.out user programs with this kernel.
Expand Down
28 changes: 14 additions & 14 deletions Documentation/admin-guide/cgroup-v2.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1226,7 +1226,7 @@ PAGE_SIZE multiple when read back.

Note that all fields in this file are hierarchical and the
file modified event can be generated due to an event down the
hierarchy. For for the local events at the cgroup level see
hierarchy. For the local events at the cgroup level see
memory.events.local.

low
Expand Down Expand Up @@ -2170,19 +2170,19 @@ existing device files.

Cgroup v2 device controller has no interface files and is implemented
on top of cgroup BPF. To control access to device files, a user may
create bpf programs of the BPF_CGROUP_DEVICE type and attach them
to cgroups. On an attempt to access a device file, corresponding
BPF programs will be executed, and depending on the return value
the attempt will succeed or fail with -EPERM.

A BPF_CGROUP_DEVICE program takes a pointer to the bpf_cgroup_dev_ctx
structure, which describes the device access attempt: access type
(mknod/read/write) and device (type, major and minor numbers).
If the program returns 0, the attempt fails with -EPERM, otherwise
it succeeds.

An example of BPF_CGROUP_DEVICE program may be found in the kernel
source tree in the tools/testing/selftests/bpf/progs/dev_cgroup.c file.
create bpf programs of type BPF_PROG_TYPE_CGROUP_DEVICE and attach
them to cgroups with BPF_CGROUP_DEVICE flag. On an attempt to access a
device file, corresponding BPF programs will be executed, and depending
on the return value the attempt will succeed or fail with -EPERM.

A BPF_PROG_TYPE_CGROUP_DEVICE program takes a pointer to the
bpf_cgroup_dev_ctx structure, which describes the device access attempt:
access type (mknod/read/write) and device (type, major and minor numbers).
If the program returns 0, the attempt fails with -EPERM, otherwise it
succeeds.

An example of BPF_PROG_TYPE_CGROUP_DEVICE program may be found in
tools/testing/selftests/bpf/progs/dev_cgroup.c in the kernel source tree.


RDMA
Expand Down
2 changes: 1 addition & 1 deletion Documentation/admin-guide/kernel-parameters.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1266,7 +1266,7 @@
The VGA and EFI output is eventually overwritten by
the real console.

The xen output can only be used by Xen PV guests.
The xen option can only be used in Xen domains.

The sclp output can only be used on s390.

Expand Down
5 changes: 3 additions & 2 deletions Documentation/core-api/irq/irq-domain.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,10 @@ for IRQ numbers that are passed to struct device registrations. In that
case the Linux IRQ numbers cannot be dynamically assigned and the legacy
mapping should be used.

As the name implies, the *_legacy() functions are deprecated and only
As the name implies, the \*_legacy() functions are deprecated and only
exist to ease the support of ancient platforms. No new users should be
added.
added. Same goes for the \*_simple() functions when their use results
in the legacy behaviour.

The legacy map assumes a contiguous range of IRQ numbers has already
been allocated for the controller and that the IRQ number can be
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/tegra.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ properties:
- const: toradex,apalis_t30
- const: nvidia,tegra30
- items:
- const: toradex,apalis_t30-eval-v1.1
- const: toradex,apalis_t30-v1.1-eval
- const: toradex,apalis_t30-eval
- const: toradex,apalis_t30-v1.1
- const: toradex,apalis_t30
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ properties:
data-lanes:
description: array of physical DSI data lane indexes.
minItems: 1
maxItems: 4
items:
- const: 1
- const: 2
Expand All @@ -71,7 +70,6 @@ properties:
data-lanes:
description: array of physical DSI data lane indexes.
minItems: 1
maxItems: 4
items:
- const: 1
- const: 2
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ properties:
const: ti,sn65dsi86

reg:
const: 0x2d
enum: [ 0x2c, 0x2d ]

enable-gpios:
maxItems: 1
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function block.

All DISP device tree nodes must be siblings to the central MMSYS_CONFIG node.
For a description of the MMSYS_CONFIG binding, see
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt.
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml.

DISP function blocks
====================
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ properties:
items:
- enum:
# ili9341 240*320 Color on stm32f429-disco board
- st,sf-tc240t-9370-t
- st,sf-tc240t-9370-t
- const: ilitek,ili9341

reg: true
Expand Down
46 changes: 42 additions & 4 deletions Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ properties:

clocks:
minItems: 1
maxItems: 3
maxItems: 7

clock-names:
minItems: 1
maxItems: 3
maxItems: 7

required:
- compatible
Expand Down Expand Up @@ -72,6 +72,32 @@ allOf:
contains:
enum:
- qcom,sdm660-a2noc
then:
properties:
clocks:
items:
- description: Bus Clock.
- description: Bus A Clock.
- description: IPA Clock.
- description: UFS AXI Clock.
- description: Aggregate2 UFS AXI Clock.
- description: Aggregate2 USB3 AXI Clock.
- description: Config NoC USB2 AXI Clock.
clock-names:
items:
- const: bus
- const: bus_a
- const: ipa
- const: ufs_axi
- const: aggre2_ufs_axi
- const: aggre2_usb3_axi
- const: cfg_noc_usb2_axi

- if:
properties:
compatible:
contains:
enum:
- qcom,sdm660-bimc
- qcom,sdm660-cnoc
- qcom,sdm660-gnoc
Expand All @@ -91,6 +117,7 @@ examples:
- |
#include <dt-bindings/clock/qcom,rpmcc.h>
#include <dt-bindings/clock/qcom,mmcc-sdm660.h>
#include <dt-bindings/clock/qcom,gcc-sdm660.h>
bimc: interconnect@1008000 {
compatible = "qcom,sdm660-bimc";
Expand Down Expand Up @@ -123,9 +150,20 @@ examples:
compatible = "qcom,sdm660-a2noc";
reg = <0x01704000 0xc100>;
#interconnect-cells = <1>;
clock-names = "bus", "bus_a";
clock-names = "bus",
"bus_a",
"ipa",
"ufs_axi",
"aggre2_ufs_axi",
"aggre2_usb3_axi",
"cfg_noc_usb2_axi";
clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>,
<&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>;
<&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>,
<&rpmcc RPM_SMD_IPA_CLK>,
<&gcc GCC_UFS_AXI_CLK>,
<&gcc GCC_AGGRE2_UFS_AXI_CLK>,
<&gcc GCC_AGGRE2_USB3_AXI_CLK>,
<&gcc GCC_CFG_NOC_USB2_AXI_CLK>;
};
mnoc: interconnect@1745000 {
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ properties:
maxItems: 1

port:
$ref: /schemas/graph.yaml#/properties/port
$ref: /schemas/graph.yaml#/$defs/port-base
additionalProperties: false

properties:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/media/i2c/ovti,ov9282.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ properties:

port:
additionalProperties: false
$ref: /schemas/graph.yaml#/properties/port
$ref: /schemas/graph.yaml#/$defs/port-base

properties:
endpoint:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/media/i2c/sony,imx335.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ properties:

port:
additionalProperties: false
$ref: /schemas/graph.yaml#/properties/port
$ref: /schemas/graph.yaml#/$defs/port-base

properties:
endpoint:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ properties:

port:
additionalProperties: false
$ref: /schemas/graph.yaml#/properties/port
$ref: /schemas/graph.yaml#/$defs/port-base

properties:
endpoint:
Expand Down
4 changes: 1 addition & 3 deletions Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ properties:
- snps,dwcmshc-sdhci

reg:
minItems: 1
items:
- description: Offset and length of the register set for the device
maxItems: 1

interrupts:
maxItems: 1
Expand Down
4 changes: 3 additions & 1 deletion Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ properties:
- const: allwinner,sun8i-v3s-emac
- const: allwinner,sun50i-a64-emac
- items:
- const: allwinner,sun50i-h6-emac
- enum:
- allwinner,sun20i-d1-emac
- allwinner,sun50i-h6-emac
- const: allwinner,sun50i-a64-emac

reg:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/net/dsa/marvell.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Example:
#interrupt-cells = <2>;

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

Expand Down
1 change: 0 additions & 1 deletion Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ properties:

clocks:
minItems: 3
maxItems: 5
items:
- description: MAC host clock
- description: MAC apb clock
Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/net/snps,dwmac.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ select:
contains:
enum:
- snps,dwmac
- snps,dwmac-3.40a
- snps,dwmac-3.50a
- snps,dwmac-3.610
- snps,dwmac-3.70a
Expand Down Expand Up @@ -76,6 +77,7 @@ properties:
- rockchip,rk3399-gmac
- rockchip,rv1108-gmac
- snps,dwmac
- snps,dwmac-3.40a
- snps,dwmac-3.50a
- snps,dwmac-3.610
- snps,dwmac-3.70a
Expand Down
1 change: 0 additions & 1 deletion Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ properties:
- description: builtin MSI controller.

interrupt-names:
minItems: 1
items:
- const: msi

Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ examples:
cs-gpios = <&gpio0 13 0>,
<&gpio0 14 0>;
rx-sample-delay-ns = <3>;
spi-flash@1 {
flash@1 {
compatible = "spi-nand";
reg = <1>;
rx-sample-delay-ns = <7>;
Expand Down
Loading

0 comments on commit b8f3b56

Please sign in to comment.