From patchwork Mon Jan 6 07:35:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1217998 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 (no SPF record) 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=fail (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=nifty.com header.i=@nifty.com header.b="QIevkAWy"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47rnPw2GJTz9sR4 for ; Mon, 6 Jan 2020 18:36:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726510AbgAFHgd (ORCPT ); Mon, 6 Jan 2020 02:36:33 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:47941 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725821AbgAFHgc (ORCPT ); Mon, 6 Jan 2020 02:36:32 -0500 X-Greylist: delayed 9305 seconds by postgrey-1.27 at vger.kernel.org; Mon, 06 Jan 2020 02:36:31 EST Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id 0067Zx8c016413; Mon, 6 Jan 2020 16:35:59 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com 0067Zx8c016413 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1578296160; bh=ZVoO8YLsTvNlYUAa93bzA04FOXwCJJRNR2tidbcPgLQ=; h=From:To:Cc:Subject:Date:From; b=QIevkAWy+8aOHk7THP4EbH7P/Exfbv1NOySKZbR4/XKS2zq7c8aMV1uUJAo2yUuf5 oHtZll7lM7LQO2ZFjG4PZzVbNNx0R0ueaXUR6K/OOPDsvBk2GP+LzKkf60EaxIN7OZ /BtwerKd8ck6Nn+FNVkphuxO90WGzustB3DVuA/+14iAJZJ3mpLfC/YGvEG1yrMLa1 uXhIGGhamHYzWowclgPTRYvjrQslXgDE/2Os3HhX5ABStreowOtaL4VazLdE2ip/gm lfx6PL3V7CD8dqxRUrRqKO02Xqxt0/+9lK+irQMw4RFeaSWcCLJXdeHI3gjAr0+Yj9 j6ErkpEoq4WEA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Jon Maloy , Ying Xue , netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net, "David S . Miller" Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] tipc: do not add socket.o to tipc-y twice Date: Mon, 6 Jan 2020 16:35:26 +0900 Message-Id: <20200106073527.18697-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org net/tipc/Makefile adds socket.o twice. tipc-y += addr.o bcast.o bearer.o \ core.o link.o discover.o msg.o \ name_distr.o subscr.o monitor.o name_table.o net.o \ netlink.o netlink_compat.o node.o socket.o eth_media.o \ ^^^^^^^^ topsrv.o socket.o group.o trace.o ^^^^^^^^ Signed-off-by: Masahiro Yamada --- net/tipc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/tipc/Makefile b/net/tipc/Makefile index 11255e970dd4..1603f5b49e73 100644 --- a/net/tipc/Makefile +++ b/net/tipc/Makefile @@ -9,7 +9,7 @@ tipc-y += addr.o bcast.o bearer.o \ core.o link.o discover.o msg.o \ name_distr.o subscr.o monitor.o name_table.o net.o \ netlink.o netlink_compat.o node.o socket.o eth_media.o \ - topsrv.o socket.o group.o trace.o + topsrv.o group.o trace.o CFLAGS_trace.o += -I$(src) From patchwork Mon Jan 6 07:35:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1217999 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 (no SPF record) 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=fail (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=nifty.com header.i=@nifty.com header.b="uRqt5TT1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47rnQ1612Sz9sR4 for ; Mon, 6 Jan 2020 18:36:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726760AbgAFHgj (ORCPT ); Mon, 6 Jan 2020 02:36:39 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:48152 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726636AbgAFHgj (ORCPT ); Mon, 6 Jan 2020 02:36:39 -0500 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id 0067Zx8d016413; Mon, 6 Jan 2020 16:36:00 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com 0067Zx8d016413 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1578296160; bh=x+bqJGvJ9dfQ92n9qPLb8ZtMbNjVzUFYBwr7W/KMlXg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uRqt5TT1t+oGlK+04WQOfVpyyrVY/PXqi0G6EToUrBdh+slDNFA0UXQLflc3+aR3T Plv3IVUmxVXx6JGot6DwbP+AniCg98wxTb9W4sfB1AoVhiaMTwbuzMD34vLjBLMgbD EJMGOw7pTL7gu1CWAjW4IKyCS+2drgD8hNMcHKhmv+7o6Fg65pUTNA3VF4nm4/GKKg xf1xOVtnBPHlFwOUu3QFI0YT9Trac3OXsM2rLUUAMH/KpSoasGHThgwyYzI6rnKCwp FA7evSA5yDC6kLuGYBpnwl7Lvaj7CCMa8n4s+Y3B9LjPfx4wMxDZwR4+MpNRNqFDJG +34I2ivR8STVw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Jon Maloy , Ying Xue , netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net, "David S . Miller" Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] tipc: remove meaningless assignment in Makefile Date: Mon, 6 Jan 2020 16:35:27 +0900 Message-Id: <20200106073527.18697-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200106073527.18697-1-masahiroy@kernel.org> References: <20200106073527.18697-1-masahiroy@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is no module named tipc_diag. The assignment to tipc_diag-y has no effect. Signed-off-by: Masahiro Yamada --- net/tipc/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/tipc/Makefile b/net/tipc/Makefile index 1603f5b49e73..ee49a9f1dd4f 100644 --- a/net/tipc/Makefile +++ b/net/tipc/Makefile @@ -20,5 +20,3 @@ tipc-$(CONFIG_TIPC_CRYPTO) += crypto.o obj-$(CONFIG_TIPC_DIAG) += diag.o - -tipc_diag-y := diag.o