| commit | 28336be568bb473d16ba80db0801276fb4f1bbe5 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Mon Dec 30 08:10:51 2019 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Mon Dec 30 08:10:51 2019 +0100 |
| tree | cf2d7a56e6c3ea08139d8d9a5a58b296bd172136 | |
| parent | 5cbaefe9743bf14c9d3106db0cc19f8cb0a3ca22 [diff] | |
| parent | fd6988496e79a6a4bdb514a4655d2920209eb85d [diff] |
Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts Conflicts: init/main.c lib/Kconfig.debug Signed-off-by: Ingo Molnar <mingo@kernel.org>