{"id":807201,"url":"http://patchwork.ozlabs.org/api/patches/807201/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170829093242.41026-7-alice.michael@intel.com/","project":{"id":46,"url":"http://patchwork.ozlabs.org/api/projects/46/?format=json","name":"Intel Wired Ethernet development","link_name":"intel-wired-lan","list_id":"intel-wired-lan.osuosl.org","list_email":"intel-wired-lan@osuosl.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170829093242.41026-7-alice.michael@intel.com>","list_archive_url":null,"date":"2017-08-29T09:32:36","name":"[next,S79-V2,07/13] i40e: fix merge error","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"bdd90fb39bb3790c16098314b544f36a62e09ccc","submitter":{"id":71123,"url":"http://patchwork.ozlabs.org/api/people/71123/?format=json","name":"Michael, Alice","email":"alice.michael@intel.com"},"delegate":{"id":68,"url":"http://patchwork.ozlabs.org/api/users/68/?format=json","username":"jtkirshe","first_name":"Jeff","last_name":"Kirsher","email":"jeffrey.t.kirsher@intel.com"},"mbox":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170829093242.41026-7-alice.michael@intel.com/mbox/","series":[{"id":423,"url":"http://patchwork.ozlabs.org/api/series/423/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=423","date":"2017-08-29T09:32:31","name":"[next,S79-V2,01/13] i40e: add private flag to control source pruning","version":1,"mbox":"http://patchwork.ozlabs.org/series/423/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807201/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807201/checks/","tags":{},"related":[],"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.133; helo=hemlock.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=)","Received":["from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 3xhbSN5TZ5z9t3P\n\tfor ;\n\tWed, 30 Aug 2017 03:37:40 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 3C9768948C;\n\tTue, 29 Aug 2017 17:37:39 +0000 (UTC)","from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 2EaqjrchLsFU; Tue, 29 Aug 2017 17:37:38 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id D570B89395;\n\tTue, 29 Aug 2017 17:37:38 +0000 (UTC)","from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id EB06A1C1F4F\n\tfor ;\n\tTue, 29 Aug 2017 17:37:34 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id E5CB988B00\n\tfor ;\n\tTue, 29 Aug 2017 17:37:34 +0000 (UTC)","from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id KxftAF3EPb-5 for ;\n\tTue, 29 Aug 2017 17:37:34 +0000 (UTC)","from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 7BCE1889C9\n\tfor ;\n\tTue, 29 Aug 2017 17:37:34 +0000 (UTC)","from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga105.jf.intel.com with ESMTP; 29 Aug 2017 10:37:33 -0700","from unknown (HELO localhost.jf.intel.com) ([10.166.16.121])\n\tby orsmga003.jf.intel.com with ESMTP; 29 Aug 2017 10:37:33 -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,445,1498546800\"; d=\"scan'208\";\n\ta=\"1008934121\"","From":"Alice Michael ","To":"alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org","Date":"Tue, 29 Aug 2017 05:32:36 -0400","Message-Id":"<20170829093242.41026-7-alice.michael@intel.com>","X-Mailer":"git-send-email 2.9.4","In-Reply-To":"<20170829093242.41026-1-alice.michael@intel.com>","References":"<20170829093242.41026-1-alice.michael@intel.com>","Subject":"[Intel-wired-lan] [next PATCH S79-V2 07/13] i40e: fix merge error","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","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"intel-wired-lan-bounces@osuosl.org","Sender":"\"Intel-wired-lan\" "},"content":"This patch removes some code that was accidentally added to\nthe wrong function with a merge error. Fixes: c53934c6d1b1\n(\"i40e: fix: do not sleep in netdev_ops\")\n\nSigned-off-by: Alice Michael \n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 5 -----\n 1 file changed, 5 deletions(-)","diff":"diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 1764fd2..85bf225 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -1776,11 +1776,6 @@ static void i40e_set_rx_mode(struct net_device *netdev)\n \t\tvsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED;\n \t\tvsi->back->flags |= I40E_FLAG_FILTER_SYNC;\n \t}\n-\n-\t/* schedule our worker thread which will take care of\n-\t * applying the new filter changes\n-\t */\n-\ti40e_service_event_schedule(vsi->back);\n }\n \n /**\n","prefixes":["next","S79-V2","07/13"]}