* linux-next: manual merge of the kbuild tree with the tree
@ 2011-11-01 3:43 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2011-11-01 3:43 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-next, linux-kernel, Paul Bolle, Jeff Kirsher
[-- Attachment #1: Type: text/plain, Size: 490 bytes --]
Hi Michal,
Today's linux-next merge of the kbuild tree got a conflict in
drivers/net/ethernet/stmicro/stmmac/Kconfig (drivers/net/stmmac/Kconfig
in the kbuild tree) between commit 7ac6653a085b ("stmmac: Move the
STMicroelectronics driver") from the tree and commit 2d3def0b73e3
("stmmac: drop unused Kconfig symbol") from the kbuild tree.
I just used the latter version.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-11-01 3:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-01 3:43 linux-next: manual merge of the kbuild tree with the tree Stephen Rothwell
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).