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,
MyungJoo Ham <myungjoo.ham@samsung•com>,
Kyungmin Park <kyungmin.park@samsung•com>,
"Rafael J. Wysocki" <rjw@sisk•pl>,
"K. Y. Srinivasan" <kys@microsoft•com>
Subject: Re: linux-next: manual merge of the staging tree with the pm tree
Date: Wed, 12 Oct 2011 08:53:25 -0600 [thread overview]
Message-ID: <20111012145325.GB18777@kroah.com> (raw)
In-Reply-To: <20111012162805.1056a7f7fe3f1140d767a601@canb.auug.org.au>
On Wed, Oct 12, 2011 at 04:28:05PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/Kconfig between commit a3c98b8b2ede ("PM: Introduce devfreq:
> generic DVFS framework with device-specific OPPs") from the pm tree and
> commit 46a971913611 ("Staging: hv: move hyperv code out of staging
> directory") from the staging tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
The fix for this, and the drivers/Makefile file look correct, thanks.
greg k-h
next prev parent reply other threads:[~2011-10-12 14:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-12 5:28 linux-next: manual merge of the staging tree with the pm tree Stephen Rothwell
2011-10-12 5:30 ` Stephen Rothwell
2011-10-12 14:53 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-04-30 7:48 Stephen Rothwell
2019-04-30 8:13 ` 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=20111012145325.GB18777@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=kys@microsoft$(echo .)com \
--cc=kyungmin.park@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=myungjoo.ham@samsung$(echo .)com \
--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