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

2018-10-08 Thread Andy Shevchenko
On Mon, Oct 8, 2018 at 6:44 AM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the drivers-x86 tree got a conflict in: > > drivers/platform/x86/intel_int0002_vgpio.c > > between commit: > > f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming") > > from the tip tree and commit

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

2018-10-08 Thread Andy Shevchenko
On Mon, Oct 8, 2018 at 6:48 AM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the drivers-x86 tree got a conflict in: > > drivers/platform/x86/intel_mid_powerbtn.c > > between commit: > > f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming") > > from the tip tree and commit:

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

2018-10-07 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drivers-x86 tree got a conflict in: drivers/platform/x86/intel_mid_powerbtn.c between commit: f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming") from the tip tree and commit: a8b60e484f3d ("platform/x86: intel_mid_powerbtn: Get rid of custom ICPU

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

2018-10-07 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drivers-x86 tree got a conflict in: drivers/platform/x86/intel_int0002_vgpio.c between commit: f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming") from the tip tree and commit: 96402de65afc ("platform/x86: intel_int0002_vgpio: Enable the driver on