Re: [PATCH 0/3 v2] net: various tilegx networking fixes

[David Miller]

From: Chris Metcalf <cmetcalf@xxxxxxxxxx>
Date: Wed, 18 Jul 2012 15:22:12 -0400

> On 7/18/2012 2:36 PM, David Miller wrote:
>> From: Chris Metcalf <cmetcalf@xxxxxxxxxx>
>> Date: Sun, 1 Jul 2012 14:43:47 -0400
>>
>>> 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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/