linux-next: manual merge of the driver-core tree with the drivers-x86 tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  drivers/platform/x86/Kconfig

between commit:

  45a3d578f2ed ("platform/x86: Kconfig: Group modules by companies and functions")

from the drivers-x86 tree and commit:

  835e1b86ef8c ("platform/x86: touchscreen_dmi: Add EFI embedded firmware info support")

from the driver-core 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/platform/x86/Kconfig
index ae75b19e8649,cd9e2758c479..000000000000
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@@ -1134,46 -978,54 +1134,47 @@@ config TOPSTAR_LAPTO
  	depends on ACPI
  	depends on INPUT
  	select INPUT_SPARSEKMAP
 -	help
 -	  This driver provides support for the Intel Virtual Button interface.
 -	  Some laptops require this driver for power button support.
 -
 -	  To compile this driver as a module, choose M here: the module will
 -	  be called intel_vbtn.
 -
 -config INTEL_SCU_IPC
 -	bool "Intel SCU IPC Support"
 -	depends on X86_INTEL_MID
 -	default y
 +	select LEDS_CLASS
 +	select NEW_LEDS
  	---help---
 -	  IPC is used to bridge the communications between kernel and SCU on
 -	  some embedded Intel x86 platforms. This is not needed for PC-type
 -	  machines.
 +	  This driver adds support for hotkeys found on Topstar laptops.
  
 -config INTEL_SCU_IPC_UTIL
 -	tristate "Intel SCU IPC utility driver"
 -	depends on INTEL_SCU_IPC
 -	---help---
 -	  The IPC Util driver provides an interface with the SCU enabling
 -	  low level access for debug work and updating the firmware. Say
 -	  N unless you will be doing this on an Intel MID platform.
 +	  If you have a Topstar laptop, say Y or M here.
  
 -config INTEL_MID_POWER_BUTTON
 -	tristate "power button driver for Intel MID platforms"
 -	depends on INTEL_SCU_IPC && INPUT
 +config I2C_MULTI_INSTANTIATE
 +	tristate "I2C multi instantiate pseudo device driver"
 +	depends on I2C && ACPI
  	help
 -	  This driver handles the power button on the Intel MID platforms.
 +	  Some ACPI-based systems list multiple i2c-devices in a single ACPI
 +	  firmware-node. This driver will instantiate separate i2c-clients
 +	  for each device in the firmware-node.
  
 -	  If unsure, say N.
 +	  To compile this driver as a module, choose M here: the module
 +	  will be called i2c-multi-instantiate.
  
 -config INTEL_MFLD_THERMAL
 -       tristate "Thermal driver for Intel Medfield platform"
 -       depends on MFD_INTEL_MSIC && THERMAL
 -       help
 -         Say Y here to enable thermal driver support for the  Intel Medfield
 -         platform.
 +config MLX_PLATFORM
 +	tristate "Mellanox Technologies platform support"
 +	depends on I2C && REGMAP
 +	---help---
 +	  This option enables system support for the Mellanox Technologies
 +	  platform. The Mellanox systems provide data center networking
 +	  solutions based on Virtual Protocol Interconnect (VPI) technology
 +	  enable seamless connectivity to 56/100Gb/s InfiniBand or 10/40/56GbE
 +	  connection.
  
 -config INTEL_IPS
 -	tristate "Intel Intelligent Power Sharing"
 -	depends on ACPI && PCI
 +	  If you have a Mellanox system, say Y or M here.
 +
 +config TOUCHSCREEN_DMI
 +	bool "DMI based touchscreen configuration info"
 +	depends on ACPI && DMI && I2C=y && TOUCHSCREEN_SILEAD
++	select EFI_EMBEDDED_FIRMWARE if EFI
  	---help---
 -	  Intel Calpella platforms support dynamic power sharing between the
 -	  CPU and GPU, maximizing performance in a given TDP.  This driver,
 -	  along with the CPU frequency and i915 drivers, provides that
 -	  functionality.  If in doubt, say Y here; it will only load on
 -	  supported platforms.
 +	  Certain ACPI based tablets with e.g. Silead or Chipone touchscreens
 +	  do not have enough data in ACPI tables for the touchscreen driver to
 +	  handle the touchscreen properly, as OEMs expect the data to be baked
 +	  into the tablet model specific version of the driver shipped with the
 +	  the OS-image for the device. This option supplies the missing info.
 +	  Enable this for x86 tablets with Silead or Chipone touchscreens.
  
  config INTEL_IMR
  	bool "Intel Isolated Memory Region support"

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