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>,
John Stultz <john.stultz@linaro.org>
Subject: Re: linux-next: manual merge of the staging tree with the driver-core tree
Date: Tue, 24 Apr 2012 07:45:14 -0700 [thread overview]
Message-ID: <20120424144514.GC3532@kroah.com> (raw)
In-Reply-To: <20120424144837.67a84b1e4e5905de7fd03e67@canb.auug.org.au>
On Tue, Apr 24, 2012 at 02:48:37PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got conflicts in
> drivers/staging/android/Kconfig and drivers/staging/android/Makefile
> between commit 449a2bf5e881 ("Remove "switch" class in
> drivers/staging/android/switch") from the driver-core tree and commit
> ef2353d26bdc ("android-alarm: Remove unused android alarm in-kernel
> interfaces") from the staging tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks, that looks fine.
greg k-h
next prev parent reply other threads:[~2012-04-24 14:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-24 4:48 linux-next: manual merge of the staging tree with the driver-core tree Stephen Rothwell
2012-04-24 14:45 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-05-10 7:34 Stephen Rothwell
2012-05-10 15:10 ` Greg KH
2012-04-27 4:31 Stephen Rothwell
2012-04-27 17:05 ` Greg KH
2011-11-28 4:22 Stephen Rothwell
2011-11-28 5: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=20120424144514.GC3532@kroah.com \
--to=greg@kroah.com \
--cc=john.stultz@linaro.org \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--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).