From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Woodhouse <dwmw2@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
David Hunter <hunterd42@gmail•com>,
Haojian Zhuang <haojian.zhuang@marvell•com>,
Eric Miao <eric.y.miao@gmail•com>
Subject: linux-next: manual merge of the mtd tree with the pxa tree
Date: Tue, 1 Dec 2009 12:37:38 +1100 [thread overview]
Message-ID: <20091201123738.73bd4e4f.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
Hi David,
Today's linux-next merge of the mtd tree got a conflict in drivers/mtd/nand/pxa3xx_nand.c between commit f923cfbd298a3c5d05fe20712765ed73387b4b3c ("pxa3xx_nand: fix memory out of bound") from the pxa tree and commit 98ecc914d0a48dbbcbb5fc866ab5b59a52afbd41 ("mtd: pxa3xx_nand: Fix PIO data transfer") from the mtd tree.
They seem to be doing the same thing but differently. I just kept the
version from the pxa tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
reply other threads:[~2009-12-01 1:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20091201123738.73bd4e4f.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dwmw2@infradead$(echo .)org \
--cc=eric.y.miao@gmail$(echo .)com \
--cc=haojian.zhuang@marvell$(echo .)com \
--cc=hunterd42@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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