Ingo Molnar 21f546a43a Merge branch 'x86/urgent' into x86/cpu, to resolve conflict ...

There's a new conflict between this commit pending in x86/cpu:

  63edbaa48a x86/cpu/topology: Add support for the AMD 0x80000026 leaf

And these fixes in x86/urgent:

  c064b536a8 x86/cpu/amd: Make the NODEID_MSR union actually work
  1b3108f689 x86/cpu/amd: Make the CPUID 0x80000008 parser correct

Resolve them.

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

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

2024-04-12 12:11:45 +02:00

..

acpi

Merge tag 'acpi-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2024-03-13 11:54:05 -07:00

asm-generic

export.h: remove include/asm-generic/export.h

2024-03-28 11:04:20 +09:00

clocksource

…

crypto

Merge tag 'v6.9-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2024-03-15 14:46:54 -07:00

drm

Merge tag 'drm-next-2024-03-22' of https://gitlab.freedesktop.org/drm/kernel

2024-03-21 19:04:31 -07:00

dt-bindings

Merge tag 'char-misc-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2024-03-21 13:21:31 -07:00

keys

…

kunit

…

kvm

KVM: arm64: Fix host-programmed guest events in nVHE

2024-03-26 01:51:44 -07:00

linux

compiler.h: Add missing quote in macro comment

2024-04-09 09:06:50 -07:00

math-emu

…

media

Merge tag 'media/v6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2024-03-15 11:36:54 -07:00

memory

…

misc

…

net

net: mana: Fix Rx DMA datasize and skb_over_panic

2024-04-03 19:32:03 -07:00

pcmcia

…

ras

…

rdma

…

rv

…

scsi

scsi: sd: Fix TCG OPAL unlock on system resume

2024-03-25 15:46:12 -04:00

soc

Merge tag 'char-misc-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2024-03-21 13:21:31 -07:00

sound

Merge tag 'asoc-fix-v6.9-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

2024-04-05 08:48:12 +02:00

target

…

trace

Merge tag 'v6.9-rc3' into x86/cpu, to pick up fixes

2024-04-09 09:28:41 +02:00

uapi

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

2024-03-30 13:44:52 -07:00

ufs

…

vdso

vdso: Use CONFIG_PAGE_SHIFT in vdso/datapage.h

2024-04-03 21:50:04 +02:00

video

…

xen

…