Ingo Molnar 05453d36a2 Merge branch 'linus' into x86/cleanups, to resolve conflict ...

These two commits interact:

 upstream:     73da582a47 ("x86/cpu/topology: Remove limit of CPUs due to disabled IO/APIC")
 x86/cleanups: 13148e22c1 ("x86/apic: Remove "disablelapic" cmdline option")

Resolve it.

 Conflicts:
	arch/x86/kernel/cpu/topology.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2024-12-10 19:33:03 +01:00

..

alpha

Merge tag 'driver-core-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2024-11-29 11:43:29 -08:00

arc

Merge tag 'mm-stable-2024-11-18-19-27' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-11-23 09:58:07 -08:00

arm

Get rid of 'remove_new' relic from platform driver struct

2024-12-01 15:12:43 -08:00

arm64

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

2024-12-06 13:47:55 -08:00

csky

Merge tag 'mm-stable-2024-11-18-19-27' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-11-23 09:58:07 -08:00

hexagon

Merge tag 'mm-nonmm-stable-2024-11-24-02-05' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-11-25 16:09:48 -08:00

loongarch

LoongArch: KVM: Protect kvm_io_bus_{read,write}() with SRCU

2024-12-03 19:49:28 +08:00

m68k

Merge tag 'rtc-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

2024-11-30 11:18:16 -08:00

microblaze

Merge tag 'mm-stable-2024-11-18-19-27' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-11-23 09:58:07 -08:00

mips

Get rid of 'remove_new' relic from platform driver struct

2024-12-01 15:12:43 -08:00

nios2

Merge tag 'mm-stable-2024-11-18-19-27' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-11-23 09:58:07 -08:00

openrisc

Merge tag 'mm-stable-2024-11-18-19-27' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-11-23 09:58:07 -08:00

parisc

Merge tag 'parisc-for-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

2024-11-26 14:49:20 -08:00

powerpc

module: Convert symbol namespace to string literal

2024-12-02 11:34:44 -08:00

riscv

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2024-11-30 14:51:08 -08:00

s390

module: Convert symbol namespace to string literal

2024-12-02 11:34:44 -08:00

sh

Get rid of 'remove_new' relic from platform driver struct

2024-12-01 15:12:43 -08:00

sparc

Get rid of 'remove_new' relic from platform driver struct

2024-12-01 15:12:43 -08:00

um

Get rid of 'remove_new' relic from platform driver struct

2024-12-01 15:12:43 -08:00

x86

Merge branch 'linus' into x86/cleanups, to resolve conflict

2024-12-10 19:33:03 +01:00

xtensa

Merge tag 'mm-nonmm-stable-2024-11-24-02-05' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-11-25 16:09:48 -08:00

.gitignore

…

Kconfig

Merge tag 'kbuild-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2024-11-30 13:41:50 -08:00