From: Ingo Molnar Date: Sun, 21 Mar 2021 21:16:08 +0000 (+0100) Subject: Merge branch 'linus' into x86/cleanups, to resolve conflict X-Git-Tag: v5.13-rc1~191^2~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca8778c45e401067cefe2abbfb8b547c30d45908;p=thirdparty%2Flinux.git Merge branch 'linus' into x86/cleanups, to resolve conflict Conflicts: arch/x86/kernel/kprobes/ftrace.c Signed-off-by: Ingo Molnar --- ca8778c45e401067cefe2abbfb8b547c30d45908