Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752618AbdGSDHc (ORCPT ); Tue, 18 Jul 2017 23:07:32 -0400 Received: from ozlabs.org ([103.22.144.67]:33827 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751560AbdGSDHb (ORCPT ); Tue, 18 Jul 2017 23:07:31 -0400 Date: Wed, 19 Jul 2017 13:07:28 +1000 From: Stephen Rothwell To: Greg KH Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Hans de Goede , Marcus Wolf Subject: linux-next: manual merge of the staging tree with the staging.current tree Message-ID: <20170719130728.3adcae81@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1502 Lines: 51 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/