commit | cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb | [log] [tgz] |
---|---|---|
author | Ingo Molnar <mingo@kernel.org> | Thu Mar 28 10:56:32 2019 +0100 |
committer | Ingo Molnar <mingo@kernel.org> | Thu Mar 28 10:58:28 2019 +0100 |
tree | 52591d7b53600d5d39369525a356ccb81e22fcd9 | |
parent | db779ef67ffeadbb44e9e818eb64dbe528e2f48f [diff] | |
parent | 8c2ffd9174779014c3fe1f96d9dc3641d9175f00 [diff] |
Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict Conflicts: include/linux/kcore.h Signed-off-by: Ingo Molnar <mingo@kernel.org>