Re: linux-next: manual merge of the drivers-x86 tree with the pm tree

On Fri, Jun 19, 2015 at 03:04:39PM +1000, Michael Ellerman wrote: > Hi Darren, > > Today's linux-next merge of the drivers-x86 tree got conflicts in: > > drivers/platform/x86/apple-gmux.c > drivers/platform/x86/asus-wmi.c > drivers/platform/x86/samsung-laptop.c > > between commits: > >

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

Hi Darren, Today's linux-next merge of the drivers-x86 tree got conflicts in: drivers/platform/x86/apple-gmux.c drivers/platform/x86/asus-wmi.c drivers/platform/x86/samsung-laptop.c between commits: 143958e12fc1 "apple-gmux: Port to new backlight interface selection API" 1ff99803702b

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

Hi Matthew, Today's linux-next merge of the drivers-x86 tree got a conflict in drivers/platform/x86/mxm-wmi.c between commit 8b48463f8942 ("ACPI: Clean up inclusions of ACPI header files") from the pm tree and commit 475879d65123 ("drivers: platform: Include appropriate header file in mxm-wmi.c")