Commit 12f80691 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into sched/core, to resolve conflicts 



 Conflicts:
	kernel/sched/ext.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 2e7af192 5ee8dbf5

.mailmap

+10 −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>
@@ -348,6 +353,7 @@ Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@opinsys.com> 
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>

Jason Xing <kerneljasonxing@gmail.com>  <kernelxing@tencent.com>

<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>

Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>

Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com>
@@ -396,6 +402,7 @@ Jiri Slaby <jirislaby@kernel.org> <xslaby@fi.muni.cz> 
Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com>

Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>

Jishnu Prakash <quic_jprakash@quicinc.com> <jprakash@codeaurora.org>

Joe Damato <joe@dama.to> <jdamato@fastly.com>

Joel Granados <joel.granados@kernel.org> <j.granados@samsung.com>

Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
@@ -876,6 +883,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 +898,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>

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -1242,6 +1242,10 @@ N: Veaceslav Falico 
E: vfalico@gmail.com

D: Co-maintainer and co-author of the network bonding driver.



N: Thomas Falcon

E: tlfalcon@linux.ibm.com

D: Initial author of the IBM ibmvnic network driver



N: János Farkas

E: chexum@shadow.banki.hu

D: romfs, various (mostly networking) fixes
@@ -2415,6 +2419,10 @@ S: Am Muehlenweg 38 
S: D53424 Remagen

S: Germany



N: Jonathan Lemon

E: jonathan.lemon@gmail.com

D: OpenCompute PTP clock driver (ptp_ocp)



N: Colin Leroy

E: colin@colino.net

W: http://www.geekounet.org/

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/net/can/nxp,sja1000.yaml

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ required: 


allOf:

  - $ref: can-controller.yaml#

  - $ref: /schemas/memory-controllers/mc-peripheral-props.yaml

  - if:

      properties:

        compatible:

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>;

        };