From: Samuel Ortiz <sameo@openedhand.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the mfd tree
Date: Thu, 10 Jul 2008 02:11:00 +0200 [thread overview]
Message-ID: <20080710001059.GA2637@sortiz.org> (raw)
In-Reply-To: <20080708171103.f9c9a3ce.sfr@canb.auug.org.au>
Hi Stephen,
On Tue, Jul 08, 2008 at 05:11:03PM +1000, Stephen Rothwell wrote:
> Hi Samuel,
>
> Today's linux-next merge of the mfd tree got a conflict in MAINTAINERS
> between commit 4e0d13cbb71de2b1baf71ddd3c14f7ba8da810e5 ("MFD
> maintainer") from Linus' tree and commit
> 52554ec1473a5334ffe589053268d7dd89007afa ("MFD maintainer") from the mfd
> tree.
>
> Same commit - different white space. I used Linus' version.
Yep, I removed this commit from my for-next branch. Your merge should go
fine now.
Cheers,
Samuel.
next prev parent reply other threads:[~2008-07-10 0:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-08 7:11 linux-next: manual merge of the mfd tree Stephen Rothwell
2008-07-10 0:11 ` Samuel Ortiz [this message]
2008-07-10 0:42 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-10-15 9:30 Stephen Rothwell
2008-10-15 14:33 ` Samuel Ortiz
2009-01-06 5:11 Stephen Rothwell
2009-01-06 17:54 ` Greg KH
2009-01-06 5:14 Stephen Rothwell
2009-01-06 17:55 ` 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=20080710001059.GA2637@sortiz.org \
--to=sameo@openedhand.com \
--cc=linux-next@vger.kernel.org \
--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.