Stephen Rothwell wrote: > Hi all, > > On Tue, 12 Oct 2010 11:17:16 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: >> Today's linux-next merge of the net tree got a conflict in >> drivers/ieee1394/eth1394.c between commit >> 66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE >> 1394 driver stack") from the tree and commit > ^ > I meant to say "the ieee1394 tree". (I should have put the ieee1394 removal into -next much earlier. OTOH the conflicting commit is from August 17 already...) Would it be useful if I rebase this small ieee1394 removal branch of mine onto net? -- Stefan Richter -=====-==-=- =-=- -==-- http://arcgraph.de/sr/ -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html