From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Apr 2021 05:38:36 +0000 (+1000)
Subject: Merge remote-tracking branch 'ftrace/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=43dad223d3fee26a7e4195d0d4b65add0da14d2c;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'ftrace/for-next'

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

43dad223d3fee26a7e4195d0d4b65add0da14d2c