Re: [PATCH v1 2/7] arm: dts: qcom: mdm9615*: add SPDX-License-Identifier

[Neil Armstrong]

On 28/09/2022 19:55, Krzysztof Kozlowski wrote:
> On 28/09/2022 11:14, Neil Armstrong wrote:
> > Replace the licence blob by a clean SPDX-License-Identifier
> >
> > Signed-off-by: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
>
>
> Rebase on linux-next - you use old Bjorn's email address.


Yep sorry, my first submission from Linaro... I added Bjorn's new email (+mine) in my local mailmap so it won't happen anymore.

> > diff --git a/arch/arm/boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts b/arch/arm/boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts
> > index 0827de5426c1..073c15354483 100644
> > --- a/arch/arm/boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts
> > +++ b/arch/arm/boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts
> > @@ -1,46 +1,9 @@
> > +// SPDX-License-Identifier: GPL-2.0+ OR X11
> >   /*
> >    * Device Tree Source for mangOH Green Board with WP8548 Module
> >    *
> >    * Copyright (C) 2016 BayLibre, SAS.
> >    * Author : Neil Armstrong <narmstrong@xxxxxxxxxxxx>
> > - *
> > - * This file is dual-licensed: you can use it either under the terms
> > - * of the GPL or the X11 license, at your option. Note that this dual
> > - * licensing only applies to this file, and not this project as a
> > - * whole.
> > - *
> > - *  a) This file 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.
> > - *
> > - *     This file 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.
> > - *
> > - * Or, alternatively,
> > - *
> > - *  b) Permission is hereby granted, free of charge, to any person
> > - *     obtaining a copy of this software and associated documentation
> > - *     files (the "Software"), to deal in the Software without
> > - *     restriction, including without limitation the rights to use,
> > - *     copy, modify, merge, publish, distribute, sublicense, and/or
> > - *     sell copies of the Software, and to permit persons to whom the
> > - *     Software is furnished to do so, subject to the following
> > - *     conditions:
> > - *
> > - *     The above copyright notice and this permission notice shall be
> > - *     included in all copies or substantial portions of the Software.
> > - *
> > - *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> > - *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> > - *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> > - *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> > - *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> > - *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> > - *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> > - *     OTHER DEALINGS IN THE SOFTWARE.
>
> The text is actually MIT, not X11. I think they differ by last X11
> trademark statement.

You're right, I checked the amlogic DT SPDX migration that used the same licence blob [1],
and we switched to SPDX-License-Identifier: (GPL-2.0+ OR MIT).

> Best regards,
> Krzysztof

[1] 114abfe1aa5f ("ARM64: dts: amlogic: Convert to new-style SPDX license identifiers")

Thanks,
Neil