| Message ID | 20190602210918.32741-1-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | 9d130f91a4cb8671a1fca3731f4427905e4c4cfc |
| Headers | show |
| Series | pinctrl: nomadik: Fix SPDX tags | expand |
Hi Linus, On Sun, Jun 2, 2019 at 11:12 PM Linus Walleij <linus.walleij@linaro.org> wrote: > Some files were missing the appropriate SPDX tags so > fixed it up. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > drivers/pinctrl/nomadik/Kconfig | 2 ++ > drivers/pinctrl/nomadik/pinctrl-ab8500.c | 5 +---- > drivers/pinctrl/nomadik/pinctrl-ab8505.c | 5 +---- > drivers/pinctrl/nomadik/pinctrl-abx500.c | 6 +----- > drivers/pinctrl/nomadik/pinctrl-nomadik.c | 5 +---- > 5 files changed, 6 insertions(+), 17 deletions(-) Please note this conflicts with commit ec8f24b7faaf3d47 ("treewide: Add SPDX license identifier - Makefile/Kconfig") upstream, which added (different) tags. > diff --git a/drivers/pinctrl/nomadik/Kconfig b/drivers/pinctrl/nomadik/Kconfig > index c3efe7d7e91f..749466fa8f97 100644 > --- a/drivers/pinctrl/nomadik/Kconfig > +++ b/drivers/pinctrl/nomadik/Kconfig > @@ -1,3 +1,5 @@ > +# SPDX-License-Identifier: GPL-2.0 > + > if ARCH_U8500 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
On Tue, Jun 04, 2019 at 10:26:06AM +0200, Geert Uytterhoeven wrote: > Hi Linus, > > On Sun, Jun 2, 2019 at 11:12 PM Linus Walleij <linus.walleij@linaro.org> wrote: > > Some files were missing the appropriate SPDX tags so > > fixed it up. > > > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > > --- > > drivers/pinctrl/nomadik/Kconfig | 2 ++ > > drivers/pinctrl/nomadik/pinctrl-ab8500.c | 5 +---- > > drivers/pinctrl/nomadik/pinctrl-ab8505.c | 5 +---- > > drivers/pinctrl/nomadik/pinctrl-abx500.c | 6 +----- > > drivers/pinctrl/nomadik/pinctrl-nomadik.c | 5 +---- > > 5 files changed, 6 insertions(+), 17 deletions(-) > > Please note this conflicts with commit ec8f24b7faaf3d47 ("treewide: Add > SPDX license identifier - Makefile/Kconfig") upstream, which added > (different) tags. > > > diff --git a/drivers/pinctrl/nomadik/Kconfig b/drivers/pinctrl/nomadik/Kconfig > > index c3efe7d7e91f..749466fa8f97 100644 > > --- a/drivers/pinctrl/nomadik/Kconfig > > +++ b/drivers/pinctrl/nomadik/Kconfig > > @@ -1,3 +1,5 @@ > > +# SPDX-License-Identifier: GPL-2.0 The tags added mean the same thing, what is there today is "GPL-2.0-only" and this "GPL-2.0" is stating the identical thing, but in a different way. So all is good for when the merge happens. thnaks, greg k-h
On Tue, Jun 4, 2019 at 10:45 AM Greg KH <gregkh@linuxfoundation.org> wrote: > On Tue, Jun 04, 2019 at 10:26:06AM +0200, Geert Uytterhoeven wrote: > > Hi Linus, > > > > On Sun, Jun 2, 2019 at 11:12 PM Linus Walleij <linus.walleij@linaro.org> wrote: > > > Some files were missing the appropriate SPDX tags so > > > fixed it up. > > > > > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > > > --- > > > drivers/pinctrl/nomadik/Kconfig | 2 ++ > > > drivers/pinctrl/nomadik/pinctrl-ab8500.c | 5 +---- > > > drivers/pinctrl/nomadik/pinctrl-ab8505.c | 5 +---- > > > drivers/pinctrl/nomadik/pinctrl-abx500.c | 6 +----- > > > drivers/pinctrl/nomadik/pinctrl-nomadik.c | 5 +---- > > > 5 files changed, 6 insertions(+), 17 deletions(-) > > > > Please note this conflicts with commit ec8f24b7faaf3d47 ("treewide: Add > > SPDX license identifier - Makefile/Kconfig") upstream, which added > > (different) tags. > > > > > diff --git a/drivers/pinctrl/nomadik/Kconfig b/drivers/pinctrl/nomadik/Kconfig > > > index c3efe7d7e91f..749466fa8f97 100644 > > > --- a/drivers/pinctrl/nomadik/Kconfig > > > +++ b/drivers/pinctrl/nomadik/Kconfig > > > @@ -1,3 +1,5 @@ > > > +# SPDX-License-Identifier: GPL-2.0 > > The tags added mean the same thing, what is there today is > "GPL-2.0-only" and this "GPL-2.0" is stating the identical thing, but in > a different way. > > So all is good for when the merge happens. I guess I could tag on "-only" to cut down the buzz and make git resolution happier. Yours, Linus Walleij
On Sat, Jun 8, 2019 at 7:18 AM Linus Walleij <linus.walleij@linaro.org> wrote: > > On Tue, Jun 4, 2019 at 10:45 AM Greg KH <gregkh@linuxfoundation.org> wrote: > > On Tue, Jun 04, 2019 at 10:26:06AM +0200, Geert Uytterhoeven wrote: > > > Hi Linus, > > > > > > On Sun, Jun 2, 2019 at 11:12 PM Linus Walleij <linus.walleij@linaro.org> wrote: > > > > Some files were missing the appropriate SPDX tags so > > > > fixed it up. > > > > > > > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > > > > --- > > > > drivers/pinctrl/nomadik/Kconfig | 2 ++ > > > > drivers/pinctrl/nomadik/pinctrl-ab8500.c | 5 +---- > > > > drivers/pinctrl/nomadik/pinctrl-ab8505.c | 5 +---- > > > > drivers/pinctrl/nomadik/pinctrl-abx500.c | 6 +----- > > > > drivers/pinctrl/nomadik/pinctrl-nomadik.c | 5 +---- > > > > 5 files changed, 6 insertions(+), 17 deletions(-) > > > > > > Please note this conflicts with commit ec8f24b7faaf3d47 ("treewide: Add > > > SPDX license identifier - Makefile/Kconfig") upstream, which added > > > (different) tags. > > > > > > > diff --git a/drivers/pinctrl/nomadik/Kconfig b/drivers/pinctrl/nomadik/Kconfig > > > > index c3efe7d7e91f..749466fa8f97 100644 > > > > --- a/drivers/pinctrl/nomadik/Kconfig > > > > +++ b/drivers/pinctrl/nomadik/Kconfig > > > > @@ -1,3 +1,5 @@ > > > > +# SPDX-License-Identifier: GPL-2.0 > > > > The tags added mean the same thing, what is there today is > > "GPL-2.0-only" and this "GPL-2.0" is stating the identical thing, but in > > a different way. > > > > So all is good for when the merge happens. > > I guess I could tag on "-only" to cut down the buzz and make git > resolution happier. You do not need to apply this patch. No sense to add the equivalent changes via different trees. -- Best Regards Masahiro Yamada
On Sun, Jun 9, 2019 at 4:30 PM Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > On Sat, Jun 8, 2019 at 7:18 AM Linus Walleij <linus.walleij@linaro.org> wrote: > > I guess I could tag on "-only" to cut down the buzz and make git > > resolution happier. > > You do not need to apply this patch. > No sense to add the equivalent changes via different trees. Hm good point, I should have looked closer to see if the same things were identical in both patches :/ Right now I can't rebase the tree since I pulled in development from submaintainers. But it's impossible to avoid stepping on each others toes when we do treewide changes so let's try to just live with the result that sometimes two patches contest about the same changes. Yours, Linus Walleij
diff --git a/drivers/pinctrl/nomadik/Kconfig b/drivers/pinctrl/nomadik/Kconfig index c3efe7d7e91f..749466fa8f97 100644 --- a/drivers/pinctrl/nomadik/Kconfig +++ b/drivers/pinctrl/nomadik/Kconfig @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + if ARCH_U8500 config PINCTRL_ABX500 diff --git a/drivers/pinctrl/nomadik/pinctrl-ab8500.c b/drivers/pinctrl/nomadik/pinctrl-ab8500.c index 0723627c7bc2..84ffbeea196c 100644 --- a/drivers/pinctrl/nomadik/pinctrl-ab8500.c +++ b/drivers/pinctrl/nomadik/pinctrl-ab8500.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) ST-Ericsson SA 2012 * * Author: Patrice Chotard <patrice.chotard@stericsson.com> for ST-Ericsson. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include <linux/kernel.h> diff --git a/drivers/pinctrl/nomadik/pinctrl-ab8505.c b/drivers/pinctrl/nomadik/pinctrl-ab8505.c index 2683509c1410..ce973bbbf68e 100644 --- a/drivers/pinctrl/nomadik/pinctrl-ab8505.c +++ b/drivers/pinctrl/nomadik/pinctrl-ab8505.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) ST-Ericsson SA 2012 * * Author: Patrice Chotard <patrice.chotard@stericsson.com> for ST-Ericsson. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include <linux/kernel.h> diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c index 3d630a0544e1..048fb5507490 100644 --- a/drivers/pinctrl/nomadik/pinctrl-abx500.c +++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c @@ -1,14 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) ST-Ericsson SA 2013 * * Author: Patrice Chotard <patrice.chotard@st.com> - * License terms: GNU General Public License (GPL) version 2 * * Driver allows to use AxB5xx unused pins to be used as GPIO - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include <linux/kernel.h> #include <linux/types.h> diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c index ec02739bd21b..4ff7503867e6 100644 --- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Generic GPIO driver for logic cells found in the Nomadik SoC * @@ -5,10 +6,6 @@ * Copyright (C) 2009 Alessandro Rubini <rubini@unipv.it> * Rewritten based on work by Prafulla WADASKAR <prafulla.wadaskar@st.com> * Copyright (C) 2011-2013 Linus Walleij <linus.walleij@linaro.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include <linux/kernel.h> #include <linux/init.h>
Some files were missing the appropriate SPDX tags so fixed it up. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/pinctrl/nomadik/Kconfig | 2 ++ drivers/pinctrl/nomadik/pinctrl-ab8500.c | 5 +---- drivers/pinctrl/nomadik/pinctrl-ab8505.c | 5 +---- drivers/pinctrl/nomadik/pinctrl-abx500.c | 6 +----- drivers/pinctrl/nomadik/pinctrl-nomadik.c | 5 +---- 5 files changed, 6 insertions(+), 17 deletions(-) -- 2.20.1