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

[Stephen Rothwell]

Hi all,

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

  drivers/platform/x86/intel/Kconfig

between commit:

  4f6c131c3c31 ("platform/x86/intel: Remove X86_PLATFORM_DRIVERS_INTEL")

from the drivers-x86-fixes tree and commit:

  a3c8f906ed5f ("platform/x86/intel: Move intel_pmt from MFD to Auxiliary Bus")

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/intel/Kconfig
index 40096b25994a,35a5d1a5eba8..000000000000
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@@ -170,3 -183,16 +170,14 @@@ config INTEL_UNCORE_FREQ_CONTRO
  
  	  To compile this driver as a module, choose M here: the module
  	  will be called intel-uncore-frequency.
+ 
+ config INTEL_VSEC
+ 	tristate "Intel Vendor Specific Extended Capabilities Driver"
+ 	depends on PCI
+ 	select AUXILIARY_BUS
+ 	help
+ 	  Adds support for feature drivers exposed using Intel PCIe VSEC and
+ 	  DVSEC.
+ 
+ 	  To compile this driver as a module, choose M here: the module will
+ 	  be called intel_vsec.
 -
 -endif # X86_PLATFORM_DRIVERS_INTEL

Attachment: pgpjFCeVXRudv.pgp
Description: OpenPGP digital signature