Merge branch 'x86/vdso' into x86/core, to resolve conflict and to prepare for dependent changes

Browse source

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>

...

This commit is contained in:

Ingo Molnar 2024-02-22 10:11:38 +01:00

parent b388e57d46 289d0a475c

commit f14df823a6

2 changed files with 9 additions and 24 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

arch/x86/Makefile

View file

30

arch/x86/entry/vdso/Makefile

View file