From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Rafael J. Wysocki" <rjw@sisk.pl>,
David Graham White <dgwhite11@gmail.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the pm tree
Date: Thu, 29 Aug 2013 23:02:50 -0700 [thread overview]
Message-ID: <20130830060250.GB19251@kroah.com> (raw)
In-Reply-To: <20130830152640.33496a2559431eb1c10b6f8e@canb.auug.org.au>
On Fri, Aug 30, 2013 at 03:26:40PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/core.c between commit 5e33bc4165f3 ("driver core / ACPI:
> Avoid device hot remove locking issues") from the tree and commit
> 86df26870569 ("drivers:base:core: Moved sym export macros to respective
> functions") from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Merge looks great, thanks.
greg k-h
next prev parent reply other threads:[~2013-08-30 6:00 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-30 5:26 linux-next: manual merge of the driver-core tree with the pm tree Stephen Rothwell
2013-08-30 6:02 ` Greg KH [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
2016-11-14 2:09 Stephen Rothwell
2016-11-14 21:07 ` Rafael J. Wysocki
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-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=20130830060250.GB19251@kroah.com \
--to=greg@kroah.com \
--cc=dgwhite11@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).