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>
Subject: Re: linux-next: manual merge of the driver-core tree with the suspend tree
Date: Thu, 18 Feb 2010 17:19:44 -0800 [thread overview]
Message-ID: <20100219011944.GB24542@kroah.com> (raw)
In-Reply-To: <20100218195923.59e5e9b9.sfr@canb.auug.org.au>
On Thu, Feb 18, 2010 at 07:59:23PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> include/linux/device.h between commits
> 5a14fb87905e0023a608af8a471097a22fa72f5e ("PM: Asynchronous suspend and
> resume of devices") and 1b8647aa4d52c8ee82df3d3018b0fa2830a149a1 ("PM:
> Add facility for advanced testing of async suspend/resume") from the
> suspend tree and commit 44d58957cf0332f5c9d0f2a05e2919240dd207fc ("Driver
> core: create lock/unlock functions for struct device") from the
> driver-core tree.
>
> Juts overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
Looks good to me, thanks for handling the overlap.
greg k-h
next prev parent reply other threads:[~2010-02-19 1:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-18 8:59 linux-next: manual merge of the driver-core tree with the suspend tree Stephen Rothwell
2010-02-19 1:19 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-02-02 6:01 Stephen Rothwell
2010-02-02 15:22 ` Greg KH
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=20100219011944.GB24542@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rjw@sisk$(echo .)pl \
--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