archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the h8300-remove tree with the net tree
@ 2013-09-05  1:00 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-09-05  1:00 UTC (permalink / raw)
  To: Guenter Roeck; +Cc: linux-next, linux-kernel, Chen Gang, David Miller, netdev

[-- Attachment #1: Type: text/plain, Size: 601 bytes --]

Hi Guenter,

Today's linux-next merge of the h8300-remove tree got a conflict in
drivers/net/ethernet/8390/Kconfig between commit 061ba049abc6 ("drivers:
net: ethernet: 8390: Kconfig: add H8300H_AKI3068NET and H8300H_H8MAX
dependancy for NE_H8300") from the net tree and commit d5bfa4f18b55
("net/ethernet: Drop H8/300 Ethernet driver") from the h8300-remove tree.

I fixed it up (The latter removes the entry that is updated by the
former, so I did that) and can carry the fix as necessary (no action is

Stephen Rothwell          

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-09-05  1:00 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-05  1:00 linux-next: manual merge of the h8300-remove tree with the net 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).