linux-next: manual merge of the staging tree with the staging.current tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the staging tree with the staging.current tree
Date	2017-07-19 05:10 +0200
Message-ID	<u4Nx7-2EI-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Greg,

Today's linux-next merge of the staging tree got conflicts in:

  drivers/staging/Kconfig
  drivers/staging/Makefile

between commit:

  dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to drivers/staging")

from the staging.current tree and commit:

  874bcba65f9a ("staging: pi433: New driver")

from the staging 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 drivers/staging/Kconfig
index ef28a1cb64ae,fdf060c4c494..000000000000
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -110,6 -110,6 +110,8 @@@ source "drivers/staging/ccree/Kconfig
  
  source "drivers/staging/typec/Kconfig"
  
 +source "drivers/staging/vboxvideo/Kconfig"
 +
+ source "drivers/staging/pi433/Kconfig"
+ 
  endif # STAGING
diff --cc drivers/staging/Makefile
index 2918580bdb9e,998f6441e3aa..000000000000
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -44,4 -44,4 +44,5 @@@ obj-$(CONFIG_KS7010)		+= ks7010
  obj-$(CONFIG_GREYBUS)		+= greybus/
  obj-$(CONFIG_BCM2835_VCHIQ)	+= vc04_services/
  obj-$(CONFIG_CRYPTO_DEV_CCREE)	+= ccree/
 +obj-$(CONFIG_DRM_VBOXVIDEO)	+= vboxvideo/
+ obj-$(CONFIG_PI433)		+= pi433/

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

Thread

linux-next: manual merge of the staging tree with the  staging.current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-19 05:10 +0200
  Re: linux-next: manual merge of the staging tree with the  staging.current tree Greg KH <greg@kroah.com> - 2017-07-19 08:10 +0200
    Re: linux-next: manual merge of the staging tree with the  staging.current tree Marcus Wolf <marcus.wolf@wolf-entwicklungen.de> - 2017-07-19 10:40 +0200
      Re: linux-next: manual merge of the staging tree with the  staging.current tree Greg KH <greg@kroah.com> - 2017-07-20 10:20 +0200

csiph-web