From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 21 Mar 2021 21:16:08 +0000 (+0100)
Subject: Merge branch 'linus' into x86/cleanups, to resolve conflict
X-Git-Tag: io_uring-5.13-2021-05-07~106^2~13
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ca8778c45e401067cefe2abbfb8b547c30d45908;p=linux-block.git

Merge branch 'linus' into x86/cleanups, to resolve conflict

Conflicts:
	arch/x86/kernel/kprobes/ftrace.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

ca8778c45e401067cefe2abbfb8b547c30d45908