Skip to contentSkip to conversation

x86/platform changes for v6.10

GIT PULL Merged Ingo Molnar 2 participants 4 messages May 13, 2024 – May 14, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86/platform Git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-platform-2024-05-13

# HEAD: 801549ed6abe7586eb9ad0cf7147b0bef383ad22 x86/platform/olpc-xo1-sci: Convert to platform remove callback returning void

x86/platform changes for v6.10:

- Improve the DeviceTree (OF) NUMA enumeration code to address kernel warnings & mis-mappings on DeviceTree platforms.

- Migrate x86 platform drivers to the .remove_new callback API

- Misc cleanups & fixes

Thanks,

Ingo

------------------>
Saurabh Sengar (4):
x86/hyperv/vtl: Correct x86_init.mpparse.parse_smp_cfg assignment x86/of: Set the parse_smp_cfg for all the DeviceTree platforms by default x86/of: Map NUMA node to CPUs as per DeviceTree
x86/of: Change x86_dtb_parse_smp_config() to static

Uwe Kleine-König (3):
x86/platform/iris: Convert to platform remove callback returning void x86/platform/olpc-x01-pm: Convert to platform remove callback returning void x86/platform/olpc-xo1-sci: Convert to platform remove callback returning void

 arch/x86/hyperv/hv_vtl.c              |  1 -
 arch/x86/include/asm/prom.h           |  9 ++-------
 arch/x86/kernel/devicetree.c          | 24 ++++++++++++++----------
 arch/x86/platform/ce4100/ce4100.c     |  1 -
 arch/x86/platform/iris/iris.c         |  5 ++---
 arch/x86/platform/olpc/olpc-xo1-pm.c  |  7 +++----
 arch/x86/platform/olpc/olpc-xo1-sci.c |  5 ++---
 7 files changed, 23 insertions(+), 29 deletions(-)
#1 lore raw

[GIT PULL] Documentation/maintainer-tip: Clarify merge window policy

Linus,

Please pull the latest x86/misc Git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-misc-2024-05-13

# HEAD: bdc42c8b9befcef6368be345004cee3da1ace955 Documentation/maintainer-tip: Clarify merge window policy

Update the -tip maintainers merge policy document wrt. merge window timing.

Thanks,

Ingo

------------------>
Dave Hansen (1):
Documentation/maintainer-tip: Clarify merge window policy

 Documentation/process/maintainer-tip.rst | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
Documentation/process/maintainer-tip.rst +9 -9
index 497bb39727c8..64739968afa6 100644
@@ -409,20 +409,20 @@ See :ref:`resend_reminders`.
 Merge window
 ^^^^^^^^^^^^
 
-Please do not expect large patch series to be handled during the merge
-window or even during the week before.  Such patches should be submitted in
-mergeable state *at* *least* a week before the merge window opens.
-Exceptions are made for bug fixes and *sometimes* for small standalone
-drivers for new hardware or minimally invasive patches for hardware
-enablement.
+Please do not expect patches to be reviewed or merged by tip
+maintainers around or during the merge window.  The trees are closed
+to all but urgent fixes during this time.  They reopen once the merge
+window closes and a new -rc1 kernel has been released.
+
+Large series should be submitted in mergeable state *at* *least* a week
+before the merge window opens.  Exceptions are made for bug fixes and
+*sometimes* for small standalone drivers for new hardware or minimally
+invasive patches for hardware enablement.
 
 During the merge window, the maintainers instead focus on following the
 upstream changes, fixing merge window fallout, collecting bug fixes, and
 allowing themselves a breath. Please respect that.
 
-The release candidate -rc1 is the starting point for new patches to be
-applied which are targeted for the next merge window.
-
 So called _urgent_ branches will be merged into mainline during the
 stabilization phase of each release.
 
merge bot Merged
#2 lore raw

Re: [GIT PULL] Documentation/maintainer-tip: Clarify merge window policy

The pull request you sent on Mon, 13 May 2024 10:07:06 +0200:

The pull request you sent on Mon, 13 May 2024 10:07:06 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-misc-2024-05-13

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/019040fb8144fd24097e8260ec0fe231634bfc81

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
merge bot Merged
#3 lore raw
In reply to Ingo Molnar
The pull request you sent on Mon, 13 May 2024 10:03:17 +0200:

The pull request you sent on Mon, 13 May 2024 10:03:17 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-platform-2024-05-13

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/5f487cd8290f3ae742cee18d92f2bb0063dc471c

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html