* [PATCH 1/2] tipc: do not add socket.o to tipc-y twice
@ 2020-01-06 7:35 Masahiro Yamada
2020-01-06 7:35 ` [PATCH 2/2] tipc: remove meaningless assignment in Makefile Masahiro Yamada
2020-01-08 20:39 ` [PATCH 1/2] tipc: do not add socket.o to tipc-y twice David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Masahiro Yamada @ 2020-01-06 7:35 UTC (permalink / raw)
To: Jon Maloy, Ying Xue, netdev, tipc-discussion, David S . Miller
Cc: Masahiro Yamada, linux-kernel
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 <masahiroy@kernel.org>
---
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)
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] tipc: remove meaningless assignment in Makefile
2020-01-06 7:35 [PATCH 1/2] tipc: do not add socket.o to tipc-y twice Masahiro Yamada
@ 2020-01-06 7:35 ` Masahiro Yamada
2020-01-08 20:39 ` David Miller
2020-01-08 20:39 ` [PATCH 1/2] tipc: do not add socket.o to tipc-y twice David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Masahiro Yamada @ 2020-01-06 7:35 UTC (permalink / raw)
To: Jon Maloy, Ying Xue, netdev, tipc-discussion, David S . Miller
Cc: Masahiro Yamada, linux-kernel
There is no module named tipc_diag.
The assignment to tipc_diag-y has no effect.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
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
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] tipc: do not add socket.o to tipc-y twice
2020-01-06 7:35 [PATCH 1/2] tipc: do not add socket.o to tipc-y twice Masahiro Yamada
2020-01-06 7:35 ` [PATCH 2/2] tipc: remove meaningless assignment in Makefile Masahiro Yamada
@ 2020-01-08 20:39 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2020-01-08 20:39 UTC (permalink / raw)
To: masahiroy; +Cc: jon.maloy, ying.xue, netdev, tipc-discussion, linux-kernel
From: Masahiro Yamada <masahiroy@kernel.org>
Date: Mon, 6 Jan 2020 16:35:26 +0900
> 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 <masahiroy@kernel.org>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-01-08 20:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-06 7:35 [PATCH 1/2] tipc: do not add socket.o to tipc-y twice Masahiro Yamada
2020-01-06 7:35 ` [PATCH 2/2] tipc: remove meaningless assignment in Makefile Masahiro Yamada
2020-01-08 20:39 ` David Miller
2020-01-08 20:39 ` [PATCH 1/2] tipc: do not add socket.o to tipc-y twice David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).