All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Samuel Ortiz <sameo@openedhand.com>,
	linux-next@vger.kernel.org,
	David Brownell <dbrownell@users.sourceforge.net>
Subject: Re: linux-next: manual merge of the mfd tree
Date: Tue, 6 Jan 2009 09:54:44 -0800	[thread overview]
Message-ID: <20090106175444.GA17805@kroah.com> (raw)
In-Reply-To: <20090106161107.a8448d3e.sfr@canb.auug.org.au>

On Tue, Jan 06, 2009 at 04:11:07PM +1100, Stephen Rothwell wrote:
> Hi Samuel,
> 
> Today's linux-next merge of the mfd tree got a conflict in
> drivers/i2c/chips/Kconfig between commit
> a234ae259954121886f7f589a9cf1915d6dfab88 ("USB: move isp1301_omap to
> drivers/usb/otg") from the usb tree and commit
> 87c13493e6a59c0da55c2824f0205f9ef941b760 ("mfd: move
> drivers/i2c/chips/tps65010.c to drivers/mfd") from the mfd tree.
> 
> Just context changes (due to adjacent deletions).  I fixed it up (see
> below) and can carry the fix as necessary.

Thanks, as the mfd tree looks like it is merged with Linus now, I've
taken this fix into my tree when I resynced up with Linus's tree an hour
ago.

thanks,

greg k-h

  reply	other threads:[~2009-01-06 19:11 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-06  5:11 linux-next: manual merge of the mfd tree Stephen Rothwell
2009-01-06 17:54 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2009-01-06  5:14 Stephen Rothwell
2009-01-06 17:55 ` Greg KH
2008-10-15  9:30 Stephen Rothwell
2008-10-15 14:33 ` Samuel Ortiz
2008-07-08  7:11 Stephen Rothwell
2008-07-10  0:11 ` Samuel Ortiz
2008-07-10  0:42   ` Stephen Rothwell

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=20090106175444.GA17805@kroah.com \
    --to=greg@kroah.com \
    --cc=dbrownell@users.sourceforge.net \
    --cc=linux-next@vger.kernel.org \
    --cc=sameo@openedhand.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.