2020-06-16 20:02:07

by Ryder Lee

Subject: [PATCH v2 2/2] mt76: mt7615: fix different licenses in same driver

Avoid using different licenses in the same driver.

Signed-off-by: Ryder Lee <[email protected]>
---
@Sean @Lorenzo: For mt7615, I need to gather ACK from all people involved with the code.
---
drivers/net/wireless/mediatek/mt76/mt7615/Kconfig | 2 +-
drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 3 +++
drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c | 2 +-
drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c | 2 +-
4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig b/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig
index e25db1135eda..d84548d5e000 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: ISC

config MT7615_COMMON
tristate
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c
index 2e99845b9c96..39b7db871fc1 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: ISC
+/* Copyright (C) 2020 MediaTek Inc. */
+
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h>
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c b/drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c
index 19a15f353e1e..27136ff1aac9 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: ISC
/* Copyright (C) 2019 MediaTek Inc.
*
* Author: Felix Fietkau <[email protected]>
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c
index cd709fd617db..36c47500eb5b 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: ISC
/* Copyright (C) 2019 MediaTek Inc.
*
* Author: Felix Fietkau <[email protected]>
--
2.18.0

2020-06-17 03:14:56

by Sean Wang

Subject: Re: [PATCH v2 2/2] mt76: mt7615: fix different licenses in same driver

From: Sean Wang <[email protected]>

>Avoid using different licenses in the same driver.
>
>Signed-off-by: Ryder Lee <[email protected]>
>---
>@Sean @Lorenzo: For mt7615, I need to gather ACK from all people involved with the code.

I am fine with license change too.
Acked-by: Sean Wang <[email protected]>

>---
> drivers/net/wireless/mediatek/mt76/mt7615/Kconfig | 2 +-
> drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 3 +++
> drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c | 2 +-
> 4 files changed, 6 insertions(+), 3 deletions(-)