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

[Greg KH]

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