Re: linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Michael Ellerman <mpe@ellerman.id.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the powerpc tree with the powerpc-fixes tree
Date	Thu, 24 Nov 2016 03:50:02 +0100
Message-ID	<sGSgO-4Nw-5@gated-at.bofh.it> (permalink)
References	<sGPsB-31Y-7@gated-at.bofh.it>
User-Agent	Notmuch/0.21 (https://notmuchmail.org)
MIME-Version	1.0
Content-Type	text/plain
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	29
Organization	linux.* mail to news gateway
X-Original-Cc	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Nicholas Piggin <npiggin@gmail.com>, "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>
X-Original-Date	Thu, 24 Nov 2016 13:40:28 +1100
X-Original-Message-ID	<87fumhtxb7.fsf@concordia.ellerman.id.au>
X-Original-References	<20161124103606.0333e388@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1528933

Show key headers only | View raw

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/asm-prototypes.h
>
> between commit:
>
>   9e5f68842276 ("powerpc: Fix missing CRCs, add more asm-prototypes.h declarations")
>
> from the powerpc-fixes tree and commit:
>
>   82de5797a260 ("powerpc: Remove extraneous header from asm-prototypes.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.

Thanks. I'm planning to merge fixes into next RSN ... as soon as people
stop finding bugs.

cheers

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the powerpc tree with the powerpc-fixes  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-11-24 00:50 +0100
  Re: linux-next: manual merge of the powerpc tree with the powerpc-fixes tree Michael Ellerman <mpe@ellerman.id.au> - 2016-11-24 03:50 +0100

csiph-web