Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict
authorIngo Molnar <mingo@kernel.org>
Thu, 28 Mar 2019 09:56:32 +0000 (10:56 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 28 Mar 2019 09:58:28 +0000 (10:58 +0100)
commitcfa637cb20e96fe8cf44b867a7d7c34649cbf8eb
tree52591d7b53600d5d39369525a356ccb81e22fcd9
parentdb779ef67ffeadbb44e9e818eb64dbe528e2f48f
parent8c2ffd9174779014c3fe1f96d9dc3641d9175f00
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>
include/linux/kcore.h