Commit 5a4d3b38 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

Merge branch 'v6.3-rc7' 



Sync with the urgent patches; in particular:

a53ce18c ("sched/fair: Sanitize vruntime of entity being migrated")

Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
parents 9b8e1781 6a8f57ae

.mailmap

+13 −0
Original line number Original line Diff line number Diff line
@@ -133,6 +133,8 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com> 
Domen Puncer <domen@coderock.org>

Domen Puncer <domen@coderock.org>

Douglas Gilbert <dougg@torque.net>

Douglas Gilbert <dougg@torque.net>

Ed L. Cashin <ecashin@coraid.com>

Ed L. Cashin <ecashin@coraid.com>

Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>

Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>

Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>

Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>

Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>

Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>
@@ -263,7 +265,9 @@ Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com> 
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>

Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>

Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>

Leonard Crestez <leonard.crestez@nxp.com> Leonard Crestez <cdleonard@gmail.com>

Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>

Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>

Leonard Göhrs <l.goehrs@pengutronix.de>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Leon Romanovsky <leon@kernel.org> <leon@leon.nu>

Leon Romanovsky <leon@kernel.org> <leon@leon.nu>

Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>

Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
@@ -379,6 +383,7 @@ Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com> 
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>

Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>

Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>

Rajesh Shah <rajesh.shah@intel.com>

Rajesh Shah <rajesh.shah@intel.com>

Ralf Baechle <ralf@linux-mips.org>

Ralf Baechle <ralf@linux-mips.org>

Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -387,6 +392,9 @@ Rémi Denis-Courmont <rdenis@simphalempin.com> 
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>

Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>

Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>

Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>

Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>

Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>

Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>

Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>

Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>

Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>

Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>

Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>

Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>

Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>

Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
@@ -397,6 +405,7 @@ Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com> 
Rudolf Marek <R.Marek@sh.cvut.cz>

Rudolf Marek <R.Marek@sh.cvut.cz>

Rui Saraiva <rmps@joel.ist.utl.pt>

Rui Saraiva <rmps@joel.ist.utl.pt>

Sachin P Sant <ssant@in.ibm.com>

Sachin P Sant <ssant@in.ibm.com>

Sai Prakash Ranjan <quic_saipraka@quicinc.com> <saiprakash.ranjan@codeaurora.org>

Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>

Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>

Sam Ravnborg <sam@mars.ravnborg.org>

Sam Ravnborg <sam@mars.ravnborg.org>

Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>

Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
@@ -437,6 +446,10 @@ Thomas Graf <tgraf@suug.ch> 
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>

Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>

Thomas Pedersen <twp@codeaurora.org>

Thomas Pedersen <twp@codeaurora.org>

Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>

Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>

Tobias Klauser <tklauser@distanz.ch> <tobias.klauser@gmail.com>

Tobias Klauser <tklauser@distanz.ch> <klto@zhaw.ch>

Tobias Klauser <tklauser@distanz.ch> <tklauser@nuerscht.ch>

Tobias Klauser <tklauser@distanz.ch> <tklauser@xenon.tklauser.home>

Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>

Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>

Tony Luck <tony.luck@intel.com>

Tony Luck <tony.luck@intel.com>

TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

Documentation/admin-guide/index.rst

+0 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ problems and bugs in particular. 




   reporting-issues

   reporting-issues

   reporting-regressions

   reporting-regressions

   security-bugs

   bug-hunting

   bug-hunting

   bug-bisect

   bug-bisect

   tainted-kernels

   tainted-kernels

Documentation/admin-guide/reporting-issues.rst

+2 −2
Original line number Original line Diff line number Diff line
@@ -395,7 +395,7 @@ might want to be aware of; it for example explains how to add your issue to the 
list of tracked regressions, to ensure it won't fall through the cracks.

list of tracked regressions, to ensure it won't fall through the cracks.





What qualifies as security issue is left to your judgment. Consider reading

What qualifies as security issue is left to your judgment. Consider reading

Documentation/admin-guide/security-bugs.rst before proceeding, as it

Documentation/process/security-bugs.rst before proceeding, as it

provides additional details how to best handle security issues.

provides additional details how to best handle security issues.





An issue is a 'really severe problem' when something totally unacceptably bad

An issue is a 'really severe problem' when something totally unacceptably bad
@@ -1269,7 +1269,7 @@ them when sending the report by mail. If you filed it in a bug tracker, forward 
the report's text to these addresses; but on top of it put a small note where

the report's text to these addresses; but on top of it put a small note where

you mention that you filed it with a link to the ticket.

you mention that you filed it with a link to the ticket.





See Documentation/admin-guide/security-bugs.rst for more information.

See Documentation/process/security-bugs.rst for more information.









Duties after the report went out

Duties after the report went out

Documentation/devicetree/bindings/interrupt-controller/loongarch,cpu-interrupt-controller.yaml→Documentation/devicetree/bindings/interrupt-controller/loongson,cpu-interrupt-controller.yaml

+3 −3
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

%YAML 1.2

---

---

$id: http://devicetree.org/schemas/interrupt-controller/loongarch,cpu-interrupt-controller.yaml#

$id: http://devicetree.org/schemas/interrupt-controller/loongson,cpu-interrupt-controller.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#





title: LoongArch CPU Interrupt Controller

title: LoongArch CPU Interrupt Controller
@@ -11,7 +11,7 @@ maintainers: 




properties:

properties:

  compatible:

  compatible:

    const: loongarch,cpu-interrupt-controller

    const: loongson,cpu-interrupt-controller





  '#interrupt-cells':

  '#interrupt-cells':

    const: 1

    const: 1
@@ -28,7 +28,7 @@ required: 
examples:

examples:

  - |

  - |

    interrupt-controller {

    interrupt-controller {

      compatible = "loongarch,cpu-interrupt-controller";

      compatible = "loongson,cpu-interrupt-controller";

      #interrupt-cells = <1>;

      #interrupt-cells = <1>;

      interrupt-controller;

      interrupt-controller;

    };
 
    };

Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml

+7 −0
Original line number Original line Diff line number Diff line
@@ -76,6 +76,13 @@ properties: 
      If "broken-flash-reset" is present then having this property does not

      If "broken-flash-reset" is present then having this property does not

      make any difference.

      make any difference.





  spi-cpol: true

  spi-cpha: true



dependencies:

  spi-cpol: [ spi-cpha ]

  spi-cpha: [ spi-cpol ]



unevaluatedProperties: false

unevaluatedProperties: false





examples:

examples: