From: David Miller <davem@davemloft.net>
To: cmetcalf@tilera.com
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 0/3 v2] net: various tilegx networking fixes
Date: Thu, 19 Jul 2012 13:39:57 -0700 (PDT) [thread overview]
Message-ID: <20120719.133957.1840226993713773484.davem@davemloft.net> (raw)
In-Reply-To: <50070CE4.7040704@tilera.com>
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Wed, 18 Jul 2012 15:22:12 -0400
> On 7/18/2012 2:36 PM, David Miller wrote:
>> From: Chris Metcalf <cmetcalf@tilera.com>
>> 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.
prev parent reply other threads:[~2012-07-19 20:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-01 18:43 [PATCH 0/3 v2] net: various tilegx networking fixes Chris Metcalf
2012-07-18 16:52 ` [PATCH 1/3] net: tilegx driver bugfix (be explicit about percpu queue number) Chris Metcalf
2012-07-18 16:52 ` [PATCH 2/3] tilegx net driver: handle payload data not in frags Chris Metcalf
2012-07-18 16:53 ` [PATCH 3/3] tilegx net: use eth_hw_addr_random(), not random_ether_addr() Chris Metcalf
2012-07-18 18:36 ` [PATCH 0/3 v2] net: various tilegx networking fixes David Miller
2012-07-18 19:22 ` Chris Metcalf
2012-07-19 20:39 ` David Miller [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120719.133957.1840226993713773484.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=cmetcalf@tilera.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).