| Message ID | 20230208005626.56847-1-yang.lee@linux.alibaba.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3173812wrn;
Tue, 7 Feb 2023 17:00:06 -0800 (PST)
X-Google-Smtp-Source:
AK7set+32quQ4NIFk+pQeek8csNNhA5ENZkgi9tgfUqMFxBredo1bl/4DRQWT3aSNYHMlOF0CSUI
X-Received: by 2002:a17:90a:1a10:b0:230:bb46:787d with SMTP id
16-20020a17090a1a1000b00230bb46787dmr6316744pjk.37.1675818005747;
Tue, 07 Feb 2023 17:00:05 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1675818005; cv=none;
d=google.com; s=arc-20160816;
b=eYamsn6hCaPBwLhppPfk+lngvScZrX7Om26/gwJZQlnVBTysVrPYV6efU7INcbqI/y
lkDVwozAhdhsrDiiyBd2aZq9gmb6D9qUlCow3KnOOPO25Jk3uMlxONbaMfUYRoYZuRvX
mSN+r0uqO1/H62fwE/V8g2RZxfuhzWCQlRsuQ1JPeWLpNdf03tWdCsOPyPD6fwYHq/mn
+6pcT/lDFphmZNbG/i9hWsTv9yxhcZrCmgs/DjQhUj0s2AMtsVSHBbFEiqaozE3tys9/
/iL26WNLPygBLh7Gj3yf8RdnKM1JtAN7oRXpOIDHMqTrAoW+of/wvdiQmSCs4UwDtsT1
sbLg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:message-id:date:subject:cc:to:from;
bh=2MiFX+50lgasbeo90GydCMbH9QFbOIBINeD+pATQPJI=;
b=qQZHxsaX9Nc7n4ofkfzVj9lETXD7iCncHMiYBv0pS1VVcSjlOkY1CKRJQyoLXHke6r
d0YN2pxBqXGlqWARgK87TYAeKFgmg/2mAhBm1YQl+FhmrBxK8//biT3ytXev7K7O65G3
T8xPFw8oHtFvqYkOY1a3B3nUvr3qT+iBkqibL3nQIlWW5PWiFPvmhUrm8qCSBdjhXcZU
QSMKOFdHARvpBsalT95Q/9/9nU5SZmmtdcCje/CQWcxQc3kfKiGfAqzQPgo708txf6AH
PL7U6E2to1toMILyCcletZowJ7aCEN/3bDHQ3XO+QDvxwCnXxbvGRUWiHpO4PjLZrfyo
RvMg==
ARC-Authentication-Results: i=1; mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
6-20020a17090a08c600b00226e01736f8si456393pjn.109.2023.02.07.16.59.51;
Tue, 07 Feb 2023 17:00:05 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229805AbjBHA4d (ORCPT <rfc822;kmanaouilinux@gmail.com>
+ 99 others); Tue, 7 Feb 2023 19:56:33 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34194 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229632AbjBHA4b (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 7 Feb 2023 19:56:31 -0500
Received: from out30-131.freemail.mail.aliyun.com
(out30-131.freemail.mail.aliyun.com [115.124.30.131])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA13E2A15E;
Tue, 7 Feb 2023 16:56:30 -0800 (PST)
X-Alimail-AntiSpam:
AC=PASS;BC=-1|-1;BR=01201311R161e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046049;MF=yang.lee@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0Vb92B8B_1675817787;
Received: from localhost(mailfrom:yang.lee@linux.alibaba.com
fp:SMTPD_---0Vb92B8B_1675817787)
by smtp.aliyun-inc.com;
Wed, 08 Feb 2023 08:56:28 +0800
From: Yang Li <yang.lee@linux.alibaba.com>
To: davem@davemloft.net
Cc: kuba@kernel.org, edumazet@google.com, razor@blackwall.org,
roopa@nvidia.com, pabeni@redhat.com,
bridge@lists.linux-foundation.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Yang Li <yang.lee@linux.alibaba.com>,
Abaci Robot <abaci@linux.alibaba.com>
Subject: [PATCH -next] net: bridge: clean up one inconsistent indenting
Date: Wed, 8 Feb 2023 08:56:26 +0800
Message-Id: <20230208005626.56847-1-yang.lee@linux.alibaba.com>
X-Mailer: git-send-email 2.20.1.7.g153144c
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00,
ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL
autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1757222541443954313?=
X-GMAIL-MSGID: =?utf-8?q?1757222541443954313?=
|
| Series |
[-next] net: bridge: clean up one inconsistent indenting
|
|
Commit Message
Yang Li
Feb. 8, 2023, 12:56 a.m. UTC
./net/bridge/br_netlink_tunnel.c:317:4-27: code aligned with following code on line 318
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3977
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
net/bridge/br_netlink_tunnel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 2/8/23 02:56, Yang Li wrote: > ./net/bridge/br_netlink_tunnel.c:317:4-27: code aligned with following code on line 318 > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3977 > Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> > --- > net/bridge/br_netlink_tunnel.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bridge/br_netlink_tunnel.c b/net/bridge/br_netlink_tunnel.c > index 17abf092f7ca..eff949bfdd83 100644 > --- a/net/bridge/br_netlink_tunnel.c > +++ b/net/bridge/br_netlink_tunnel.c > @@ -315,7 +315,7 @@ int br_process_vlan_tunnel_info(const struct net_bridge *br, > > if (curr_change) > *changed = curr_change; > - __vlan_tunnel_handle_range(p, &v_start, &v_end, v, > + __vlan_tunnel_handle_range(p, &v_start, &v_end, v, > curr_change); > } > if (v_start && v_end) Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
On Wed, Feb 08, 2023 at 08:56:26AM +0800, Yang Li wrote: > ./net/bridge/br_netlink_tunnel.c:317:4-27: code aligned with following code on line 318 > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3977 > Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> As you may need to respin this: Assuming this is targeting net-next, which seems likely to me, the subject should denote that. Something like this: [PATCH net-next] net: bridge: clean up one inconsistent indenting > --- > net/bridge/br_netlink_tunnel.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bridge/br_netlink_tunnel.c b/net/bridge/br_netlink_tunnel.c > index 17abf092f7ca..eff949bfdd83 100644 > --- a/net/bridge/br_netlink_tunnel.c > +++ b/net/bridge/br_netlink_tunnel.c > @@ -315,7 +315,7 @@ int br_process_vlan_tunnel_info(const struct net_bridge *br, > > if (curr_change) > *changed = curr_change; > - __vlan_tunnel_handle_range(p, &v_start, &v_end, v, > + __vlan_tunnel_handle_range(p, &v_start, &v_end, v, > curr_change); I think you also need to adjust the line immediately above. > } > if (v_start && v_end) > -- > 2.20.1.7.g153144c >
On 2/8/23 15:04, Simon Horman wrote: > On Wed, Feb 08, 2023 at 08:56:26AM +0800, Yang Li wrote: >> ./net/bridge/br_netlink_tunnel.c:317:4-27: code aligned with following code on line 318 >> >> Reported-by: Abaci Robot <abaci@linux.alibaba.com> >> Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3977 >> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> > > As you may need to respin this: > > Assuming this is targeting net-next, which seems likely to me, > the subject should denote that. Something like this: > > [PATCH net-next] net: bridge: clean up one inconsistent indenting > >> --- >> net/bridge/br_netlink_tunnel.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/net/bridge/br_netlink_tunnel.c b/net/bridge/br_netlink_tunnel.c >> index 17abf092f7ca..eff949bfdd83 100644 >> --- a/net/bridge/br_netlink_tunnel.c >> +++ b/net/bridge/br_netlink_tunnel.c >> @@ -315,7 +315,7 @@ int br_process_vlan_tunnel_info(const struct net_bridge *br, >> >> if (curr_change) >> *changed = curr_change; >> - __vlan_tunnel_handle_range(p, &v_start, &v_end, v, >> + __vlan_tunnel_handle_range(p, &v_start, &v_end, v, >> curr_change); > > I think you also need to adjust the line immediately above. You meant below, right? :) i.e. "curr_change)", that seems to get misaligned after the change and needs to be adjusted as well. > >> } >> if (v_start && v_end) >> -- >> 2.20.1.7.g153144c >>
On 2/8/23 15:30, Nikolay Aleksandrov wrote: > On 2/8/23 15:04, Simon Horman wrote: >> On Wed, Feb 08, 2023 at 08:56:26AM +0800, Yang Li wrote: >>> ./net/bridge/br_netlink_tunnel.c:317:4-27: code aligned with >>> following code on line 318 >>> >>> Reported-by: Abaci Robot <abaci@linux.alibaba.com> >>> Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3977 >>> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> >> >> As you may need to respin this: >> >> Assuming this is targeting net-next, which seems likely to me, >> the subject should denote that. Something like this: >> >> [PATCH net-next] net: bridge: clean up one inconsistent indenting >> >>> --- >>> net/bridge/br_netlink_tunnel.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/net/bridge/br_netlink_tunnel.c >>> b/net/bridge/br_netlink_tunnel.c >>> index 17abf092f7ca..eff949bfdd83 100644 >>> --- a/net/bridge/br_netlink_tunnel.c >>> +++ b/net/bridge/br_netlink_tunnel.c >>> @@ -315,7 +315,7 @@ int br_process_vlan_tunnel_info(const struct >>> net_bridge *br, >>> if (curr_change) >>> *changed = curr_change; >>> - __vlan_tunnel_handle_range(p, &v_start, &v_end, v, >>> + __vlan_tunnel_handle_range(p, &v_start, &v_end, v, >>> curr_change); >> >> I think you also need to adjust the line immediately above. > > You meant below, right? :) i.e. "curr_change)", that seems to get > misaligned after the change and needs to be adjusted as well. > Oh I need coffee, I somehow was thinking about the line being changed instead of literally the line above your statement. :)) Anyway, ack. >> >>> } >>> if (v_start && v_end) >>> -- >>> 2.20.1.7.g153144c >>> >
On Wed, Feb 08, 2023 at 02:31:39PM +0100, Nikolay Aleksandrov wrote: > On 2/8/23 15:30, Nikolay Aleksandrov wrote: > > On 2/8/23 15:04, Simon Horman wrote: > > > On Wed, Feb 08, 2023 at 08:56:26AM +0800, Yang Li wrote: > > > > ./net/bridge/br_netlink_tunnel.c:317:4-27: code aligned with > > > > following code on line 318 > > > > > > > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > > > > Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3977 > > > > Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> > > > > > > As you may need to respin this: > > > > > > Assuming this is targeting net-next, which seems likely to me, > > > the subject should denote that. Something like this: > > > > > > [PATCH net-next] net: bridge: clean up one inconsistent indenting > > > > > > > --- > > > > net/bridge/br_netlink_tunnel.c | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/net/bridge/br_netlink_tunnel.c > > > > b/net/bridge/br_netlink_tunnel.c > > > > index 17abf092f7ca..eff949bfdd83 100644 > > > > --- a/net/bridge/br_netlink_tunnel.c > > > > +++ b/net/bridge/br_netlink_tunnel.c > > > > @@ -315,7 +315,7 @@ int br_process_vlan_tunnel_info(const struct > > > > net_bridge *br, > > > > if (curr_change) > > > > *changed = curr_change; > > > > - __vlan_tunnel_handle_range(p, &v_start, &v_end, v, > > > > + __vlan_tunnel_handle_range(p, &v_start, &v_end, v, > > > > curr_change); > > > > > > I think you also need to adjust the line immediately above. > > > > You meant below, right? :) i.e. "curr_change)", that seems to get > > misaligned after the change and needs to be adjusted as well. > > > > Oh I need coffee, I somehow was thinking about the line being changed > instead of literally the line above your statement. :)) No problem. We are talking about the same line :) > Anyway, ack.
diff --git a/net/bridge/br_netlink_tunnel.c b/net/bridge/br_netlink_tunnel.c index 17abf092f7ca..eff949bfdd83 100644 --- a/net/bridge/br_netlink_tunnel.c +++ b/net/bridge/br_netlink_tunnel.c @@ -315,7 +315,7 @@ int br_process_vlan_tunnel_info(const struct net_bridge *br, if (curr_change) *changed = curr_change; - __vlan_tunnel_handle_range(p, &v_start, &v_end, v, + __vlan_tunnel_handle_range(p, &v_start, &v_end, v, curr_change); } if (v_start && v_end)