| commit | 3b02a051d25d9600e9d403ad3043aed7de00160e | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Mon Apr 13 09:44:39 2020 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Mon Apr 13 09:44:39 2020 +0200 |
| tree | 5b8f58b79328c04654bf5ab6286401057edeca8f | |
| parent | f5d2313bd3c540be405c4977a63840cd6d0167b5 [diff] | |
| parent | 8f3d9f354286745c751374f5f1fcafee6b3f3136 [diff] |
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>