From: Rob Herring <robherring2@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Josh Wu" <josh.wu@atmel.com>, "Hong Xu" <hong.xu@atmel.com>,
"Artem Bityutskiy" <dedekind1@gmail.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Subject: Re: linux-next: manual merge of the dt-rh tree with the l2-mtd tree
Date: Fri, 06 Jul 2012 07:18:31 -0500 [thread overview]
Message-ID: <4FF6D797.6040307@gmail.com> (raw)
In-Reply-To: <20120706145131.2d590abbdd53af03f4913846@canb.auug.org.au>
On 07/05/2012 11:51 PM, Stephen Rothwell wrote:
> Hi Rob,
>
> Today's linux-next merge of the dt-rh tree got a conflict in
> Documentation/devicetree/bindings/mtd/atmel-nand.txt between commit
> 348d200508b1 ("mtd: at91: add dt parameters for Atmel PMECC") from the
> l2-mtd tree and commit e7e88f9f8aeb ("of: fix a few typos in the binding
> documentation") from the dt-rh tree.
>
> The former replaced the text (and fixed the typo) fixed by the latter, so
> I used that.
I've dropped the conflicting hunk from that patch.
Rob
prev parent reply other threads:[~2012-07-06 12:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-06 4:51 linux-next: manual merge of the dt-rh tree with the l2-mtd tree Stephen Rothwell
2012-07-06 12:18 ` Rob Herring [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=4FF6D797.6040307@gmail.com \
--to=robherring2@gmail.com \
--cc=dedekind1@gmail.com \
--cc=hong.xu@atmel.com \
--cc=josh.wu@atmel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=u.kleine-koenig@pengutronix.de \
/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).