From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, Jamie Iles <jamie.iles@mathembedded.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with Linus' tree
Date: Thu, 24 Nov 2011 15:55:03 +0000 [thread overview]
Message-ID: <201111241555.03715.arnd@arndb.de> (raw)
In-Reply-To: <20111124115805.d2b5cdc699b9d6ed300b9c09@canb.auug.org.au>
On Thursday 24 November 2011, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/net/ethernet/cadence/Kconfig between commit eccab1ec87d0
> ("net/cadence: enable by default NET_ATMEL") from Linus' tree and commit
> f75ba50bdc2b ("macb: initial support for Cadence GEM") from the arm-soc
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Yes, looks good.
Thanks,
Arnd
next prev parent reply other threads:[~2011-11-24 15:57 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-24 0:58 linux-next: manual merge of the arm-soc tree with Linus' tree Stephen Rothwell
2011-11-24 0:58 ` Stephen Rothwell
2011-11-24 15:55 ` Arnd Bergmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-27 0:39 Stephen Rothwell
2022-05-27 0:39 ` Stephen Rothwell
2022-05-27 15:38 ` Hawkins, Nick
2022-05-27 15:38 ` Hawkins, Nick
2022-05-28 0:29 ` Stephen Rothwell
2022-05-28 0:29 ` Stephen Rothwell
2019-06-23 22:54 Stephen Rothwell
2019-06-23 22:54 ` Stephen Rothwell
2018-10-28 23:14 Stephen Rothwell
2018-10-28 23:14 ` Stephen Rothwell
2018-10-29 15:02 ` Tony Lindgren
2018-10-29 15:02 ` Tony Lindgren
2018-10-28 23:08 Stephen Rothwell
2018-10-28 23:08 ` Stephen Rothwell
2016-09-05 0:58 Stephen Rothwell
2016-09-05 0:58 ` Stephen Rothwell
2016-09-05 18:26 ` Russell King - ARM Linux
2016-09-05 18:26 ` Russell King - ARM Linux
2016-09-06 10:17 ` Arnd Bergmann
2016-09-06 10:17 ` Arnd Bergmann
2016-09-06 10:42 ` Russell King - ARM Linux
2016-09-06 10:42 ` Russell King - ARM Linux
2016-09-25 16:07 ` Robert Jarzmik
2016-09-25 16:07 ` Robert Jarzmik
2016-01-20 22:40 Stephen Rothwell
2016-01-20 22:40 ` Stephen Rothwell
2016-01-20 22:40 ` Stephen Rothwell
2015-08-23 23:55 Stephen Rothwell
2015-08-23 23:55 ` Stephen Rothwell
2015-08-23 23:55 ` Stephen Rothwell
2015-06-01 0:25 Stephen Rothwell
2015-06-01 0:25 ` Stephen Rothwell
2015-06-01 0:25 ` Stephen Rothwell
2015-06-01 7:12 ` Michal Simek
2015-06-01 7:12 ` Michal Simek
2014-01-30 0:19 Stephen Rothwell
2014-01-30 0:19 ` Stephen Rothwell
2014-01-30 0:19 ` Stephen Rothwell
2014-01-30 5:33 ` Kevin Hilman
2014-01-30 5:33 ` Kevin Hilman
2014-01-30 21:47 ` Mike Turquette
2014-01-30 21:47 ` Mike Turquette
2014-01-23 0:23 Stephen Rothwell
2014-01-23 0:23 ` Stephen Rothwell
2014-01-23 0:23 ` Stephen Rothwell
2013-08-27 8:29 Stephen Rothwell
2013-08-27 8:29 ` Stephen Rothwell
2013-08-27 8:29 ` Stephen Rothwell
2013-08-27 16:17 ` Stephen Warren
2013-08-27 16:17 ` Stephen Warren
2013-08-28 0:06 ` Stephen Rothwell
2013-08-28 0:06 ` Stephen Rothwell
2013-08-27 8:26 Stephen Rothwell
2013-08-27 8:26 ` Stephen Rothwell
2013-08-27 8:26 ` Stephen Rothwell
2013-07-08 4:03 Stephen Rothwell
2013-07-08 4:03 ` Stephen Rothwell
2013-07-08 4:03 ` Stephen Rothwell
2013-03-18 3:49 Stephen Rothwell
2013-03-18 3:49 ` Stephen Rothwell
2013-03-18 3:49 ` Stephen Rothwell
2012-10-04 4:33 Stephen Rothwell
2012-10-04 4:33 ` Stephen Rothwell
2012-10-04 4:33 ` Stephen Rothwell
2012-07-30 2:53 Stephen Rothwell
2012-07-30 2:53 ` Stephen Rothwell
2012-07-30 2:53 ` Stephen Rothwell
2012-03-15 6:50 Stephen Rothwell
2012-03-15 6:50 ` Stephen Rothwell
2012-03-15 6:50 ` Stephen Rothwell
2012-03-15 9:51 ` Laurent Pinchart
2012-03-15 9:51 ` Laurent Pinchart
2012-03-15 20:01 ` Arnd Bergmann
2012-03-15 20:01 ` Arnd Bergmann
2012-03-15 21:36 ` Rafael J. Wysocki
2012-03-15 21:36 ` Rafael J. Wysocki
2012-03-08 6:07 Stephen Rothwell
2012-03-08 6:07 ` Stephen Rothwell
2012-03-08 6:07 ` Stephen Rothwell
2011-11-06 23:33 Stephen Rothwell
2011-11-07 19:07 ` Arnd Bergmann
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=201111241555.03715.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=jamie.iles@mathembedded.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=plagnioj@jcrosoft.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.