From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Richard Zhao" <richard.zhao@freescale.com>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"\"Uwe Kleine-König\"" <u.kleine-koenig@pengutronix.de>
Subject: linux-next: manual merge of the net tree with the i.MX tree
Date: Fri, 4 Mar 2011 12:31:35 +1100 [thread overview]
Message-ID: <20110304123135.f3389022.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
Hi all,
Today's linux-next merge of the net tree got a conflict in
drivers/net/Kconfig between commit
4d2f13be1e370a670c1cae20c194d5ce961e0fa5 ("ARM: imx3x: clean up
ARCH_MX3X") from the i.MX tree and commit
085e79ed88351d2f3cbf257ff4fc00394792da18 (net/fec: consolidate all i.MX
options to CONFIG_ARM"") from the net tree.
The latter seems to be a superset of the former, so I used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
reply other threads:[~2011-03-04 1:31 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=20110304123135.f3389022.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=richard.zhao@freescale.com \
--cc=s.hauer@pengutronix.de \
--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