Subject: linux-next: manual merge of the char-misc tree with the arm-soc tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 30 Apr 2019 17:40:51 +1000

Hi all,

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

  drivers/misc/Kconfig
  drivers/misc/Makefile

between commit:

  524feb799408 ("soc: add aspeed folder and misc drivers")

from the arm-soc tree and commit:

  01c60dcea9f7 ("drivers/misc: Add Aspeed P2A control driver")

from the char-misc tree.

I fixed it up (see below - though the additions probably want to be
moved as in the arm-soc commit) 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/Kconfig
index b80cb6af0cb4,3209ee020b15..000000000000
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -496,6 -496,30 +496,14 @@@ config VEXPRESS_SYSCF
  	  bus. System Configuration interface is one of the possible means
  	  of generating transactions on this bus.
  
+ config ASPEED_P2A_CTRL
+ 	depends on (ARCH_ASPEED || COMPILE_TEST) && REGMAP && MFD_SYSCON
+ 	tristate "Aspeed ast2400/2500 HOST P2A VGA MMIO to BMC bridge control"
+ 	help
+ 	  Control Aspeed ast2400/2500 HOST P2A VGA MMIO to BMC mappings through
+ 	  ioctl()s, the driver also provides an interface for userspace mappings to
+ 	  a pre-defined region.
+ 
 -config ASPEED_LPC_CTRL
 -	depends on (ARCH_ASPEED || COMPILE_TEST) && REGMAP && MFD_SYSCON
 -	tristate "Aspeed ast2400/2500 HOST LPC to BMC bridge control"
 -	---help---
 -	  Control Aspeed ast2400/2500 HOST LPC to BMC mappings through
 -	  ioctl()s, the driver also provides a read/write interface to a BMC ram
 -	  region where the host LPC read/write region can be buffered.
 -
 -config ASPEED_LPC_SNOOP
 -	tristate "Aspeed ast2500 HOST LPC snoop support"
 -	depends on (ARCH_ASPEED || COMPILE_TEST) && REGMAP && MFD_SYSCON
 -	help
 -	  Provides a driver to control the LPC snoop interface which
 -	  allows the BMC to listen on and save the data written by
 -	  the host to an arbitrary LPC I/O port.
 -
  config PCI_ENDPOINT_TEST
  	depends on PCI
  	select CRC32
diff --cc drivers/misc/Makefile
index b9affcdaa3d6,c36239573a5c..000000000000
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -54,6 -54,9 +54,7 @@@ obj-$(CONFIG_GENWQE)		+= genwqe
  obj-$(CONFIG_ECHO)		+= echo/
  obj-$(CONFIG_VEXPRESS_SYSCFG)	+= vexpress-syscfg.o
  obj-$(CONFIG_CXL_BASE)		+= cxl/
 -obj-$(CONFIG_ASPEED_LPC_CTRL)	+= aspeed-lpc-ctrl.o
 -obj-$(CONFIG_ASPEED_LPC_SNOOP)	+= aspeed-lpc-snoop.o
+ obj-$(CONFIG_ASPEED_P2A_CTRL)	+= aspeed-p2a-ctrl.o
  obj-$(CONFIG_PCI_ENDPOINT_TEST)	+= pci_endpoint_test.o
  obj-$(CONFIG_OCXL)		+= ocxl/
  obj-y				+= cardreader/