Commit be602cde authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into sched/urgent, to resolve conflict 



 Conflicts:
	kernel/sched/ext.c

There's a context conflict between this upstream commit:

  3fdb9ebc sched_ext: Start schedulers with consistent p->scx.slice values

... and this fix in sched/urgent:

  98442f0c sched: Fix delayed_dequeue vs switched_from_fair()

Resolve it.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents cd9626e9 c964ced7

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -203,12 +203,16 @@ Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com> 
Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>

Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@intel.com>

Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@collabora.com>

Fangrui Song <i@maskray.me> <maskray@google.com>

Felipe W Damasio <felipewd@terra.com.br>

Felix Kuhling <fxkuehl@gmx.de>

Felix Moeller <felix@derklecks.de>

Fenglin Wu <quic_fenglinw@quicinc.com> <fenglinw@codeaurora.org>

Filipe Lautert <filipe@icewall.org>

Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>

Fiona Behrens <me@kloenk.dev>

Fiona Behrens <me@kloenk.dev> <me@kloenk.de>

Fiona Behrens <me@kloenk.dev> <fin@nyantec.com>

Franck Bui-Huu <vagabon.xyz@gmail.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@sony.com>

CREDITS

+27 −27
Original line number Diff line number Diff line
@@ -1358,10 +1358,6 @@ D: Major kbuild rework during the 2.5 cycle 
D: ISDN Maintainer

S: USA



N: Gerrit Renker

E: gerrit@erg.abdn.ac.uk

D: DCCP protocol support.



N: Philip Gladstone

E: philip@gladstonefamily.net

D: Kernel / timekeeping stuff
@@ -1677,11 +1673,6 @@ W: http://www.carumba.com/ 
D: bug toaster (A1 sauce makes all the difference)

D: Random linux hacker



N: James Hogan

E: jhogan@kernel.org

D: Metag architecture maintainer

D: TZ1090 SoC maintainer



N: Tim Hockin

E: thockin@hockin.org

W: http://www.hockin.org/~thockin
@@ -1697,6 +1688,11 @@ D: hwmon subsystem maintainer 
D: i2c-sis96x and i2c-stub SMBus drivers

S: USA



N: James Hogan

E: jhogan@kernel.org

D: Metag architecture maintainer

D: TZ1090 SoC maintainer



N: Dirk Hohndel

E: hohndel@suse.de

D: The XFree86[tm] Project
@@ -1872,6 +1868,10 @@ S: K osmidomkum 723 
S: 160 00 Praha 6

S: Czech Republic



N: Seth Jennings

E: sjenning@redhat.com

D: Creation and maintenance of zswap



N: Jeremy Kerr

D: Maintainer of SPU File System
@@ -2188,19 +2188,6 @@ N: Mike Kravetz 
E: mike.kravetz@oracle.com

D: Maintenance and development of the hugetlb subsystem



N: Seth Jennings

E: sjenning@redhat.com

D: Creation and maintenance of zswap



N: Dan Streetman

E: ddstreet@ieee.org

D: Maintenance and development of zswap

D: Creation and maintenance of the zpool API



N: Vitaly Wool

E: vitaly.wool@konsulko.com

D: Maintenance and development of zswap



N: Andreas S. Krebs

E: akrebs@altavista.net

D: CYPRESS CY82C693 chipset IDE, Digital's PC-Alpha 164SX boards
@@ -3191,6 +3178,11 @@ N: Ken Pizzini 
E: ken@halcyon.com

D: CDROM driver "sonycd535" (Sony CDU-535/531)



N: Mathieu Poirier

E: mathieu.poirier@linaro.org

D: CoreSight kernel subsystem, Maintainer 2014-2022

D: Perf tool support for CoreSight



N: Stelian Pop

E: stelian@popies.net

P: 1024D/EDBB6147 7B36 0E07 04BC 11DC A7A0  D3F7 7185 9E7A EDBB 6147
@@ -3300,6 +3292,10 @@ S: Schlossbergring 9 
S: 79098 Freiburg

S: Germany



N: Gerrit Renker

E: gerrit@erg.abdn.ac.uk

D: DCCP protocol support.



N: Thomas Renninger

E: trenn@suse.de

D: cpupowerutils
@@ -3576,11 +3572,6 @@ D: several improvements to system programs 
S: Oldenburg

S: Germany



N: Mathieu Poirier

E: mathieu.poirier@linaro.org

D: CoreSight kernel subsystem, Maintainer 2014-2022

D: Perf tool support for CoreSight



N: Robert Schwebel

E: robert@schwebel.de

W: https://www.schwebel.de
@@ -3771,6 +3762,11 @@ S: Chr. Winthersvej 1 B, st.th. 
S: DK-1860 Frederiksberg C

S: Denmark



N: Dan Streetman

E: ddstreet@ieee.org

D: Maintenance and development of zswap

D: Creation and maintenance of the zpool API



N: Drew Sullivan

E: drew@ss.org

W: http://www.ss.org/
@@ -4286,6 +4282,10 @@ S: Pipers Way 
S: Swindon. SN3 1RJ

S: England



N: Vitaly Wool

E: vitaly.wool@konsulko.com

D: Maintenance and development of zswap



N: Chris Wright

E: chrisw@sous-sol.org

D: hacking on LSM framework and security modules.

Documentation/arch/arm/mem_alignment.rst

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ ones. 


Of course this is a bad idea to rely on the alignment trap to perform

unaligned memory access in general.  If those access are predictable, you

are better to use the macros provided by include/asm/unaligned.h.  The

are better to use the macros provided by include/linux/unaligned.h.  The

alignment trap can fixup misaligned access for the exception cases, but at

a high performance cost.  It better be rare.

Documentation/arch/arm64/silicon-errata.rst

+6 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A715     | #2645198        | ARM64_ERRATUM_2645198       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A715     | #3456084        | ARM64_ERRATUM_3194386       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A720     | #3456091        | ARM64_ERRATUM_3194386       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A725     | #3456106        | ARM64_ERRATUM_3194386       |
@@ -186,6 +188,8 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Neoverse-N2     | #3324339        | ARM64_ERRATUM_3194386       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Neoverse-N3     | #3456111        | ARM64_ERRATUM_3194386       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Neoverse-V1     | #1619801        | N/A                         |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Neoverse-V1     | #3324341        | ARM64_ERRATUM_3194386       |
@@ -289,3 +293,5 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| Microsoft      | Azure Cobalt 100| #2253138        | ARM64_ERRATUM_2253138       |

+----------------+-----------------+-----------------+-----------------------------+

| Microsoft      | Azure Cobalt 100| #3324339        | ARM64_ERRATUM_3194386       |

+----------------+-----------------+-----------------+-----------------------------+

Documentation/core-api/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ Library functionality that is used throughout the kernel. 
   kref

   cleanup

   assoc_array

   folio_queue

   xarray

   maple_tree

   idr