Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refresh (3b02a051) · Commits · github.com / kvm-riscv / linux

Commit 3b02a051 authored Apr 13, 2020 by

Ingo Molnar

Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refresh



Resolve these conflicts:

	arch/x86/Kconfig
	arch/x86/kernel/Makefile

Do a minor "evil merge" to move the KCSAN entry up a bit by a few lines
in the Kconfig to reduce the probability of future conflicts.

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

parents f5d2313b 8f3d9f35

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment