Hi all,

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

  drivers/platform/x86/Makefile

between commit:

  2bfe3ae1aa45 ("platform/x86: Fix initialization order for firmware_attributes_class")

from the drivers-x86-fixes tree and commit:

  651b57dd4087 ("platform/x86: Move Lenovo files into lenovo subdir")

from the drivers-x86 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/Makefile
index bea87a85ae75,0530a224bebd..000000000000
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@@ -58,19 -58,12 +58,14 @@@ obj-$(CONFIG_X86_PLATFORM_DRIVERS_HP)	+
  # Hewlett Packard Enterprise
  obj-$(CONFIG_UV_SYSFS)       += uv_sysfs.o
  
 +obj-$(CONFIG_FW_ATTR_CLASS)	+= firmware_attributes_class.o
 +
- # IBM Thinkpad and Lenovo
+ # IBM Thinkpad (before 2005)
  obj-$(CONFIG_IBM_RTL)		+= ibm_rtl.o
- obj-$(CONFIG_IDEAPAD_LAPTOP)	+= ideapad-laptop.o
- obj-$(CONFIG_LENOVO_WMI_HOTKEY_UTILITIES)	+= lenovo-wmi-hotkey-utilities.o
- obj-$(CONFIG_LENOVO_YMC)	+= lenovo-ymc.o
  obj-$(CONFIG_SENSORS_HDAPS)	+= hdaps.o
- obj-$(CONFIG_THINKPAD_ACPI)	+= thinkpad_acpi.o
- obj-$(CONFIG_THINKPAD_LMI)	+= think-lmi.o
- obj-$(CONFIG_YOGABOOK)		+= lenovo-yogabook.o
- obj-$(CONFIG_YT2_1380)		+= lenovo-yoga-tab2-pro-1380-fastcharger.o
- obj-$(CONFIG_LENOVO_WMI_CAMERA)	+= lenovo-wmi-camera.o
+ 
+ # Lenovo
+ obj-y				+= lenovo/
  
  # Intel
  obj-y				+= intel/