RE: linux-next: manual merge of the pm tree with the dmi tree

2017-09-04 Thread Kani, Toshimitsu
> Hi Jean, > > On Fri, 01 Sep 2017 15:20:21 +0200 Jean Delvare wrote: > > > > On jeu., 2017-08-31 at 11:07 +1000, Stephen Rothwell wrote: > > > > > > Today's linux-next merge of the pm tree got a conflict in: > > > > > > drivers/acpi/blacklist.c > > > > > > between commit: > > > > > > f996c41

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

2017-09-03 Thread Stephen Rothwell
Hi Jean, On Fri, 01 Sep 2017 15:20:21 +0200 Jean Delvare wrote: > > On jeu., 2017-08-31 at 11:07 +1000, Stephen Rothwell wrote: > > > > Today's linux-next merge of the pm tree got a conflict in: > > > > drivers/acpi/blacklist.c > > > > between commit: > > > > f996c4155d0d ("dmi: Mark all

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

2017-09-03 Thread Stephen Rothwell
Hi all, On Mon, 7 Aug 2017 11:40:33 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the pm tree got a conflict in: > > drivers/acpi/sbs.c > > between commit: > > f996c4155d0d ("dmi: Mark all struct dmi_system_id instances const") > > from the dmi tree and commit: > > 630

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

2017-09-01 Thread Jean Delvare
Hi Stephen, On jeu., 2017-08-31 at 11:07 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the pm tree got a conflict in: > > drivers/acpi/blacklist.c > > between commit: > > f996c4155d0d ("dmi: Mark all struct dmi_system_id instances const") > > from the dmi tree a

linux-next: manual merge of the pm tree with the dmi tree

2017-08-30 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the pm tree got a conflict in: drivers/acpi/blacklist.c between commit: f996c4155d0d ("dmi: Mark all struct dmi_system_id instances const") from the dmi tree and commit: 5aa5911a0ed9 ("ACPI / blacklist: add acpi_match_platform_list()") from the pm tr

linux-next: manual merge of the pm tree with the dmi tree

2017-08-06 Thread Stephen Rothwell
Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: drivers/acpi/sbs.c between commit: f996c4155d0d ("dmi: Mark all struct dmi_system_id instances const") from the dmi tree and commit: 630b3aff8a51 ("treewide: Consolidate Apple DMI checks") from the pm tree. I fixed