| Message ID | d909edeef072da1810bd5869fdbbfe84411efdb2.1706904669.git.lucien.xin@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 06e6bc1b7aafa309c38d9d6623e8be3846647207 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] tipc: rename the module name diag to tipc_diag | expand |
> net/tipc/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > >diff --git a/net/tipc/Makefile b/net/tipc/Makefile index ee49a9f1dd4f..18e1636aa036 100644 >--- a/net/tipc/Makefile >+++ b/net/tipc/Makefile >@@ -18,5 +18,5 @@ tipc-$(CONFIG_TIPC_MEDIA_IB) += ib_media.o > tipc-$(CONFIG_SYSCTL) += sysctl.o > tipc-$(CONFIG_TIPC_CRYPTO) += crypto.o > >- >-obj-$(CONFIG_TIPC_DIAG) += diag.o >+obj-$(CONFIG_TIPC_DIAG) += tipc_diag.o >+tipc_diag-y += diag.o >-- >2.39.1 > Reviewed-by: Tung Nguyen <tung.q.nguyen@dektech.com.au>
Hello: This patch was applied to netdev/net-next.git (main) by Paolo Abeni <pabeni@redhat.com>: On Fri, 2 Feb 2024 15:11:09 -0500 you wrote: > It is not appropriate for TIPC to use "diag" as its diag module name > while the other protocols are using "$(protoname)_diag" like tcp_diag, > udp_diag and sctp_diag etc. > > So this patch is to rename diag.ko to tipc_diag.ko in tipc's Makefile. > > Signed-off-by: Xin Long <lucien.xin@gmail.com> > > [...] Here is the summary with links: - [net-next] tipc: rename the module name diag to tipc_diag https://git.kernel.org/netdev/net-next/c/06e6bc1b7aaf You are awesome, thank you!
diff --git a/net/tipc/Makefile b/net/tipc/Makefile index ee49a9f1dd4f..18e1636aa036 100644 --- a/net/tipc/Makefile +++ b/net/tipc/Makefile @@ -18,5 +18,5 @@ tipc-$(CONFIG_TIPC_MEDIA_IB) += ib_media.o tipc-$(CONFIG_SYSCTL) += sysctl.o tipc-$(CONFIG_TIPC_CRYPTO) += crypto.o - -obj-$(CONFIG_TIPC_DIAG) += diag.o +obj-$(CONFIG_TIPC_DIAG) += tipc_diag.o +tipc_diag-y += diag.o
It is not appropriate for TIPC to use "diag" as its diag module name while the other protocols are using "$(protoname)_diag" like tcp_diag, udp_diag and sctp_diag etc. So this patch is to rename diag.ko to tipc_diag.ko in tipc's Makefile. Signed-off-by: Xin Long <lucien.xin@gmail.com> --- net/tipc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)