From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 13 May 2025 08:46:22 +0000 (+0200)
Subject: Merge branch 'x86/platform' into x86/core, to merge dependent commits
X-Git-Tag: v6.16-rc1~195^2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d40efd67dd313826a12dc4b03635ece97bb6d04;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'x86/platform' into x86/core, to merge dependent commits

Prepare to resolve conflicts with an upstream series of fixes that conflict
with pending x86 changes:

  6f5bf947bab0 Merge tag 'its-for-linus-20250509' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

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

7d40efd67dd313826a12dc4b03635ece97bb6d04