ARM: meson: update with SPDX Licence identifier
cover ARM: meson: update with SPDX Licence identifier
Update the SPDX Licence identifier for the Amlogic DT and mach-meson files.
Neil Armstrong (10):
ARM: dts: meson: update with SPDX Licence identifier
ARM: dts: meson6-atv1200: update with SPDX Licence identifier
ARM: dts: meson6: update with SPDX Licence identifier
ARM: dts: meson8-minix-neo-x8: update with SPDX Licence identifier
ARM: dts: meson8: update with SPDX Licence identifier
ARM: dts: meson8b-mxq: update with SPDX Licence identifier
ARM: dts: meson8b-odroidc1: update with SPDX Licence identifier
ARM: dts: meson8b: update with SPDX Licence identifier
ARM: debug: meson.S: update with SPDX Licence identifier
ARM: mach-meson: update with SPDX Licence identifier
arch/arm/boot/dts/meson.dtsi | 44 +---------------------- arch/arm/boot/dts/meson6-atv1200.dts | 44 +---------------------- arch/arm/boot/dts/meson6.dtsi | 44 +---------------------- arch/arm/boot/dts/meson8-minix-neo-x8.dts | 39 +------------------- arch/arm/boot/dts/meson8.dtsi | 42 +--------------------- arch/arm/boot/dts/meson8b-mxq.dts | 42 +--------------------- arch/arm/boot/dts/meson8b-odroidc1.dts | 42 +--------------------- arch/arm/boot/dts/meson8b.dtsi | 42 +--------------------- arch/arm/include/debug/meson.S | 5 +-- arch/arm/mach-meson/meson.c | 12 +------ 10 files changed, 10 insertions(+), 346 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/10 ARM: dts: meson: update with SPDX Licence identifier
--- arch/arm/boot/dts/meson.dtsi | 44 +----------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-)
arch/arm/boot/dts/meson.dtsi +1 -43
@@ -1,48 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 /* * Copyright 2014 Carlo Caione <[email protected]> - * - * 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 library 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 library 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 library; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA - * - * 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. */ #include <dt-bindings/interrupt-controller/irq.h>
Signature · 1 line
2.21.0
PATCH 2/10 ARM: dts: meson6-atv1200: update with SPDX Licence identifier
In reply to Neil Armstrong--- arch/arm/boot/dts/meson6-atv1200.dts | 44 +--------------------------- 1 file changed, 1 insertion(+), 43 deletions(-)
arch/arm/boot/dts/meson6-atv1200.dts +1 -43
@@ -1,48 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 /* * Copyright 2014 Carlo Caione <[email protected]> - * - * 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 library 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 library 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 library; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA - * - * 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. */ /dts-v1/;
Signature · 1 line
2.21.0
PATCH 3/10 ARM: dts: meson6: update with SPDX Licence identifier
In reply to Neil Armstrong--- arch/arm/boot/dts/meson6.dtsi | 44 +---------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-)
arch/arm/boot/dts/meson6.dtsi +1 -43
@@ -1,48 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 /* * Copyright 2014 Carlo Caione <[email protected]> - * - * 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 library 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 library 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 library; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA - * - * 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. */ #include "meson.dtsi"
Signature · 1 line
2.21.0
Martin Blumenstingl
reviewerRe: [PATCH 03/10] ARM: dts: meson6: update with SPDX Licence identifier
Hi Neil,
arch/arm/boot/dts/meson6.dtsi line 1
Quoted 12 lines · Neil Armstrong
Signed-off-by Neil Armstrong <[email protected]>--- arch/arm/boot/dts/meson6.dtsi | 44 +---------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-)arch/arm/boot/dts/meson6.dtsi +1
-0@@ -1,48 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11
I believe this should be GPL-2.0+ OR MIT as explained in [0]
Martin
PATCH 4/10 ARM: dts: meson8-minix-neo-x8: update with SPDX Licence identifier
In reply to Neil Armstrong--- arch/arm/boot/dts/meson8-minix-neo-x8.dts | 39 +---------------------- 1 file changed, 1 insertion(+), 38 deletions(-)
arch/arm/boot/dts/meson8-minix-neo-x8.dts +1 -38
@@ -1,43 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 /* * Copyright 2014 Beniamino Galvani <[email protected]> - * - * 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 library 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 library 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. */ /dts-v1/;
Signature · 1 line
2.21.0
PATCH 5/10 ARM: dts: meson8: update with SPDX Licence identifier
In reply to Neil Armstrong--- arch/arm/boot/dts/meson8.dtsi | 42 +---------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-)
arch/arm/boot/dts/meson8.dtsi +1 -41
@@ -1,46 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 /* * Copyright 2014 Carlo Caione <[email protected]> - * - * 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 library 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 library 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/>. - * - * 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. */ #include <dt-bindings/clock/meson8b-clkc.h>
Signature · 1 line
2.21.0
Martin Blumenstingl
reviewerRe: [PATCH 05/10] ARM: dts: meson8: update with SPDX Licence identifier
Hi Neil,
arch/arm/boot/dts/meson8.dtsi line 1
Quoted 12 lines · Neil Armstrong
Signed-off-by Neil Armstrong <[email protected]>--- arch/arm/boot/dts/meson8.dtsi | 42 +---------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-)arch/arm/boot/dts/meson8.dtsi +1
-0@@ -1,46 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11
I believe this should be GPL-2.0+ OR MIT as explained in [0]
Martin
PATCH 6/10 ARM: dts: meson8b-mxq: update with SPDX Licence identifier
In reply to Neil Armstrong--- arch/arm/boot/dts/meson8b-mxq.dts | 42 +------------------------------ 1 file changed, 1 insertion(+), 41 deletions(-)
arch/arm/boot/dts/meson8b-mxq.dts +1 -41
@@ -1,47 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 /* * Copyright 2015 Endless Mobile, Inc. * Author: Carlo Caione <[email protected]> - * - * 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 library 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 library 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/>. - * - * 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. */ /dts-v1/;
Signature · 1 line
2.21.0
PATCH 7/10 ARM: dts: meson8b-odroidc1: update with SPDX Licence identifier
In reply to Neil Armstrong--- arch/arm/boot/dts/meson8b-odroidc1.dts | 42 +------------------------- 1 file changed, 1 insertion(+), 41 deletions(-)
arch/arm/boot/dts/meson8b-odroidc1.dts +1 -41
@@ -1,47 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 /* * Copyright 2015 Endless Mobile, Inc. * Author: Carlo Caione <[email protected]> - * - * 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 library 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 library 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/>. - * - * 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. */ /dts-v1/;
Signature · 1 line
2.21.0
PATCH 8/10 ARM: dts: meson8b: update with SPDX Licence identifier
In reply to Neil Armstrong--- arch/arm/boot/dts/meson8b.dtsi | 42 +--------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-)
arch/arm/boot/dts/meson8b.dtsi +1 -41
@@ -1,47 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 /* * Copyright 2015 Endless Mobile, Inc. * Author: Carlo Caione <[email protected]> - * - * 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 library 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 library 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/>. - * - * 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. */ #include <dt-bindings/clock/meson8b-clkc.h>
Signature · 1 line
2.21.0
Martin Blumenstingl
reviewerRe: [PATCH 08/10] ARM: dts: meson8b: update with SPDX Licence identifier
Hi Neil,
arch/arm/boot/dts/meson8b.dtsi line 1
Quoted 12 lines · Neil Armstrong
Signed-off-by Neil Armstrong <[email protected]>--- arch/arm/boot/dts/meson8b.dtsi | 42 +--------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-)arch/arm/boot/dts/meson8b.dtsi +1
-0@@ -1,47 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11
the GPL text below states "either version 2 of the License, or (at your option) any later version" so I believe this should be GPL-2.0+ the second license text matches the MIT license [0] better than the X11 license [1] due to the phrase "THE AUTHORS OR COPYRIGHT" (while X11 uses "THE X CONSORTIUM")
Martin
[0] https://spdx.org/licenses/MIT.html
[1] https://spdx.org/licenses/X11.html
Kevin Hilman
maintainerRe: [PATCH 08/10] ARM: dts: meson8b: update with SPDX Licence identifier
Quoted 9 lines · Martin Blumenstingl
Hi Neil,
Quoted 6 lines · Neil Armstrong
Signed-off-by Neil Armstrong <[email protected]>--- arch/arm/boot/dts/meson8b.dtsi | 42 +--------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-)
Quoted 9 lines
arch/arm/boot/dts/meson8b.dtsi line 1
Quoted 6 lines
arch/arm/boot/dts/meson8b.dtsi +1
-0@@ -1,47 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11the GPL text below states "either version 2 of the License, or (at your option) any later version" so I believe this should be GPL-2.0+
The "at your option" here is key. IMO, we should stick to the more common kernel practice of GPL-2.0 unless the original author (Carlo now Cc'd) wants to make it GPL-2.0+
Kevin
PATCH 9/10 ARM: debug: meson.S: update with SPDX Licence identifier
In reply to Neil Armstrong--- arch/arm/include/debug/meson.S | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/arm/include/debug/meson.S +1 -4
@@ -1,10 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2014 Carlo Caione * Carlo Caione <[email protected]> - * - * 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. */ #define MESON_AO_UART_WFIFO 0x0
Signature · 1 line
2.21.0
PATCH 10/10 ARM: mach-meson: update with SPDX Licence identifier
In reply to Neil Armstrong--- arch/arm/mach-meson/meson.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
arch/arm/mach-meson/meson.c +1 -11
@@ -1,16 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014 Carlo Caione <[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. -* -* 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. -* */ #include <linux/of_platform.h>
Signature · 1 line
2.21.0
Martin Blumenstingl
reviewerHi Neil,
Quoted 4 lines · Neil Armstrong
Update the SPDX Licence identifier for the Amlogic DT and mach-meson files.
Quoted 9 lines
Neil Armstrong (10):
ARM: dts: meson: update with SPDX Licence identifier
ARM: dts: meson6-atv1200: update with SPDX Licence identifier
ARM: dts: meson6: update with SPDX Licence identifier
ARM: dts: meson8-minix-neo-x8: update with SPDX Licence identifier
ARM: dts: meson8: update with SPDX Licence identifier
ARM: dts: meson8b-mxq: update with SPDX Licence identifier
ARM: dts: meson8b-odroidc1: update with SPDX Licence identifier
ARM: dts: meson8b: update with SPDX Licence identifier
please check the .dts updates with my comment on the meson8b patch because I believe there are two typos (which managed to sneak into the rest of the patches)
Martin
Quoted 16 lines · Martin Blumenstingl
Hi Neil,
Quoted 4 lines · Neil Armstrong
Update the SPDX Licence identifier for the Amlogic DT and mach-meson files.
Quoted 9 lines
Neil Armstrong (10):
ARM: dts: meson: update with SPDX Licence identifier
ARM: dts: meson6-atv1200: update with SPDX Licence identifier
ARM: dts: meson6: update with SPDX Licence identifier
ARM: dts: meson8-minix-neo-x8: update with SPDX Licence identifier
ARM: dts: meson8: update with SPDX Licence identifier
ARM: dts: meson8b-mxq: update with SPDX Licence identifier
ARM: dts: meson8b-odroidc1: update with SPDX Licence identifier
ARM: dts: meson8b: update with SPDX Licence identifier
Quoted 3 lines
please check the .dts updates with my comment on the meson8b patch because I believe there are two typos (which managed to sneak into the rest of the patches)
You are right, thanks for pointing me to the licenses texts subtleties, I was misled by the "of the GPL or the X11 license"... but looking closely clearly shows a MIT license.
Will re-spin.
Neil
Quoted 4 lines
Martin