From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Mon, 7 Nov 2011 13:47:06 +1100 >> If you just revert the commit in origin from -next, then you will get >> conflicts with you pull the net.git tree in. > > I got no conflicts when I merged in the net tree and can see no fix for > this problem in the net tree. My current head of the net tree is 1a6422f > "etherh: Add MAINTAINERS entry for etherh". Ok, Jeff please take a look at this and send me a fix soon. Thanks. -- 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
