tipc: do not add socket.o to tipc-y twice
Subsystems (3)
PATCH 1/2 tipc: do not add socket.o to tipc-y twice
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 <[email protected]>
---
net/tipc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/tipc/Makefile +1 -1
@@ -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)
Signature · 1 line
2.17.1
PATCH 2/2 tipc: remove meaningless assignment in Makefile
There is no module named tipc_diag.
The assignment to tipc_diag-y has no effect.
Signed-off-by Masahiro Yamada <[email protected]>
---
net/tipc/Makefile | 2 -- 1 file changed, 2 deletions(-)
net/tipc/Makefile +0 -2
@@ -20,5 +20,3 @@ tipc-$(CONFIG_TIPC_CRYPTO) += crypto.o obj-$(CONFIG_TIPC_DIAG) += diag.o - -tipc_diag-y := diag.o
Signature · 1 line
2.17.1
From: Masahiro Yamada <[email protected]>
Date: Mon, 6 Jan 2020 16:35:26 +0900
Quoted 11 lines
net/tipc/Makefileadds 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 <[email protected]>
Applied.
Re: [PATCH 2/2] tipc: remove meaningless assignment in Makefile
In reply to Masahiro YamadaFrom: Masahiro Yamada <[email protected]>
Date: Mon, 6 Jan 2020 16:35:27 +0900
Quoted 5 lines
There is no module named
tipc_diag.The assignment to tipc_diag-y has no effect.
Signed-off-by Masahiro Yamada <[email protected]>
Applied.