Re: [PATCH 0/3 v2] net: various tilegx networking fixes
From: David Miller <davem@davemloft.net>
Date: 2012-07-19 20:40:02
Also in:
lkml
From: Chris Metcalf <redacted> Date: Wed, 18 Jul 2012 15:22:12 -0400
On 7/18/2012 2:36 PM, David Miller wrote:quoted
From: Chris Metcalf <redacted> Date: Sun, 1 Jul 2012 14:43:47 -0400quoted
The tree is at: git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git net Chris Metcalf (3): net: tilegx driver bugfix (be explicit about percpu queue number) tilegx net driver: handle payload data not in frags tilegx net: use eth_hw_addr_random(), not random_ether_addr()These changes look fine, but when I pull from your tree I get tons of totally unrelated stuff and a merge conflict in this driver. Can you put together a clean pull against net-next?The merge conflict was against Joe Perches' bombing of random_ether_addr() to eth_random_addr(). I left in my change to convert that again to be eth_hw_addr_random(), which naively seems like a better API, and sets NET_ADDR_RANDOM, which is presumably a good thing. I recreated the tree to be branched off of net-next. ( I had originally created it off of Linus's tree, which in retrospect doesn't make much sense.) Please try to pull again - thanks!
Pulled, thanks a lot Chris.