]> www.infradead.org Git - linux.git/commitdiff
Merge branch 'linus' into smp/core
authorThomas Gleixner <tglx@linutronix.de>
Wed, 4 Sep 2024 10:15:38 +0000 (12:15 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 4 Sep 2024 10:15:38 +0000 (12:15 +0200)
Pull in upstream changes so further patches don't conflict.

1  2 
kernel/cpu.c

diff --cc kernel/cpu.c
Simple merge