From e6489be3470ecc1088b69a17b63a6d45d57f1c16 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 11 Jul 2022 11:29:12 -0700 Subject: [PATCH] Linux: Align MODULE_LICENSE macro text Specify the lua and zstd license text in the manor in which the kernel MODULE_LICENSE macro requires it. The now duplicate entries were merged and a comment added to make it clear what they apply to. Reviewed-by: Christian Schwarz Signed-off-by: Brian Behlendorf Closes #13641 --- module/os/linux/zfs/zfs_ioctl_os.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/module/os/linux/zfs/zfs_ioctl_os.c b/module/os/linux/zfs/zfs_ioctl_os.c index 67b864aa77..f8b4990c0e 100644 --- a/module/os/linux/zfs/zfs_ioctl_os.c +++ b/module/os/linux/zfs/zfs_ioctl_os.c @@ -369,8 +369,7 @@ MODULE_ALIAS("zcommon"); MODULE_ALIAS("zzstd"); MODULE_DESCRIPTION("ZFS"); MODULE_AUTHOR(ZFS_META_AUTHOR); -MODULE_LICENSE("Lua: MIT"); -MODULE_LICENSE("zstd: Dual BSD/GPL"); -MODULE_LICENSE("Dual BSD/GPL"); +MODULE_LICENSE("Dual MIT/GPL"); /* lua */ +MODULE_LICENSE("Dual BSD/GPL"); /* zstd / misc */ MODULE_LICENSE(ZFS_META_LICENSE); MODULE_VERSION(ZFS_META_VERSION "-" ZFS_META_RELEASE);