From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755789Ab2GRTWP (ORCPT ); Wed, 18 Jul 2012 15:22:15 -0400 Received: from usmamail.tilera.com ([12.216.194.151]:25966 "EHLO USMAMAIL.TILERA.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755740Ab2GRTWO (ORCPT ); Wed, 18 Jul 2012 15:22:14 -0400 Message-ID: <50070CE4.7040704@tilera.com> Date: Wed, 18 Jul 2012 15:22:12 -0400 From: Chris Metcalf User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:14.0) Gecko/20120713 Thunderbird/14.0 MIME-Version: 1.0 To: David Miller CC: , Subject: Re: [PATCH 0/3 v2] net: various tilegx networking fixes References: <201207181650.q6IGodZ7007565@lab-41.internal.tilera.com> <20120718.113623.984635805289135415.davem@davemloft.net> In-Reply-To: <20120718.113623.984635805289135415.davem@davemloft.net> X-Enigmail-Version: 1.4.3 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 7/18/2012 2:36 PM, David Miller wrote: > From: Chris Metcalf > 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! -- Chris Metcalf, Tilera Corp. http://www.tilera.com