From: Michael Ellerman <mpe@ellerman.id.au>
To: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Thadeu Lima de Souza Cascardo <cascardo@redhat.com>
Subject: Re: linux-next: manual merge of the powerpc tree with Linus' tree
Date: Wed, 29 Jun 2016 16:33:38 +1000 [thread overview]
Message-ID: <1467182018.12626.1.camel@ellerman.id.au> (raw)
In-Reply-To: <20160629052426.GB14508@naverao1-tp.localdomain>
On Wed, 2016-06-29 at 10:54 +0530, Naveen N. Rao wrote:
> On 2016/06/29 10:35AM, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the powerpc tree got a conflict in:
> >
> > arch/powerpc/Kconfig
> >
> > between commit:
> >
> > 844e3be47693 ("powerpc/bpf/jit: Disable classic BPF JIT on ppc64le")
>
> Ah, I see that the above commit is not part of powerpc next tree, which
> explains the conflict.
I'll probably merge the fixes branch into next at some point, so then it will
be sorted.
> > I fixed it up (see below - I am not sure this entirely correct) and can
That resolution is fine.
cheers
next prev parent reply other threads:[~2016-06-29 6:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-29 0:35 linux-next: manual merge of the powerpc tree with Linus' tree Stephen Rothwell
2016-06-29 5:24 ` Naveen N. Rao
2016-06-29 6:33 ` Michael Ellerman [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-08-15 22:27 Stephen Rothwell
2018-08-14 23:19 Stephen Rothwell
2017-11-07 22:32 Stephen Rothwell
2017-10-30 12:51 Mark Brown
2017-11-13 5:37 ` Stephen Rothwell
2017-02-16 22:06 Stephen Rothwell
2016-05-01 23:50 Stephen Rothwell
2014-05-29 2:04 Stephen Rothwell
2009-12-08 23:49 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=1467182018.12626.1.camel@ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=benh@kernel.crashing.org \
--cc=cascardo@redhat.com \
--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