]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 43bb700 c1fcf41)
Merge branch 'x86/mm' into x86/cpu, to avoid conflicts
authorIngo Molnar <mingo@kernel.org>
Thu, 27 Feb 2025 10:17:37 +0000 (11:17 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 27 Feb 2025 10:17:37 +0000 (11:17 +0100)
commit30667e55471ed0799bbe75b5ba368899c21e8c0d
tree3382b3eda87ffb7bae2fd2f22ac278ae4b8bcfeftree
parent43bb700cff6bc2f0d337006b864192227fb05dc1commit | diff
parentc1fcf41cf37f7a3fd3bbf6f0c04aba3ea4258888commit | diff
Merge branch 'x86/mm' into x86/cpu, to avoid conflicts

We are going to apply a new series that conflicts with pending
work in x86/mm, so merge in x86/mm to avoid it, and also to
refresh the x86/cpu branch with fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/events/intel/core.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.