Message ID | 20180504100324.31847-1-zajec5@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 05/04/2018 12:03 PM, Rafał Miłecki wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > This matches licensing used by other BCM5301X files and is preferred as: > 1) GPL 2.0+ makes is clearly compatible with Linux kernel > 2) MIT is also permissive but preferred over ISC > > This file were created and ever touched by a group of three people only: > Álvaro, Hauke and me. > > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Acked-by: Hauke Mehrtens <hauke@hauke-m.de> > --- > Álvaro, Hauke: I need approve for this change from each of you. If you > are OK with it, can you reply with an Acked-by, please? > --- > arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) > > diff --git a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts > index df473cc41572..22271818f901 100644 > --- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts > +++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts > @@ -1,20 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT > /* > * Broadcom BCM470X / BCM5301X ARM platform code. > * DTS for Asus RT-AC87U > * > * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com> > - * > - * Permission to use, copy, modify, and/or distribute this software for any > - * purpose with or without fee is hereby granted, provided that the above > - * copyright notice and this permission notice appear in all copies. > - * > - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH > - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY > - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, > - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM > - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE > - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR > - * PERFORMANCE OF THIS SOFTWARE. > */ > > /dts-v1/; >
On 05/04/2018 03:03 AM, Rafał Miłecki wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > This matches licensing used by other BCM5301X files and is preferred as: > 1) GPL 2.0+ makes is clearly compatible with Linux kernel > 2) MIT is also permissive but preferred over ISC > > This file were created and ever touched by a group of three people only: > Álvaro, Hauke and me. Alvaro, please Ack/Nack the license change. Thank you > > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> > --- > Álvaro, Hauke: I need approve for this change from each of you. If you > are OK with it, can you reply with an Acked-by, please? > --- > arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) > > diff --git a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts > index df473cc41572..22271818f901 100644 > --- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts > +++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts > @@ -1,20 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT > /* > * Broadcom BCM470X / BCM5301X ARM platform code. > * DTS for Asus RT-AC87U > * > * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com> > - * > - * Permission to use, copy, modify, and/or distribute this software for any > - * purpose with or without fee is hereby granted, provided that the above > - * copyright notice and this permission notice appear in all copies. > - * > - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH > - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY > - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, > - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM > - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE > - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR > - * PERFORMANCE OF THIS SOFTWARE. > */ > > /dts-v1/; >
Sorry for the delay. Acked-by: Álvaro Fernández Rojas <noltari@gmail.com> El 09/05/2018 a las 21:19, Florian Fainelli escribió: > On 05/04/2018 03:03 AM, Rafał Miłecki wrote: >> From: Rafał Miłecki <rafal@milecki.pl> >> >> This matches licensing used by other BCM5301X files and is preferred as: >> 1) GPL 2.0+ makes is clearly compatible with Linux kernel >> 2) MIT is also permissive but preferred over ISC >> >> This file were created and ever touched by a group of three people only: >> Álvaro, Hauke and me. > Alvaro, please Ack/Nack the license change. Thank you > >> Signed-off-by: Rafał Miłecki <rafal@milecki.pl> >> --- >> Álvaro, Hauke: I need approve for this change from each of you. If you >> are OK with it, can you reply with an Acked-by, please? >> --- >> arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 13 +------------ >> 1 file changed, 1 insertion(+), 12 deletions(-) >> >> diff --git a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts >> index df473cc41572..22271818f901 100644 >> --- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts >> +++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts >> @@ -1,20 +1,9 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT >> /* >> * Broadcom BCM470X / BCM5301X ARM platform code. >> * DTS for Asus RT-AC87U >> * >> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com> >> - * >> - * Permission to use, copy, modify, and/or distribute this software for any >> - * purpose with or without fee is hereby granted, provided that the above >> - * copyright notice and this permission notice appear in all copies. >> - * >> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH >> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY >> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, >> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM >> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE >> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR >> - * PERFORMANCE OF THIS SOFTWARE. >> */ >> >> /dts-v1/; >> >
On Fri, 4 May 2018 12:03:24 +0200, Rafał Miłecki <zajec5@gmail.com> wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > This matches licensing used by other BCM5301X files and is preferred as: > 1) GPL 2.0+ makes is clearly compatible with Linux kernel > 2) MIT is also permissive but preferred over ISC > > This file were created and ever touched by a group of three people only: > Álvaro, Hauke and me. > > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> > --- Applied to devicetree/next, thanks! -- Florian
diff --git a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts index df473cc41572..22271818f901 100644 --- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts +++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts @@ -1,20 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Broadcom BCM470X / BCM5301X ARM platform code. * DTS for Asus RT-AC87U * * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com> - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. */ /dts-v1/;