Re: [PATCH] pinctrl: nomadik: Fix SPDX tags

[Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx>]

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@xxxxxxxxxx> wrote:
> > Some files were missing the appropriate SPDX tags so
> > fixed it up.
> >
> > Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
> > ---
> >  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