Messages in this thread | | | Date | Sun, 06 Nov 2011 22:36:19 -0500 (EST) | Subject | Re: linux-next: build failure after merge of the origin tree | From | David Miller <> |
| |
From: Stephen Rothwell <sfr@canb.auug.org.au> 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.
| |