| Message ID | 20200106073527.18697-1-masahiroy@kernel.org |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [1/2] tipc: do not add socket.o to tipc-y twice | expand |
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.
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)
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(-)