linux-kernel - Re: linux-next: manual merge of the driver-core 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]

Date:   Mon, 14 Nov 2016 22:07:06 +0100
From:   "Rafael J. Wysocki" <rjw@...ysocki.net>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Greg KH <greg@...ah.com>, linux-next@...r.kernel.org,
        linux-kernel@...r.kernel.org,
        Brian Norris <briannorris@...omium.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the pm tree

On Monday, November 14, 2016 01:09:02 PM Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   drivers/base/power/main.c
> 
> between commit:
> 
>   6f75c3fd56da ("PM / sleep: don't suspend parent when async child suspend_{noirq, late} fails")
> 
> from the pm tree and commit:
> 
>   8c73b4288496 ("PM / sleep: Make async suspend/resume of devices use device links")
> 
> from the driver-core tree.

Well, right.  The device links series predates the Brian's fix (which is in -rc5
already, BTW).

> I fixed it up (maybe .. see below) and can carry the fix as necessary.

That's the correct one, thanks Stephen!

Cheers,
Rafael