From patchwork Tue Jul 24 19:29:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 948792 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=networkplumber.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="vy6Jp2cn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41ZpQH0nb8z9s0R for ; Wed, 25 Jul 2018 05:31:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388751AbeGXUjq (ORCPT ); Tue, 24 Jul 2018 16:39:46 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:40265 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388758AbeGXUhZ (ORCPT ); Tue, 24 Jul 2018 16:37:25 -0400 Received: by mail-pl0-f67.google.com with SMTP id s17-v6so2196083plp.7 for ; Tue, 24 Jul 2018 12:29:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r0hpUUHUVe1pNUBcQjGRb4/tXzR1rTjBYodnhG+AlnY=; b=vy6Jp2cnC5uHOF2pi+ZeP434UVumKMdF+iEFzamUyqDE1rRVKFbaQAoCxbGk1OJn5t kjRS/AGIl9Yn0SB7XB9nh4PTlKd3CSYXrVGt2N2yzr/s7hrfoqvotd7Pzf5RKV/GIviZ psZTsbZaq5sqpzElWlAMNY8m7QNshVS8z9okW0cPZX7ZWQ0tWGholQYHj39ZUq7lJ8lu SCyUeQDBFF6es7kqIeZRPZi498rZYMRzjm12fWjXlHX1yejKjzXxnEbJQGAGDvKZ3E5n 60O2jAqMCyzh9qahbaBAlspyoj49nPMoWHuG45BCbVwpCZcAUUTO3FEBdt46N/nSH1k2 pfKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=r0hpUUHUVe1pNUBcQjGRb4/tXzR1rTjBYodnhG+AlnY=; b=U+gAZsibKIsRWL3cMYdbg1rWrN+0Wi3kbEib5lEuH5EOANl3VCqzWR0DsmbDiiZFBX 1LvnGIADeIFYJoieEoC+AwkG5OxOqhEV1dk7cjl6Dko3yEmonPvEr1RDycIShG5CdUql QfwXwAS3nhB+tU58Uz2C7U7It37YFKH6+qU/es00vBeGx+j+7TKTPa4GyRNKS8xtr/Y0 v6wiHCrTRpG1Ka5g08uW6cTCtN9gFAswV8i4YnbTuPok3kiLKhbjxo7D95jbpD2M+lAD n+BdzheZxpRVbzYSrMw5JDm7d5L9DzqXXDZSJjqGFrOVQqwI5YQGcPAZtkTY1oVViQz0 6r6A== X-Gm-Message-State: AOUpUlGgl1UmbX5RvNyki83965fHMM2MNDcEYkvGU5KQ9bvzru27YP1U ycNkJLM6E6VSNd47MxbzDQzCwQ== X-Google-Smtp-Source: AAOMgpf3UBFzFgbQZun2tEWOtD8G0msdNq8+HJpt4pbyaPh0ni2SF9oMkvh6FdHN7zIFdEcrGW1Azw== X-Received: by 2002:a17:902:28e9:: with SMTP id f96-v6mr17795437plb.240.1532460568392; Tue, 24 Jul 2018 12:29:28 -0700 (PDT) Received: from xeon-e3.wavecable.com (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id k6-v6sm16788366pgc.71.2018.07.24.12.29.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jul 2018 12:29:27 -0700 (PDT) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: davem@davemloft.net, ericvh@gmail.com, rminnich@sandia.gov, lucho@ionkov.net, ralf@linux-mips.org, jreuter@yaina.de, pablo@netfilter.org, kadlec@blackhole.kfki.hu, fw@strlen.de, alex.aring@gmail.com, stefan@datenfreihafen.org, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, johannes@sipsolutions.net, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, vyasevich@gmail.com, nhorman@tuxdriver.com, marcelo.leitner@gmail.com, trond.myklebust@hammerspace.com, anna.schumaker@netapp.com, steffen.klassert@secunet.com, herbert@gondor.apana.org.au Cc: netdev@vger.kernel.org, v9fs-developer@lists.sourceforge.net, linux-hams@vger.kernel.org, ceph-devel@vger.kernel.org, linux-decnet-user@lists.sourceforge.net, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, linux-wpan@vger.kernel.org, linux-s390@vger.kernel.org, linux-wireless@vger.kernel.org, linux-rdma@vger.kernel.org, linux-sctp@vger.kernel.org, linux-nfs@vger.kernel.org, linux-x25@vger.kernel.org, Stephen Hemminger , Stephen Hemminger Subject: [PATCH PATCH net-next 01/18] sched: fix trailing whitespace Date: Tue, 24 Jul 2018 12:29:01 -0700 Message-Id: <20180724192918.31165-2-sthemmin@microsoft.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180724192918.31165-1-sthemmin@microsoft.com> References: <20180724192918.31165-1-sthemmin@microsoft.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove trailing whitespace and blank lines at EOF Signed-off-by: Stephen Hemminger --- net/sched/Kconfig | 4 ++-- net/sched/Makefile | 2 +- net/sched/act_connmark.c | 1 - net/sched/act_pedit.c | 1 - net/sched/cls_basic.c | 1 - 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 7af246764a35..bba71225adbd 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -1,6 +1,6 @@ # # Traffic control configuration. -# +# menuconfig NET_SCHED bool "QoS and/or fair queueing" @@ -706,7 +706,7 @@ config NET_CLS_ACT config NET_ACT_POLICE tristate "Traffic Policing" - depends on NET_CLS_ACT + depends on NET_CLS_ACT ---help--- Say Y here if you want to do traffic policing, i.e. strict bandwidth limiting. This action replaces the existing policing diff --git a/net/sched/Makefile b/net/sched/Makefile index 673ee7d26ff2..910ec7463a36 100644 --- a/net/sched/Makefile +++ b/net/sched/Makefile @@ -33,7 +33,7 @@ obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o obj-$(CONFIG_NET_SCH_HFSC) += sch_hfsc.o obj-$(CONFIG_NET_SCH_RED) += sch_red.o obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o -obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o +obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o obj-$(CONFIG_NET_SCH_DSMARK) += sch_dsmark.o obj-$(CONFIG_NET_SCH_SFB) += sch_sfb.o obj-$(CONFIG_NET_SCH_SFQ) += sch_sfq.o diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c index 1e31f0e448e2..2f9bc833d046 100644 --- a/net/sched/act_connmark.c +++ b/net/sched/act_connmark.c @@ -252,4 +252,3 @@ module_exit(connmark_cleanup_module); MODULE_AUTHOR("Felix Fietkau "); MODULE_DESCRIPTION("Connection tracking mark restoring"); MODULE_LICENSE("GPL"); - diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c index cc8ffcd1ddb5..9ab5d81aff1a 100644 --- a/net/sched/act_pedit.c +++ b/net/sched/act_pedit.c @@ -516,4 +516,3 @@ static void __exit pedit_cleanup_module(void) module_init(pedit_init_module); module_exit(pedit_cleanup_module); - diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c index 95367f37098d..6a5dce8baf19 100644 --- a/net/sched/cls_basic.c +++ b/net/sched/cls_basic.c @@ -324,4 +324,3 @@ static void __exit exit_basic(void) module_init(init_basic) module_exit(exit_basic) MODULE_LICENSE("GPL"); -