public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
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,
	Jonathan Cameron <jic23@kernel.org>,
	MyungJoo Ham <myungjoo.ham@samsung.com>
Subject: Re: linux-next: manual merge of the staging tree with the driver-core tree
Date: Fri, 27 Apr 2012 10:05:48 -0700	[thread overview]
Message-ID: <20120427170548.GB2789@kroah.com> (raw)
In-Reply-To: <20120427143114.d141038158ea4923399d1d1a@canb.auug.org.au>

On Fri, Apr 27, 2012 at 02:31:14PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/Kconfig drivers/Makefile between commit de55d8716ac5 ("Extcon
> (external connector): import Android's switch class and modify") from the
> driver-core tree and commits a980e046098b ("IIO: Move the core files to
> drivers/iio") and db3b9e990e75 ("Staging: VME: move VME drivers out of
> staging") from the staging tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks, that looks correct.

greg k-h

  reply	other threads:[~2012-04-27 17:05 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-27  4:31 linux-next: manual merge of the staging tree with the driver-core tree Stephen Rothwell
2012-04-27 17:05 ` 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-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=20120427170548.GB2789@kroah.com \
    --to=greg@kroah.com \
    --cc=jic23@kernel.org \
    --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