linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Catalin Marinas <catalin.marinas@arm.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Mark Rutland <mark.rutland@arm.com>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Will Deacon <will@kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the ftrace tree with the arm64 tree
Date: Fri, 15 Nov 2019 13:59:24 +0000	[thread overview]
Message-ID: <20191115135923.GA32389@arrakis.emea.arm.com> (raw)
In-Reply-To: <20191115084827.6e04ec9f@gandalf.local.home>

On Fri, Nov 15, 2019 at 08:48:27AM -0500, Steven Rostedt wrote:
> On Fri, 15 Nov 2019 12:25:14 +0000
> Mark Rutland <mark.rutland@arm.com> wrote:
> > Steven (Rostedt), what's your preference for handling this?
> > 
> > We can drop revert the arm64 change to vmlinux.lds.h for now (and I can
> > send it as a subsequent cleanup), or you could merge my
> > arm64/ftrace-with-regs branch and fix this up in the ftrace tree.
> 
> Or we can just make a note of this, and mention it in our pull requests
> to Linus.
> 
> We could make a single branch where we merged the two branches, fix it
> up (as I believe Stephen did it correctly) and tell Linus "here's the
> fix up".
> 
> This is a common occurrence and Linus has no problems with this. As
> long as he's given a heads up.

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).

-- 
Catalin

  reply	other threads:[~2019-11-15 13:59 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-15  2:53 linux-next: manual merge of the ftrace tree with the arm64 tree Stephen Rothwell
2019-11-15 12:25 ` Mark Rutland
2019-11-15 13:48   ` Steven Rostedt
2019-11-15 13:59     ` Catalin Marinas [this message]
2019-11-15 14:21       ` Steven Rostedt
2019-11-15 14:24         ` Catalin Marinas
2019-11-25  2:31 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191115135923.GA32389@arrakis.emea.arm.com \
    --to=catalin.marinas@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=rostedt@goodmis.org \
    --cc=sfr@canb.auug.org.au \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).