linux-next: manual merge of the input tree with the pci tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 2028 bytes --]

Hi all,

Today's linux-next merge of the input tree got a conflict in:

  drivers/input/mouse/Kconfig

between commit:

  6f468ea360f0a6 ("Input: pc110pad - remove driver")

from the pci tree and commits:

  e732b2ac0a18b6 ("Input: hgpk - remove protocol support")
  8291ffa3e51d6a ("Input: inport - remove driver")
  931e3151dba747 ("Input: logibm - remove driver")

from the input 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.

diff --cc drivers/input/mouse/Kconfig
index c8b87a87744c28,04d56f40ecb631..00000000000000
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@@ -300,32 -290,16 +290,6 @@@ config MOUSE_ELAN_I2C_SMBU
  
  	   If unsure, say Y.
  
- config MOUSE_INPORT
- 	tristate "InPort/MS/ATIXL busmouse"
- 	depends on ISA
- 	help
- 	  Say Y here if you have an InPort, Microsoft or ATI XL busmouse.
- 	  They are rather rare these days.
- 
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called inport.
- 
- config MOUSE_ATIXL
- 	bool "ATI XL variant"
- 	depends on MOUSE_INPORT
- 	help
- 	  Say Y here if your mouse is of the ATI XL variety.
- 
- config MOUSE_LOGIBM
- 	tristate "Logitech busmouse"
 -config MOUSE_PC110PAD
 -	tristate "IBM PC110 touchpad"
--	depends on ISA
--	help
- 	  Say Y here if you have a Logitech busmouse.
- 	  They are rather rare these days.
 -	  Say Y if you have the IBM PC-110 micro-notebook and want its
 -	  touchpad supported.
--
--	  To compile this driver as a module, choose M here: the
- 	  module will be called logibm.
 -	  module will be called pc110pad.
--
  config MOUSE_AMIGA
  	tristate "Amiga mouse"
  	depends on AMIGA

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]