From: Michael Ellerman <mpe@ellerman.id.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
PowerPC <linuxppc-dev@lists.ozlabs.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>
Subject: Re: linux-next: manual merge of the powerpc tree with the powerpc-fixes tree
Date: Thu, 10 May 2018 10:45:02 +1000 [thread overview]
Message-ID: <87d0y4z6cx.fsf@concordia.ellerman.id.au> (raw)
In-Reply-To: <20180510101703.57ffb774@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
> arch/powerpc/include/asm/ftrace.h
>
> between commit:
>
> edf6a2dfe388 ("powerpc/trace/syscalls: Update syscall name matching logic to account for ppc_ prefix")
>
> from the powerpc-fixes tree and commit:
>
> c3e59d778403 ("powerpc64/ftrace: Rearrange #ifdef sections in ftrace.h")
>
> from the powerpc tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> Michael, I think the version in your merge branch is not quite right ...
Yep.
Don't do merges after midnight kids.
I've pushed a fixed version, which I think matches yours.
I'll resolve it in my next when I merge my fixes & next later in the
cycle.
cheers
next prev parent reply other threads:[~2018-05-10 0:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-10 0:17 linux-next: manual merge of the powerpc tree with the powerpc-fixes tree Stephen Rothwell
2018-05-10 0:45 ` Michael Ellerman [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-07-19 23:51 Stephen Rothwell
2018-07-20 2:34 ` Michael Ellerman
2018-03-26 23:11 Stephen Rothwell
2018-03-27 4:52 ` Michael Ellerman
2018-01-17 22:21 Stephen Rothwell
2018-01-19 11:18 ` Michael Ellerman
2017-11-01 21:54 Stephen Rothwell
2017-02-02 22:04 Stephen Rothwell
2016-11-23 23:36 Stephen Rothwell
2016-11-24 2:40 ` Michael Ellerman
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=87d0y4z6cx.fsf@concordia.ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=naveen.n.rao@linux.vnet.ibm.com \
--cc=sfr@canb.auug.org.au \
/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).