lkml.org 
[lkml]   [2019]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the ftrace tree with the arm64 tree
On Fri, 15 Nov 2019 13:59:24 +0000
Catalin Marinas <catalin.marinas@arm.com> 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

\
 
 \ /
  Last update: 2019-11-15 15:22    [W:0.081 / U:0.524 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site