Re: linux-next: manual merge of the char-misc tree with the pci tree

Path	csiph.com!news.mixmin.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod
From	Greg KH <greg@kroah.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the char-misc tree with the pci tree
Date	Fri, 21 Apr 2017 07:00:01 +0200
Message-ID	<tyyPL-1tD-1@gated-at.bofh.it> (permalink)
References	<tyyG5-1qh-3@gated-at.bofh.it>
X-Original-To	Stephen Rothwell <sfr@canb.auug.org.au>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=UdqNRAcMQ2kUiTx3Mm npCJmCfP6jOg1NIn2Zu5nphSk=; b=W8bC37KrHADojBsNAkp7SxrZvM33bWqRXb bHUNLAglbOHk4Wdr7T64skBJiCO2YHDpGsi2HWHQnJCsv/CJTHOhYrNmpzGmB225 Sk2c8bW7RG2GJYuOEmkrLJkYTZq1awL74LJvzrNU4TH+kvwGGU1cnSKMmYd0OOR+ BKGtXbh7NedX+cHYTSJwIZp4PGvY4ez3b+ckxPW1hKw9YidXSaO6zyd4Fwg90f6l gA6hwvk2xK6Wk08qXjQ02NZ6Db7A7LlzJ+A7qGIfeJ7sArvxp6B+p5IGkzqxdWHC r8OOk+5QuHCsJn6DOiMmNWQM7dgRKTq9mNPgJ8L4sI3WH0LCWnQg==
X-Me-Sender	<xms:xJD5WFaUyGPaAuoEVlJMTTEpG8hR71fbZwgDNBnaNp7bW4bn7dMgDw>
X-Sasl-Enc	jWAApM0SoHX3mJ3TiM7BH8iphDZ55KNI3OKt2vWk6gDn 1492750532
MIME-Version	1.0
Content-Type	text/plain; charset=us-ascii
Content-Disposition	inline
User-Agent	Mutt/1.8.2 (2017-04-18)
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	49
Organization	linux.* mail to news gateway
X-Original-Cc	Arnd Bergmann <arnd@arndb.de>, Bjorn Helgaas <bhelgaas@google.com>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Kishon Vijay Abraham I <kishon@ti.com>, Cyril Bur <cyrilbur@gmail.com>, Andy Shevchenko <andriy.shevchenko@linux.intel.com>
X-Original-Date	Fri, 21 Apr 2017 06:55:22 +0200
X-Original-Message-ID	<20170421045522.GA15613@kroah.com>
X-Original-References	<20170421144540.2635313f@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1627951

Show key headers only | View raw

On Fri, Apr 21, 2017 at 02:45:40PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   drivers/misc/Makefile
> 
> between commit:
> 
>   58c89c8aa0e8 ("misc: Add host side PCI driver for PCI test function device")
> 
> from the pci tree and commits:
> 
>   6c4e97678501 ("drivers/misc: Add Aspeed LPC control driver")
>   51c1e9b554c9 ("auxdisplay: Move panel.c to drivers/auxdisplay folder")
> 
> from the char-misc 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/misc/Makefile
> index 6e139cd70421,4fb10af2ea1c..000000000000
> --- a/drivers/misc/Makefile
> +++ b/drivers/misc/Makefile
> @@@ -53,8 -52,7 +52,8 @@@ obj-$(CONFIG_GENWQE)		+= genwqe
>   obj-$(CONFIG_ECHO)		+= echo/
>   obj-$(CONFIG_VEXPRESS_SYSCFG)	+= vexpress-syscfg.o
>   obj-$(CONFIG_CXL_BASE)		+= cxl/
> - obj-$(CONFIG_PANEL)             += panel.o
> + obj-$(CONFIG_ASPEED_LPC_CTRL)	+= aspeed-lpc-ctrl.o
>  +obj-$(CONFIG_PCI_ENDPOINT_TEST)	+= pci_endpoint_test.o
>   
>   lkdtm-$(CONFIG_LKDTM)		+= lkdtm_core.o
>   lkdtm-$(CONFIG_LKDTM)		+= lkdtm_bugs.o

Looks good to me!

thanks,

greg k-h

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

Thread

linux-next: manual merge of the char-misc tree with the pci tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-21 06:50 +0200
  Re: linux-next: manual merge of the char-misc tree with the pci tree Greg KH <greg@kroah.com> - 2017-04-21 07:00 +0200

csiph-web