Commit 32e940f2 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'for-7.0-fixes' into for-7.1 



To prepare for hierarchical scheduling patchset which will cause multiple
conflicts otherwise.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parents 477174ac 1dde5025

.mailmap

+8 −1
Original line number Diff line number Diff line
@@ -210,7 +210,12 @@ Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch> 
Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>

Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>

Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>

Daniel Lezcano <daniel.lezcano@kernel.org> <daniel.lezcano@linaro.org>

Daniel Lezcano <daniel.lezcano@kernel.org> <daniel.lezcano@free.fr>

Daniel Lezcano <daniel.lezcano@kernel.org> <daniel.lezcano@linexp.org>

Daniel Lezcano <daniel.lezcano@kernel.org> <dlezcano@fr.ibm.com>

Daniel Thompson <danielt@kernel.org> <daniel.thompson@linaro.org>

Daniele Alessandrelli <daniele.alessandrelli@gmail.com> <daniele.alessandrelli@intel.com>

Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>

David Brownell <david-b@pacbell.net>

David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
@@ -876,6 +881,7 @@ Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com> 
Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>

Vlastimil Babka <vbabka@kernel.org> <vbabka@suse.cz>

WangYuli <wangyuli@aosc.io> <wangyl5933@chinaunicom.cn>

WangYuli <wangyuli@aosc.io> <wangyuli@deepin.org>

Weiwen Hu <huweiwen@linux.alibaba.com> <sehuww@mail.scut.edu.cn>
@@ -890,7 +896,8 @@ Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn> 
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>

Yixun Lan <dlan@kernel.org> <dlan@gentoo.org>

Yixun Lan <dlan@kernel.org> <yixun.lan@amlogic.com>

Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>

Yosry Ahmed <yosry@kernel.org> <yosryahmed@google.com>

Yosry Ahmed <yosry@kernel.org> <yosry.ahmed@linux.dev>

Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>

Yusuke Goda <goda.yusuke@renesas.com>

Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>

Documentation/admin-guide/sysctl/net.rst

+3 −0
Original line number Diff line number Diff line
@@ -594,6 +594,9 @@ Values: 
	  their sockets will only be able to connect within their own

	  namespace.



The first write to ``child_ns_mode`` locks its value. Subsequent writes of the

same value succeed, but writing a different value returns ``-EBUSY``.



Changing ``child_ns_mode`` only affects namespaces created after the change;

it does not modify the current namespace or any existing children.

Documentation/devicetree/bindings/regulator/mt6359-regulator.yaml

+2 −2
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ examples: 
          regulator-max-microvolt = <1700000>;

        };

        mt6359_vrfck_1_ldo_reg: ldo_vrfck_1 {

          regulator-name = "vrfck";

          regulator-name = "vrfck_1";

          regulator-min-microvolt = <1240000>;

          regulator-max-microvolt = <1600000>;

        };
@@ -309,7 +309,7 @@ examples: 
          regulator-max-microvolt = <3300000>;

        };

        mt6359_vemc_1_ldo_reg: ldo_vemc_1 {

          regulator-name = "vemc";

          regulator-name = "vemc_1";

          regulator-min-microvolt = <2500000>;

          regulator-max-microvolt = <3300000>;

        };

Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml

+1 −30
Original line number Diff line number Diff line
@@ -22,21 +22,6 @@ allOf: 
      properties:

        reg:

          minItems: 2

  - if:

      properties:

        compatible:

          contains:

            enum:

              - baikal,bt1-sys-ssi

    then:

      properties:

        mux-controls:

          maxItems: 1

      required:

        - mux-controls

    else:

      required:

        - interrupts

  - if:

      properties:

        compatible:
@@ -75,10 +60,6 @@ properties: 
        const: intel,mountevans-imc-ssi

      - description: AMD Pensando Elba SoC SPI Controller

        const: amd,pensando-elba-spi

      - description: Baikal-T1 SPI Controller

        const: baikal,bt1-ssi

      - description: Baikal-T1 System Boot SPI Controller

        const: baikal,bt1-sys-ssi

      - description: Canaan Kendryte K210 SoS SPI Controller

        const: canaan,k210-spi

      - description: Renesas RZ/N1 SPI Controller
@@ -170,6 +151,7 @@ required: 
  - "#address-cells"

  - "#size-cells"

  - clocks

  - interrupts



examples:

  - |
@@ -190,15 +172,4 @@ examples: 
        rx-sample-delay-ns = <7>;

      };

    };

  - |

    spi@1f040100 {

      compatible = "baikal,bt1-sys-ssi";

      reg = <0x1f040100 0x900>,

            <0x1c000000 0x1000000>;

      #address-cells = <1>;

      #size-cells = <0>;

      mux-controls = <&boot_mux>;

      clocks = <&ccu_sys>;

      clock-names = "ssi_clk";

    };

...

Documentation/netlink/specs/nfsd.yaml

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ operations: 
            - compound-ops

    -

      name: threads-set

      doc: set the number of running threads

      doc: set the maximum number of running threads

      attribute-set: server

      flags: [admin-perm]

      do:
@@ -165,7 +165,7 @@ operations: 
            - min-threads

    -

      name: threads-get

      doc: get the number of running threads

      doc: get the maximum number of running threads

      attribute-set: server

      do:

        reply: