On Fri, 15 Nov 2019 13:59:24 +0000 Catalin Marinas <catalin.marinas@xxxxxxx> wrote: > I'm fine sending Linus the pull request with the conflict as long as you > and Mark are ok with Stephen's resolution. The only nitpick I have is > that the two comments prior to MCOUNT_REC should be merged into a single > block (I guess we can leave this to Linus to sort out out). Agreed, I pushed up the merge conflict resolution to: git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/aarch64-conflict Feel free to point to that branch as a reference to the conflict resolution. -- Steve
