Merge tag 'v5.18-rc5' into sched/core to pull in fixes & to resolve a conflict (d70522fc) · Commits · github.com / kvm-riscv / linux

Commit d70522fc authored May 06, 2022 by

Ingo Molnar

Merge tag 'v5.18-rc5' into sched/core to pull in fixes & to resolve a conflict



 - sched/core is on a pretty old -rc1 base - refresh it to include recent fixes.
 - this also allows up to resolve a (trivial) .mailmap conflict

Conflicts:
	.mailmap

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

parents 1a90bfd2 672c0c51

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