From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [GIT] net has been merged into net-next Date: Fri, 20 Jul 2012 11:11:40 -0700 (PDT) Message-ID: <20120720.111140.2111833918704087635.davem@davemloft.net> References: <20120719.113140.2043522088096284293.davem@davemloft.net> <1342744598.2616.15.camel@jtkirshe-mobl> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org To: jeffrey.t.kirsher@intel.com Return-path: Received: from shards.monkeyblade.net ([149.20.54.216]:54413 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752507Ab2GTSLl (ORCPT ); Fri, 20 Jul 2012 14:11:41 -0400 In-Reply-To: <1342744598.2616.15.camel@jtkirshe-mobl> Sender: netdev-owner@vger.kernel.org List-ID: From: Jeff Kirsher Date: Thu, 19 Jul 2012 17:36:38 -0700 > On Thu, 2012-07-19 at 11:31 -0700, David Miller wrote: >> Jeff, please double check my merge work on the ixgbevf driver, and send >> me any necessary fixups. >> >> Thanks! > > Your conflict resolution was correct, so no fix-ups needed. Thanks > Dave. Thanks a lot Jeff.