Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1569374

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

Show all headers | View raw

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi Paul,
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
>   arch/powerpc/Kconfig
>
> between commit:
>
>   f2574030b0e3 ("powerpc: Revert the initial stack protector support")
>
> from the powerpc-fixes tree and commit:
>
>   c7327406b3c3 ("rcu: Make arch select smp_mb__after_unlock_lock() strength")
>
> from the rcu 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.

One of these years I'm totally going to sort the selects under config
PPC :/

cheers

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

Thread

linux-next: manual merge of the rcu tree with the powerpc-fixes  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-30 03:50 +0100
  Re: linux-next: manual merge of the rcu tree with the powerpc-fixes tree Michael Ellerman <mpe@ellerman.id.au> - 2017-01-30 05:10 +0100
    Re: [PATCH] powerpc: sort Kconfig selects under CONFIG_PPC Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-30 10:50 +0100
      Re: [PATCH] powerpc: sort Kconfig selects under CONFIG_PPC Michael Ellerman <mpe@ellerman.id.au> - 2017-01-30 11:10 +0100
        Re: [PATCH] powerpc: sort Kconfig selects under CONFIG_PPC Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-30 11:30 +0100
    [PATCH] powerpc: sort Kconfig selects under CONFIG_PPC Andrew Donnellan <andrew.donnellan@au1.ibm.com> - 2017-01-30 19:00 +0100

csiph-web