Commit 3a55445f authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/core 



To pick up the fixes from upstream.

Fix simple conflict on session.c related to the file position fix that
went upstream and is touched by the active decomp changes in perf/core.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 342cb7eb 3906fe9b

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ Al Viro <viro@zenIV.linux.org.uk> 
Andi Kleen <ak@linux.intel.com> <ak@suse.de>

Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>

Andreas Herrmann <aherrman@de.ibm.com>

Andrej Shadura <andrew.shadura@collabora.co.uk>

Andrej Shadura <andrew@shadura.me> <andrew@beldisplaytech.com>

Andrew Morton <akpm@linux-foundation.org>

Andrew Murray <amurray@thegoodpenguin.co.uk> <amurray@embedded-bits.co.uk>

Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>

Documentation/admin-guide/cgroup-v2.rst

+14 −14
Original line number Diff line number Diff line
@@ -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
@@ -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

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -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.

Documentation/devicetree/bindings/mfd/brcm,cru.yaml

+6 −5
Original line number Diff line number Diff line
@@ -32,13 +32,13 @@ properties: 
  "#size-cells":

    const: 1



  pinctrl:

    $ref: ../pinctrl/brcm,ns-pinmux.yaml



patternProperties:

  '^clock-controller@[a-f0-9]+$':

    $ref: ../clock/brcm,iproc-clocks.yaml



  '^pin-controller@[a-f0-9]+$':

    $ref: ../pinctrl/brcm,ns-pinmux.yaml



  '^thermal@[a-f0-9]+$':

    $ref: ../thermal/brcm,ns-thermal.yaml
@@ -73,9 +73,10 @@ examples: 
                                 "iprocfast", "sata1", "sata2";

        };



        pinctrl {

        pin-controller@1c0 {

            compatible = "brcm,bcm4708-pinmux";

            offset = <0x1c0>;

            reg = <0x1c0 0x24>;

            reg-names = "cru_gpio_control";

        };



        thermal@2c0 {

Documentation/devicetree/bindings/net/snps,dwmac.yaml

+2 −0
Original line number Diff line number Diff line
@@ -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
@@ -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