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,
Chanwoo Choi <cw00.choi@samsung.com>,
Myungjoo Ham <myungjoo.ham@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>
Subject: Re: linux-next: manual merge of the staging tree with the driver-core tree
Date: Thu, 10 May 2012 08:10:51 -0700 [thread overview]
Message-ID: <20120510151051.GC17472@kroah.com> (raw)
In-Reply-To: <20120510173401.263f10f33f918bfc9e0bec88@canb.auug.org.au>
On Thu, May 10, 2012 at 05:34:01PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/misc/Makefile between commit 6a7e2618b3db ("misc: MAX8997: Remove
> max8997-muic driver") from the driver-core tree and commit ffc2825c2942
> ("Staging: mei: move the mei code out of staging") from the staging tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Looks good to me, thanks for this.
greg k-h
next prev parent reply other threads:[~2012-05-10 15:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-10 7:34 linux-next: manual merge of the staging tree with the driver-core tree Stephen Rothwell
2012-05-10 15:10 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-04-27 4:31 Stephen Rothwell
2012-04-27 17:05 ` Greg KH
2012-04-24 4:48 Stephen Rothwell
2012-04-24 14:45 ` 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=20120510151051.GC17472@kroah.com \
--to=greg@kroah.com \
--cc=cw00.choi@samsung.com \
--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).