From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Kirsher Subject: Re: [GIT] net has been merged into net-next Date: Thu, 19 Jul 2012 17:36:38 -0700 Message-ID: <1342744598.2616.15.camel@jtkirshe-mobl> References: <20120719.113140.2043522088096284293.davem@davemloft.net> Reply-To: jeffrey.t.kirsher@intel.com Mime-Version: 1.0 Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-HH9qdc0uX67zkca/HL5o" Cc: netdev@vger.kernel.org To: David Miller Return-path: Received: from mga11.intel.com ([192.55.52.93]:19256 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751856Ab2GTAgj (ORCPT ); Thu, 19 Jul 2012 20:36:39 -0400 In-Reply-To: <20120719.113140.2043522088096284293.davem@davemloft.net> Sender: netdev-owner@vger.kernel.org List-ID: --=-HH9qdc0uX67zkca/HL5o Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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. >=20 > Thanks! Your conflict resolution was correct, so no fix-ups needed. Thanks Dave. --=-HH9qdc0uX67zkca/HL5o Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCgAGBQJQCKgWAAoJEOVv75VaS+3OxqUP+gOeUUa/DH4tmv4/WRKL1W0Q AXEM6WiVXL0YD4WeGUYhfbylmUzpTwgbc6S2iTHsoeQEklj3SVJujZ8hSOadUAXc CvnhMHexrkLrOmT+JmISH4oj8Fmu5QA7i5H8UxPZFphdi1oNFIb9BKzWglCg37/Y +WR6WmRf3S6oZ4bhr9YnPIuqR1mKWmYlFewMSugJls4W2U1WxED0H++A453wqp68 bIlAkJ8+O3K3s9Xzg+x3Ktxd/K9nxfvPG8tSL9sgo3maW0zZyHDU/vu/qeC6zu2D jwRM9qhN5Z19Bp9u6QV5XQ2xy+mQnKF70GFnRrprfujV7lG1ewf6ZSe+x6MlAHua NgUdCkgip8SxeBY+pMbvhqR4lGHH4bWwoGB38a60iIlh6/Q/PUe1jzNYmkTTcc00 +8RIQ+Q3Wyo7p+TAfV7egnYj160Dj+We77HSxucRqn6HDDpwKwCdzzEw/XGsNhNj PtcO2GBVscp49MyzcKFAwPOn1SD22G+q6lWk6eGP5/ADdh6NdjBAwWGLH+IIVGqA 2tbjilz0gzNU2IwqUuzVXc6I4VZ+b24LMMg2Gf+OR2vwNqZ2e1HJldHCwnnzM3y2 R41cEDf2mp0T4rj/wmL0al/lzxtv0NzYW7GQc0aZL7HwpVbEL888ZfdIdyT2hg5t cjIoDTs8MiiPs1qYYlpD =6h7r -----END PGP SIGNATURE----- --=-HH9qdc0uX67zkca/HL5o--