* [PATCH 0/2] mmc: meson: update with SPDX Licence identifier
@ 2019-05-20 14:36 Neil Armstrong
2019-05-20 14:36 ` [PATCH 1/2] mmc: meson-gx-mmc: " Neil Armstrong
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Neil Armstrong @ 2019-05-20 14:36 UTC (permalink / raw)
To: ulf.hansson
Cc: linux-amlogic, linux-mmc, linux-kernel, linux-arm-kernel, 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(-)
--
2.21.0
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/2] mmc: meson-gx-mmc: update with SPDX Licence identifier 2019-05-20 14:36 [PATCH 0/2] mmc: meson: update with SPDX Licence identifier Neil Armstrong @ 2019-05-20 14:36 ` Neil Armstrong 2019-05-21 20:12 ` Kevin Hilman 2019-05-20 14:36 ` [PATCH 2/2] mmc: meson-mx-sdio: " Neil Armstrong 2019-05-28 8:53 ` [PATCH 0/2] mmc: meson: " Ulf Hansson 2 siblings, 1 reply; 11+ messages in thread From: Neil Armstrong @ 2019-05-20 14:36 UTC (permalink / raw) To: ulf.hansson Cc: linux-amlogic, linux-mmc, linux-kernel, linux-arm-kernel, Neil Armstrong Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/mmc/host/meson-gx-mmc.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index c5a8af4ca76b..e27e272b54d5 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -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 <khilman@baylibre.com> - * - * 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> -- 2.21.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] mmc: meson-gx-mmc: update with SPDX Licence identifier 2019-05-20 14:36 ` [PATCH 1/2] mmc: meson-gx-mmc: " Neil Armstrong @ 2019-05-21 20:12 ` Kevin Hilman 0 siblings, 0 replies; 11+ messages in thread From: Kevin Hilman @ 2019-05-21 20:12 UTC (permalink / raw) To: Neil Armstrong, ulf.hansson Cc: linux-amlogic, linux-mmc, linux-kernel, linux-arm-kernel, Neil Armstrong Neil Armstrong <narmstrong@baylibre.com> writes: > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Acked-by: Kevin Hilman <khilman@baylibre.com> _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/2] mmc: meson-mx-sdio: update with SPDX Licence identifier 2019-05-20 14:36 [PATCH 0/2] mmc: meson: update with SPDX Licence identifier Neil Armstrong 2019-05-20 14:36 ` [PATCH 1/2] mmc: meson-gx-mmc: " Neil Armstrong @ 2019-05-20 14:36 ` Neil Armstrong 2019-05-20 17:56 ` Martin Blumenstingl 2019-05-21 20:12 ` Kevin Hilman 2019-05-28 8:53 ` [PATCH 0/2] mmc: meson: " Ulf Hansson 2 siblings, 2 replies; 11+ messages in thread From: Neil Armstrong @ 2019-05-20 14:36 UTC (permalink / raw) To: ulf.hansson Cc: linux-amlogic, linux-mmc, linux-kernel, linux-arm-kernel, Neil Armstrong Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/mmc/host/meson-mx-sdio.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/mmc/host/meson-mx-sdio.c b/drivers/mmc/host/meson-mx-sdio.c index b61de360f26f..b2a7288cdec8 100644 --- a/drivers/mmc/host/meson-mx-sdio.c +++ b/drivers/mmc/host/meson-mx-sdio.c @@ -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 <carlo@endlessm.com> * Copyright (C) 2017 Martin Blumenstingl <martin.blumenstingl@googlemail.com> - * - * 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> -- 2.21.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] mmc: meson-mx-sdio: update with SPDX Licence identifier 2019-05-20 14:36 ` [PATCH 2/2] mmc: meson-mx-sdio: " Neil Armstrong @ 2019-05-20 17:56 ` Martin Blumenstingl 2019-05-21 20:12 ` Kevin Hilman 1 sibling, 0 replies; 11+ messages in thread From: Martin Blumenstingl @ 2019-05-20 17:56 UTC (permalink / raw) To: Neil Armstrong Cc: linux-amlogic, ulf.hansson, linux-mmc, linux-kernel, linux-arm-kernel On Mon, May 20, 2019 at 4:37 PM Neil Armstrong <narmstrong@baylibre.com> wrote: > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] mmc: meson-mx-sdio: update with SPDX Licence identifier 2019-05-20 14:36 ` [PATCH 2/2] mmc: meson-mx-sdio: " Neil Armstrong 2019-05-20 17:56 ` Martin Blumenstingl @ 2019-05-21 20:12 ` Kevin Hilman 1 sibling, 0 replies; 11+ messages in thread From: Kevin Hilman @ 2019-05-21 20:12 UTC (permalink / raw) To: Neil Armstrong, ulf.hansson Cc: linux-amlogic, linux-mmc, linux-kernel, linux-arm-kernel, Neil Armstrong Neil Armstrong <narmstrong@baylibre.com> writes: > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Acked-by: Kevin Hilman <khilman@baylibre.com> _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] mmc: meson: update with SPDX Licence identifier 2019-05-20 14:36 [PATCH 0/2] mmc: meson: update with SPDX Licence identifier Neil Armstrong 2019-05-20 14:36 ` [PATCH 1/2] mmc: meson-gx-mmc: " Neil Armstrong 2019-05-20 14:36 ` [PATCH 2/2] mmc: meson-mx-sdio: " Neil Armstrong @ 2019-05-28 8:53 ` Ulf Hansson 2019-06-04 8:36 ` Geert Uytterhoeven 2 siblings, 1 reply; 11+ messages in thread From: Ulf Hansson @ 2019-05-28 8:53 UTC (permalink / raw) To: Neil Armstrong Cc: open list:ARM/Amlogic Meson..., linux-mmc, Linux Kernel Mailing List, Linux ARM On Mon, 20 May 2019 at 16:36, Neil Armstrong <narmstrong@baylibre.com> wrote: > > 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 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] mmc: meson: update with SPDX Licence identifier 2019-05-28 8:53 ` [PATCH 0/2] mmc: meson: " Ulf Hansson @ 2019-06-04 8:36 ` Geert Uytterhoeven 2019-06-04 8:52 ` Neil Armstrong 0 siblings, 1 reply; 11+ messages in thread From: Geert Uytterhoeven @ 2019-06-04 8:36 UTC (permalink / raw) To: Ulf Hansson Cc: Neil Armstrong, Greg KH, linux-mmc, Linux Kernel Mailing List, open list:ARM/Amlogic Meson..., Thomas Gleixner, Linux ARM Hi Ulf, Neil, On Tue, May 28, 2019 at 10:53 AM Ulf Hansson <ulf.hansson@linaro.org> wrote: > On Mon, 20 May 2019 at 16:36, Neil Armstrong <narmstrong@baylibre.com> wrote: > > 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! 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 -- geert@linux-m68k.org 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 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] mmc: meson: update with SPDX Licence identifier 2019-06-04 8:36 ` Geert Uytterhoeven @ 2019-06-04 8:52 ` Neil Armstrong 2019-06-04 9:00 ` Greg KH 0 siblings, 1 reply; 11+ messages in thread From: Neil Armstrong @ 2019-06-04 8:52 UTC (permalink / raw) To: Geert Uytterhoeven, Ulf Hansson Cc: Greg KH, linux-mmc, Linux Kernel Mailing List, open list:ARM/Amlogic Meson..., Thomas Gleixner, Linux ARM Hi, On 04/06/2019 10:36, Geert Uytterhoeven wrote: > Hi Ulf, Neil, > > On Tue, May 28, 2019 at 10:53 AM Ulf Hansson <ulf.hansson@linaro.org> wrote: >> On Mon, 20 May 2019 at 16:36, Neil Armstrong <narmstrong@baylibre.com> wrote: >>> 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! > > 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 > > Gr{oetje,eeting}s, > > Geert > > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > 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 > _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] mmc: meson: update with SPDX Licence identifier 2019-06-04 8:52 ` Neil Armstrong @ 2019-06-04 9:00 ` Greg KH 2019-06-04 10:10 ` Ulf Hansson 0 siblings, 1 reply; 11+ messages in thread From: Greg KH @ 2019-06-04 9:00 UTC (permalink / raw) To: Neil Armstrong Cc: Ulf Hansson, linux-mmc, Linux Kernel Mailing List, Geert Uytterhoeven, open list:ARM/Amlogic Meson..., Thomas Gleixner, Linux ARM On Tue, Jun 04, 2019 at 10:52:51AM +0200, Neil Armstrong wrote: > Hi, > > > On 04/06/2019 10:36, Geert Uytterhoeven wrote: > > Hi Ulf, Neil, > > > > On Tue, May 28, 2019 at 10:53 AM Ulf Hansson <ulf.hansson@linaro.org> wrote: > >> On Mon, 20 May 2019 at 16:36, Neil Armstrong <narmstrong@baylibre.com> wrote: > >>> 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! > > > > 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 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] mmc: meson: update with SPDX Licence identifier 2019-06-04 9:00 ` Greg KH @ 2019-06-04 10:10 ` Ulf Hansson 0 siblings, 0 replies; 11+ messages in thread From: Ulf Hansson @ 2019-06-04 10:10 UTC (permalink / raw) To: Greg KH, Geert Uytterhoeven Cc: Neil Armstrong, linux-mmc, Linux Kernel Mailing List, open list:ARM/Amlogic Meson..., Thomas Gleixner, Linux ARM On Tue, 4 Jun 2019 at 11:00, Greg KH <gregkh@linuxfoundation.org> wrote: > > On Tue, Jun 04, 2019 at 10:52:51AM +0200, Neil Armstrong wrote: > > Hi, > > > > > > On 04/06/2019 10:36, Geert Uytterhoeven wrote: > > > Hi Ulf, Neil, > > > > > > On Tue, May 28, 2019 at 10:53 AM Ulf Hansson <ulf.hansson@linaro.org> wrote: > > >> On Mon, 20 May 2019 at 16:36, Neil Armstrong <narmstrong@baylibre.com> wrote: > > >>> 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! > > > > > > 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 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-06-04 10:11 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-05-20 14:36 [PATCH 0/2] mmc: meson: update with SPDX Licence identifier Neil Armstrong 2019-05-20 14:36 ` [PATCH 1/2] mmc: meson-gx-mmc: " Neil Armstrong 2019-05-21 20:12 ` Kevin Hilman 2019-05-20 14:36 ` [PATCH 2/2] mmc: meson-mx-sdio: " Neil Armstrong 2019-05-20 17:56 ` Martin Blumenstingl 2019-05-21 20:12 ` Kevin Hilman 2019-05-28 8:53 ` [PATCH 0/2] mmc: meson: " Ulf Hansson 2019-06-04 8:36 ` Geert Uytterhoeven 2019-06-04 8:52 ` Neil Armstrong 2019-06-04 9:00 ` Greg KH 2019-06-04 10:10 ` Ulf Hansson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).