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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20160930054441.GC5458@kroah.com>
Date:   Fri, 30 Sep 2016 07:44:41 +0200
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     "Rafael J. Wysocki" <rjw@...ysocki.net>,
        linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Aleksey Makarov <aleksey.makarov@...aro.org>,
        Mika Westerberg <mika.westerberg@...ux.intel.com>
Subject: 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 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