From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S936256AbcKNU7f (ORCPT <rfc822;w@1wt.eu>);
        Mon, 14 Nov 2016 15:59:35 -0500
Received: from cloudserver094114.home.net.pl ([79.96.170.134]:43122 "EHLO
        cloudserver094114.home.net.pl" rhost-flags-OK-OK-OK-OK)
        by vger.kernel.org with ESMTP id S933275AbcKNU7d (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 14 Nov 2016 15:59:33 -0500
From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, Brian Norris <briannorris@chromium.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the pm tree
Date: Mon, 14 Nov 2016 22:07:06 +0100
Message-ID: <8505055.Ay02BoB5Vi@vostro.rjw.lan>
User-Agent: KMail/4.11.5 (Linux/4.9.0-rc5+; KDE/4.11.5; x86_64; ; )
In-Reply-To: <20161114130902.532c3c64@canb.auug.org.au>
References: <20161114130902.532c3c64@canb.auug.org.au>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="utf-8"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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