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

From: Greg KH
Date: Fri Sep 30 2016 - 01:53:36 EST

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 commit:
> ad1696f6f09d ("ACPI: parse SPCR and enable matching console")
> from the tty 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.

Looks good to me, thanks.

greg k-h