linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
Cc: linux-next@vger.kernel.org, Sascha Hauer <s.hauer@pengutronix.de>,
	Matt Waddel <Matt.Waddel@freescale.com>,
	Greg Ungerer <gerg@uclinux.org>
Subject: linux-next: manual merge of the net tree with Linus' tree
Date: Mon, 2 Feb 2009 14:13:28 +1100	[thread overview]
Message-ID: <20090202141328.eaad3432.sfr@canb.auug.org.au> (raw)

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/net/Kconfig between commit
d4732d3c59b84bb093e11c8f755f32801b4bf86d ("m68knommu: add ColdFire M532x
to the FEC configuration options") from Linus' tree and commit
196719ecec0c526de273dcb902f0be956a193232 ("fec: Add support for Freescale
MX27") from the net tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/net/Kconfig
index 6bdfd47,0ec01e4..0000000
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -1828,11 -1828,11 +1828,11 @@@ config 68360_ENE
  	  the Motorola 68360 processor.
  
  config FEC
- 	bool "FEC ethernet controller (of ColdFire CPUs)"
- 	depends on M523x || M527x || M5272 || M528x || M520x || M532x
+ 	bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
 -	depends on M523x || M527x || M5272 || M528x || M520x || MACH_MX27
++	depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27
  	help
  	  Say Y here if you want to use the built-in 10/100 Fast ethernet
- 	  controller on some Motorola ColdFire processors.
+ 	  controller on some Motorola ColdFire and Freescale i.MX processors.
  
  config FEC2
  	bool "Second FEC ethernet controller (on some ColdFire CPUs)"

             reply	other threads:[~2009-02-02  3:13 UTC|newest]

Thread overview: 69+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-02  3:13 Stephen Rothwell [this message]
2009-02-03  7:51 ` linux-next: manual merge of the net tree with Linus' tree David Miller
2009-02-26  2:48 Stephen Rothwell
2009-02-27  7:17 ` David Miller
2009-05-19  3:39 Stephen Rothwell
2009-05-19  4:09 ` David Miller
2009-05-19  4:43   ` Stephen Rothwell
2009-06-03  2:20 Stephen Rothwell
2009-06-03 10:33 ` David Miller
2009-08-07  1:58 Stephen Rothwell
2009-09-02  3:37 Stephen Rothwell
2009-09-02  7:33 ` David Miller
2009-09-02  8:52   ` Stephen Rothwell
2010-01-11  2:31 Stephen Rothwell
2010-01-11  6:50 ` David Miller
2010-01-11  7:56   ` Stephen Rothwell
2010-01-11  7:59     ` David Miller
2010-01-11  8:49       ` Stephen Rothwell
2010-03-01  3:20 Stephen Rothwell
2010-03-01  3:21 ` David Miller
2010-04-07  2:58 Stephen Rothwell
2010-04-07  3:20 ` Cong Wang
2010-04-07  5:28   ` Stephen Rothwell
2010-04-07  2:58 Stephen Rothwell
2010-04-09  0:41 Stephen Rothwell
2010-04-14  1:45 Stephen Rothwell
2010-04-14  1:47 ` David Miller
2010-04-14  1:52   ` Stephen Rothwell
2010-04-14  2:00     ` David Miller
2010-04-27  1:28 Stephen Rothwell
2010-04-28  0:05 ` David Miller
2010-04-28  0:47   ` Stephen Rothwell
2010-04-27  1:28 Stephen Rothwell
2010-05-12  2:26 Stephen Rothwell
2010-05-17  2:09 Stephen Rothwell
2010-05-17  5:28 ` David Miller
2010-05-17  6:24   ` Stephen Rothwell
2010-07-21  2:04 Stephen Rothwell
2010-07-21  2:31 ` Herbert Xu
2010-07-21  3:27 ` David Miller
2010-07-21  3:44   ` Stephen Rothwell
2010-10-22  1:19 Stephen Rothwell
2010-12-26 23:41 Stephen Rothwell
2010-12-27  2:21 ` David Miller
2011-04-08  3:45 Stephen Rothwell
2011-04-08  3:49 ` David Miller
2011-07-18  4:41 Stephen Rothwell
2011-07-18 19:33 ` David Miller
2011-09-19  4:41 Stephen Rothwell
2011-09-19  4:51 Stephen Rothwell
2011-09-19  6:55 ` Dmitry Kravkov
2011-09-19 15:54   ` Joe Perches
2011-09-19 16:04     ` Dmitry Kravkov
2011-09-22  5:16 Stephen Rothwell
2016-10-15 21:13 Stephen Rothwell
2016-10-17 11:41 ` Mintz, Yuval
2017-11-26 22:42 Stephen Rothwell
2018-06-28 22:14 Stephen Rothwell
2019-07-21 23:41 Stephen Rothwell
2019-11-19 21:07 Stephen Rothwell
2020-06-09 23:30 Stephen Rothwell
2020-06-09 23:58 ` Arjun Roy
2021-03-18 21:29 Stephen Rothwell
2021-03-19 15:55 ` Leon Romanovsky
2021-03-20 19:28   ` Marc Kleine-Budde
2021-03-20 19:42     ` Linus Torvalds
2021-03-21  9:14       ` Leon Romanovsky
2022-12-07 21:23 Stephen Rothwell
2022-12-08  6:17 ` Juergen Gross

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=20090202141328.eaad3432.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=Matt.Waddel@freescale.com \
    --cc=davem@davemloft.net \
    --cc=gerg@uclinux.org \
    --cc=linux-next@vger.kernel.org \
    --cc=s.hauer@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).