Skip to contentSkip to conversation

mmc: meson: update with SPDX Licence identifier

PATCH In review Neil Armstrong 6 participants 11 messages May 20, 2019 – Jun 4, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover mmc: meson: update with SPDX Licence identifier

Update the SPDX Licence identifier for the Amlogic MMC drivers.

Neil Armstrong (2):
mmc: meson-gx-mmc: update with SPDX Licence identifier
mmc: meson-mx-sdio: update with SPDX Licence identifier

 drivers/mmc/host/meson-gx-mmc.c  | 15 +--------------
 drivers/mmc/host/meson-mx-sdio.c |  6 +-----
 2 files changed, 2 insertions(+), 19 deletions(-)
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/2 mmc: meson-gx-mmc: update with SPDX Licence identifier

---
 drivers/mmc/host/meson-gx-mmc.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)
drivers/mmc/host/meson-gx-mmc.c +1 -14
index c5a8af4ca76b..e27e272b54d5 100644
@@ -1,22 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Amlogic SD/eMMC driver for the GX/S905 family SoCs
  *
  * Copyright (c) 2016 BayLibre, SAS.
  * Author: Kevin Hilman <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- * The full GNU General Public License is included in this distribution
- * in the file called COPYING.
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
Signature · 1 line
2.21.0
#3 lore raw

PATCH 2/2 mmc: meson-mx-sdio: update with SPDX Licence identifier

In reply to Neil Armstrong
---
 drivers/mmc/host/meson-mx-sdio.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/mmc/host/meson-mx-sdio.c +1 -5
index b61de360f26f..b2a7288cdec8 100644
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * meson-mx-sdio.c - Meson6, Meson8 and Meson8b SDIO/MMC Host Controller
  *
  * Copyright (C) 2015 Endless Mobile, Inc.
  * Author: Carlo Caione <[email protected]>
  * Copyright (C) 2017 Martin Blumenstingl <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
  */
 
 #include <linux/bitfield.h>
Signature · 1 line
2.21.0
#6 lore raw
In reply to Neil Armstrong
Quoted 10 lines · Neil Armstrong

Update the SPDX Licence identifier for the Amlogic MMC drivers.

Neil Armstrong (2):
mmc: meson-gx-mmc: update with SPDX Licence identifier
mmc: meson-mx-sdio: update with SPDX Licence identifier

 drivers/mmc/host/meson-gx-mmc.c  | 15 +--------------
 drivers/mmc/host/meson-mx-sdio.c |  6 +-----
 2 files changed, 2 insertions(+), 19 deletions(-)

Applied for next, thanks!

Kind regards
Uffe

#7 lore raw

Hi Ulf, Neil,

Quoted 7 lines · Ulf Hansson
Quoted 6 lines · Neil Armstrong

Update the SPDX Licence identifier for the Amlogic MMC drivers.

Neil Armstrong (2):
mmc: meson-gx-mmc: update with SPDX Licence identifier
mmc: meson-mx-sdio: update with SPDX Licence identifier

Quoted 5 lines
Quoted 3 lines
 drivers/mmc/host/meson-gx-mmc.c  | 15 +--------------
 drivers/mmc/host/meson-mx-sdio.c |  6 +-----
 2 files changed, 2 insertions(+), 19 deletions(-)

Applied for next, thanks!

Please note this conflicts with commit 2874c5fd28426836 ("treewide:
Replace GPLv2 boilerplate/reference with SPDX - rule 152") upstream, which added (different) tags.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#8 lore raw

Hi,

Quoted 14 lines · Geert Uytterhoeven

Hi Ulf, Neil,

Quoted 11 lines · Ulf Hansson
Quoted 9 lines · Neil Armstrong

Update the SPDX Licence identifier for the Amlogic MMC drivers.

Neil Armstrong (2):
mmc: meson-gx-mmc: update with SPDX Licence identifier
mmc: meson-mx-sdio: update with SPDX Licence identifier

 drivers/mmc/host/meson-gx-mmc.c  | 15 +--------------
 drivers/mmc/host/meson-mx-sdio.c |  6 +-----
 2 files changed, 2 insertions(+), 19 deletions(-)
Quoted 5 lines
Quoted 1 line

Applied for next, thanks!

Please note this conflicts with commit 2874c5fd28426836 ("treewide:
Replace GPLv2 boilerplate/reference with SPDX - rule 152") upstream, which added (different) tags.

This happens when we are not CCed with such changes.

Neil

Quoted 13 lines

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#9 lore raw
Quoted 18 lines · Neil Armstrong

Hi,

Quoted 14 lines · Geert Uytterhoeven

Hi Ulf, Neil,

Quoted 11 lines · Ulf Hansson
Quoted 9 lines · Neil Armstrong

Update the SPDX Licence identifier for the Amlogic MMC drivers.

Neil Armstrong (2):
mmc: meson-gx-mmc: update with SPDX Licence identifier
mmc: meson-mx-sdio: update with SPDX Licence identifier

 drivers/mmc/host/meson-gx-mmc.c  | 15 +--------------
 drivers/mmc/host/meson-mx-sdio.c |  6 +-----
 2 files changed, 2 insertions(+), 19 deletions(-)
Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Applied for next, thanks!

Please note this conflicts with commit 2874c5fd28426836 ("treewide:
Replace GPLv2 boilerplate/reference with SPDX - rule 152") upstream, which added (different) tags.

This happens when we are not CCed with such changes.

No one was cc:ed on such huge changes. The merge conflicts are trivial to work out, this should not be an issue.

thanks,

greg k-h

#10 lore raw
Quoted 22 lines · Greg KH
Quoted 20 lines · Neil Armstrong

Hi,

Quoted 16 lines · Geert Uytterhoeven

Hi Ulf, Neil,

Quoted 12 lines · Ulf Hansson
Quoted 9 lines · Neil Armstrong

Update the SPDX Licence identifier for the Amlogic MMC drivers.

Neil Armstrong (2):
mmc: meson-gx-mmc: update with SPDX Licence identifier
mmc: meson-mx-sdio: update with SPDX Licence identifier

 drivers/mmc/host/meson-gx-mmc.c  | 15 +--------------
 drivers/mmc/host/meson-mx-sdio.c |  6 +-----
 2 files changed, 2 insertions(+), 19 deletions(-)

Applied for next, thanks!

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

Please note this conflicts with commit 2874c5fd28426836 ("treewide:
Replace GPLv2 boilerplate/reference with SPDX - rule 152") upstream, which added (different) tags.

This happens when we are not CCed with such changes.

No one was cc:ed on such huge changes. The merge conflicts are trivial to work out, this should not be an issue.

No worries, I deal with it as I am going to rebase my tree on rc4 on Monday anyway.

Thanks for the heads up!

Kind regards
Uffe