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

On Fri, Sep 30, 2016 at 01:42:23PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in: > > include/linux/acpi.h > > between commit: > > 058dfc767008 ("ACPI / watchdog: Add support for WDAT hardware watchdog") > > from the pm tree and

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

On Fri, Sep 30, 2016 at 01:42:23PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in: > > include/linux/acpi.h > > between commit: > > 058dfc767008 ("ACPI / watchdog: Add support for WDAT hardware watchdog") > > from the pm tree and