From: Eric Miao <eric.y.miao@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Eric Miao <eric.y.miao@gmail.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Marek Vasut <marek.vasut@gmail.com>,
Joe Perches <joe@perches.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linux-next: manual merge of the pxa tree with Linus' tree
Date: Mon, 03 Aug 2009 21:53:23 +0800 [thread overview]
Message-ID: <4A76EBD3.6010006@gmail.com> (raw)
In-Reply-To: <20090803110314.1c2c3cca.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Eric,
>
> Today's linux-next merge of the pxa tree got a conflict in MAINTAINERS
> between commit 8b58be884a9fd650abb7f7adf3f885fb9cecd79d ("MAINTAINERS:
> coalesce name and email address lines") from Linus' tree and commit
> 4ad9febe53347962225169c5bde2ec030e46ab1d ("Palm Tungsten|C initial
> support") from the pxa tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Stephen,
Thanks for the fix.
prev parent reply other threads:[~2009-08-03 13:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-03 1:03 linux-next: manual merge of the pxa tree with Linus' tree Stephen Rothwell
2009-08-03 13:53 ` Eric Miao [this message]
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=4A76EBD3.6010006@gmail.com \
--to=eric.y.miao@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marek.vasut@gmail.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).