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 [thread overview]
Message-ID: <8505055.Ay02BoB5Vi@vostro.rjw.lan> (raw)
In-Reply-To: <20161114130902.532c3c64@canb.auug.org.au>
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
next prev parent reply other threads:[~2016-11-14 20:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-14 2:09 linux-next: manual merge of the driver-core tree with the pm tree Stephen Rothwell
2016-11-14 21:07 ` Rafael J. Wysocki [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-07-01 8:32 Stephen Rothwell
2019-07-03 13:04 ` Andy Shevchenko
2018-12-10 5:14 Stephen Rothwell
2018-12-10 8:58 ` Rafael J. Wysocki
2018-12-10 9:02 ` Andy Shevchenko
2014-11-11 4:41 Stephen Rothwell
2014-12-02 18:10 ` Greg KH
2014-11-10 4:18 Stephen Rothwell
2014-11-10 4:40 ` Greg KH
2013-08-30 5:26 Stephen Rothwell
2013-08-30 6:02 ` Greg KH
2013-06-27 7:14 Stephen Rothwell
2013-06-27 15:36 ` Greg KH
2013-06-07 4:49 Stephen Rothwell
2013-06-07 17:38 ` Greg KH
2013-05-22 3:47 Stephen Rothwell
2013-05-22 4:02 ` Stephen Rothwell
2013-05-22 11:26 ` Rafael J. Wysocki
2013-02-11 4:42 Stephen Rothwell
2013-02-11 12:10 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8505055.Ay02BoB5Vi@vostro.rjw.lan \
--to=rjw@rjwysocki$(echo .)net \
--cc=briannorris@chromium$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox