From: Michael Ellerman <mpe@ellerman•id.au>
To: Stephen Rothwell <sfr@canb•auug.org.au>, Jiri Kosina <jikos@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Li Zhang <zhlcindy@linux•vnet.ibm.com>,
Andrew Morton <akpm@linux-foundation•org>
Subject: Re: linux-next: manual merge of the livepatching tree with Linus' tree
Date: Tue, 19 Apr 2016 11:57:34 +1000 [thread overview]
Message-ID: <1461031054.25103.6.camel@ellerman.id.au> (raw)
In-Reply-To: <20160418142323.26fa9ae1@canb.auug.org.au>
On Mon, 2016-04-18 at 14:23 +1000, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the livepatching tree got a conflict in:
>
> arch/powerpc/Kconfig
>
> between commit:
>
> 7f2bd0063342 ("powerpc/mm: enable page parallel initialisation")
>
> from Linus' tree and commit:
>
> 85baa095497f ("powerpc/livepatch: Add live patching support on ppc64le")
>
> from the livepatching 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.
>
> Maybe the selects under config PPC should be sorted ...
Hmm maybe. I guess it reduces the likelyhood of two new additions clashing
slightly.
cheers
prev parent reply other threads:[~2016-04-19 1:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-18 4:23 linux-next: manual merge of the livepatching tree with Linus' tree Stephen Rothwell
2016-04-19 1:57 ` Michael Ellerman [this message]
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=1461031054.25103.6.camel@ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=jikos@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=zhlcindy@linux$(echo .)vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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