]> git.ipfire.org Git - thirdparty/linux.git/commit
projects / thirdparty / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b388e57 289d0a4)
Merge branch 'x86/vdso' into x86/core, to resolve conflict and to prepare for depende...
authorIngo Molnar <mingo@kernel.org>
Thu, 22 Feb 2024 09:11:38 +0000 (10:11 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 22 Feb 2024 09:16:53 +0000 (10:16 +0100)
commitf14df823a61e45db6a92e1caf552d5ec64e06b1e
tree61d480a97a060998c0c3e7da44bc3933d3924683tree | snapshot
parentb388e57d4628eb22782bdad4cd5b83ca87a1b7c9commit | diff
parent289d0a475c3e5be42315376d08e0457350fb8e9ccommit | diff
Merge branch 'x86/vdso' into x86/core, to resolve conflict and to prepare for dependent changes

 Conflicts:
arch/x86/entry/vdso/Makefile

We also want to change arch/x86/entry/vdso/Makefile in a followup
commit, so merge the trees for this.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/Makefile diff1 | diff2 | blob | history
arch/x86/entry/vdso/Makefile diff1 | diff2 | blob | history
A mirror of Linus' kernel repository