On Tue, 23 Jun 2020 09:26:28 -0400 Sasha Levin sashal@kernel.org wrote:
The conflict happened because we don't have 2d1e38f56622 ("kprobes: Cure hotplug lock ordering issues") on 4.9 and 4.4. I've fixed it up and queued for both branches.
Thanks Sasha!
-- Steve