[{"id":1761884,"web_url":"http://patchwork.ozlabs.org/comment/1761884/","msgid":"<26D9FDECA4FBDD4AADA65D8E2FC68A4A10EA966C@ORSMSX104.amr.corp.intel.com>","list_archive_url":null,"date":"2017-09-01T17:59:04","subject":"Re: [Intel-wired-lan] [next PATCH S79-V2 07/13] i40e: fix merge\n\terror","submitter":{"id":66945,"url":"http://patchwork.ozlabs.org/api/people/66945/","name":"Bowers, AndrewX","email":"andrewx.bowers@intel.com"},"content":"> -----Original Message-----\n> From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On\n> Behalf Of Alice Michael\n> Sent: Tuesday, August 29, 2017 2:33 AM\n> To: Michael, Alice ; intel-wired-\n> lan@lists.osuosl.org\n> Subject: [Intel-wired-lan] [next PATCH S79-V2 07/13] i40e: fix merge error\n> \n> This patch removes some code that was accidentally added to the wrong\n> function with a merge error. Fixes: c53934c6d1b1\n> (\"i40e: fix: do not sleep in netdev_ops\")\n> \n> Signed-off-by: Alice Michael \n> ---\n> drivers/net/ethernet/intel/i40e/i40e_main.c | 5 -----\n> 1 file changed, 5 deletions(-)\n\nTested-by: Andrew Bowers ","headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","intel-wired-lan@lists.osuosl.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","intel-wired-lan@lists.osuosl.org"],"Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.138; helo=whitealder.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=)","Received":["from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xkRnr2zsFz9t2x\n\tfor ;\n\tSat, 2 Sep 2017 03:59:10 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D590688ED1;\n\tFri, 1 Sep 2017 17:59:08 +0000 (UTC)","from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id NxLf+yvEOsKI; Fri, 1 Sep 2017 17:59:08 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 1557A88CB6;\n\tFri, 1 Sep 2017 17:59:08 +0000 (UTC)","from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 876EE1C078A\n\tfor ;\n\tFri, 1 Sep 2017 17:59:07 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 80A452C92A\n\tfor ;\n\tFri, 1 Sep 2017 17:59:07 +0000 (UTC)","from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id h5IOseUtXdwH for ;\n\tFri, 1 Sep 2017 17:59:06 +0000 (UTC)","from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby silver.osuosl.org (Postfix) with ESMTPS id A65C12A1B5\n\tfor ;\n\tFri, 1 Sep 2017 17:59:06 +0000 (UTC)","from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t01 Sep 2017 10:59:06 -0700","from orsmsx106.amr.corp.intel.com ([10.22.225.133])\n\tby orsmga002.jf.intel.com with ESMTP; 01 Sep 2017 10:59:05 -0700","from orsmsx104.amr.corp.intel.com ([169.254.4.142]) by\n\tORSMSX106.amr.corp.intel.com ([169.254.1.121]) with mapi id\n\t14.03.0319.002; Fri, 1 Sep 2017 10:59:05 -0700"],"X-Virus-Scanned":["amavisd-new at osuosl.org","amavisd-new at osuosl.org"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","X-ExtLoop1":"1","X-IronPort-AV":"E=Sophos;i=\"5.41,459,1498546800\"; d=\"scan'208\";a=\"130805841\"","From":"\"Bowers, AndrewX\" ","To":"\"intel-wired-lan@lists.osuosl.org\" ","Thread-Topic":"[Intel-wired-lan] [next PATCH S79-V2 07/13] i40e: fix merge\n\terror","Thread-Index":"AQHTIO2GxJFdyHWkKEij0e8Htil3DqKgVhGg","Date":"Fri, 1 Sep 2017 17:59:04 +0000","Message-ID":"<26D9FDECA4FBDD4AADA65D8E2FC68A4A10EA966C@ORSMSX104.amr.corp.intel.com>","References":"<20170829093242.41026-1-alice.michael@intel.com>\n\t<20170829093242.41026-7-alice.michael@intel.com>","In-Reply-To":"<20170829093242.41026-7-alice.michael@intel.com>","Accept-Language":"en-US","Content-Language":"en-US","X-MS-Has-Attach":"","X-MS-TNEF-Correlator":"","x-titus-metadata-40":"eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYWMxMzJhZGUtNTRmMC00NDNiLWFkN2UtNWJhODY5ZGI5Y2YwIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE2LjUuOS4zIiwiVHJ1c3RlZExhYmVsSGFzaCI6IjcwK0lYTHBWZHptQjBjUU4xUUZxbFRrSE53SFQ2NjZGdDh3VVRqRlFSc0k9In0=","x-ctpclassification":"CTP_IC","dlp-product":"dlpe-windows","dlp-version":"11.0.0.116","dlp-reaction":"no-action","x-originating-ip":"[10.22.254.139]","MIME-Version":"1.0","Subject":"Re: [Intel-wired-lan] [next PATCH S79-V2 07/13] i40e: fix merge\n\terror","X-BeenThere":"intel-wired-lan@osuosl.org","X-Mailman-Version":"2.1.18-1","Precedence":"list","List-Id":"Intel Wired Ethernet Linux Kernel Driver Development\n\t","List-Unsubscribe":", \n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":", \n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"intel-wired-lan-bounces@osuosl.org","Sender":"\"Intel-wired-lan\" "}}]