From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758262Ab2CFCTc (ORCPT <rfc822;w@1wt.eu>);
	Mon, 5 Mar 2012 21:19:32 -0500
Received: from shards.monkeyblade.net ([198.137.202.13]:58693 "EHLO
	shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1758118Ab2CFCTb (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 5 Mar 2012 21:19:31 -0500
Date: Mon, 05 Mar 2012 21:17:23 -0500 (EST)
Message-Id: <20120305.211723.1982594845858465817.davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: netdev@vger.kernel.org, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, sbhatewara@vmware.com,
        eric.dumazet@gmail.com
Subject: Re: linux-next: manual merge of the net-next tree with the net tree
From: David Miller <davem@davemloft.net>
In-Reply-To: <20120305131103.71d87f250accd238b7d7630e@canb.auug.org.au>
References: <20120305131103.71d87f250accd238b7d7630e@canb.auug.org.au>
X-Mailer: Mew version 6.4 on Emacs 23.3 / Mule 6.0 (HANACHIRUSATO)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (shards.monkeyblade.net [198.137.202.13]); Mon, 05 Mar 2012 18:17:25 -0800 (PST)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 Mar 2012 13:11:03 +1100

> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/vmxnet3/vmxnet3_drv.c between commit efead8710aad ("vmxnet3:
> Fix transport header size") from the net tree and commit 8bca5d1ebb8b
> ("vmxnet3: cleanup tso headers manipulation") from the net-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

I'm taking care of this right now, thanks Stephen.