linux-next: manual merge of the akpm-current tree with the gpio tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the akpm-current tree with the gpio tree
Date	2016-04-27 08:10 +0200
Message-ID	<rsqPD-4BZ-7@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  arch/cris/Kconfig

between commit:

  f518abf00d50 ("cris: do away with ARCH_REQUIRE_GPIOLIB")

from the gpio tree and commit:

  11eaeaeaa756 ("exit_thread: remove empty bodies")

from the akpm-current 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/cris/Kconfig
index 99bda1ba3d2f,2b64a96c4483..000000000000
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@@ -61,7 -61,8 +61,8 @@@ config CRI
  	select CLONE_BACKWARDS2
  	select OLD_SIGSUSPEND
  	select OLD_SIGACTION
 -	select ARCH_REQUIRE_GPIOLIB
 +	select GPIOLIB
+ 	select HAVE_EXIT_THREAD if ETRAX_ARCH_V32
  	select IRQ_DOMAIN if ETRAX_ARCH_V32
  	select OF if ETRAX_ARCH_V32
  	select OF_EARLY_FLATTREE if ETRAX_ARCH_V32

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

Thread

linux-next: manual merge of the akpm-current tree with the gpio  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-04-27 08:10 +0200

csiph-web