Ingo Molnar f6472b1793 Merge tag 'v7.0-rc4' into timers/core, to resolve conflict ...

Resolve conflict between this change in the upstream kernel:

  4c652a4772 ("rseq: Mark rseq_arm_slice_extension_timer() __always_inline")

... and this pending change in timers/core:

  0e98eb1481 ("entry: Prepare for deferred hrtimer rearming")

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

2026-03-21 08:02:36 +01:00

..

acpi

Merge tag 'mailbox-v6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox

2026-02-14 11:13:32 -08:00

asm-generic

Merge tag 'v7.0-rc4' into timers/core, to resolve conflict

2026-03-21 08:02:36 +01:00

clocksource

…

crypto

Merge tag 'net-next-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

2026-02-11 19:31:52 -08:00

cxl

ACPI: extlog: Trace CPER CXL Protocol Error Section

2026-01-14 17:09:34 +01:00

drm

drm/dp: Add definition for Panel Replay full-line granularity

2026-03-04 15:26:08 +02:00

dt-bindings

Merge tag 'phy-for-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy

2026-02-17 11:40:04 -08:00

hyperv

Merge tag 'hyperv-next-signed-20260218' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux

2026-02-20 08:48:31 -08:00

keys

keys/trusted_keys: establish PKWM as a trusted source

2026-01-30 09:27:26 +05:30

kunit

kunit: irq: Ensure timer doesn't fire too frequently

2026-02-24 14:44:21 -08:00

kvm

KVM: arm64: Use standard seq_file iterator for vgic-debug debugfs

2026-02-02 10:59:25 +00:00

linux

Merge tag 'v7.0-rc4' into timers/core, to resolve conflict

2026-03-21 08:02:36 +01:00

math-emu

…

media

Merge tag 'media/v7.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2026-02-11 12:20:25 -08:00

memory

…

misc

…

net

net: prevent NULL deref in ip[6]tunnel_xmit()

2026-03-12 16:03:41 +01:00

pcmcia

…

ras

PCI/AER: Report CXL or PCIe bus type in AER trace logging

2026-01-22 15:07:04 -07:00

rdma

RDMA/core: Check id_priv->restricted_node_type in cma_listen_on_dev()

2026-02-25 07:50:10 -05:00

rv

rv: Fix multiple definition of __pcpu_unique_da_mon_this

2026-02-20 13:12:00 +01:00

scsi

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

2026-02-12 15:43:02 -08:00

soc

Merge tag 'reset-for-v6.20' of https://git.pengutronix.de/git/pza/linux into soc/drivers

2026-01-29 10:24:25 +01:00

sound

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

2026-03-05 17:22:14 +01:00

target

…

trace

Merge tag 'v7.0-rc4' into timers/core, to resolve conflict

2026-03-21 08:02:36 +01:00

uapi

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

2026-03-15 12:22:10 -07:00

ufs

scsi: ufs: host: mediatek: Require CONFIG_PM

2026-02-03 22:28:44 -05:00

vdso

vdso: Switch get/put_unaligned() from packed struct to memcpy()

2026-01-14 08:56:41 +01:00

video

…

xen

xen/xenbus: better handle backend crash

2026-03-04 15:31:40 +01:00

Kbuild

…