[PATCH] headers: Remove some left-over license text in include/uapi/linux/hsi/

[PATCH] headers: Remove some left-over license text in include/uapi/linux/hsi/

[Christophe JAILLET]

Remove some left-over from commit e2be04c7f995 ("License cleanup: add SPDX
license identifier to uapi header files with a license")

When the SPDX-License-Identifier tag has been added, the corresponding
license text has not been removed.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 include/uapi/linux/hsi/cs-protocol.h | 14 --------------
 include/uapi/linux/hsi/hsi_char.h    | 14 --------------
 2 files changed, 28 deletions(-)

diff --git a/include/uapi/linux/hsi/cs-protocol.h b/include/uapi/linux/hsi/cs-protocol.h
index c7f6e7672cb5..07c3bfb67463 100644
--- a/include/uapi/linux/hsi/cs-protocol.h
+++ b/include/uapi/linux/hsi/cs-protocol.h
@@ -6,20 +6,6 @@
  *
  * Contact: Kai Vehmanen <kai.vehmanen@nokia.com>
  * Original author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
- *
- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
  */
 
 #ifndef _CS_PROTOCOL_H
diff --git a/include/uapi/linux/hsi/hsi_char.h b/include/uapi/linux/hsi/hsi_char.h
index 91623b0398b1..5ef72f0daf94 100644
--- a/include/uapi/linux/hsi/hsi_char.h
+++ b/include/uapi/linux/hsi/hsi_char.h
@@ -5,20 +5,6 @@
  * Copyright (C) 2010 Nokia Corporation. All rights reserved.
  *
  * Contact: Andras Domokos <andras.domokos at nokia.com>
- *
- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
  */
 
 #ifndef __HSI_CHAR_H
-- 
2.34.1

Re: [PATCH] headers: Remove some left-over license text in include/uapi/linux/hsi/

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 3072 bytes --]

Hi,

On Sun, Sep 11, 2022 at 01:56:59PM +0200, Christophe JAILLET wrote:
> Remove some left-over from commit e2be04c7f995 ("License cleanup: add SPDX
> license identifier to uapi header files with a license")
> 
> When the SPDX-License-Identifier tag has been added, the corresponding
> license text has not been removed.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---

IIRC that was intentional, since the plan was to seek for an
explicit Ack from the copyright holder when removing the text.
I've added Greg for clarification and hopefully the latest
mail address from Kai and Peter.

-- Sebastian

>  include/uapi/linux/hsi/cs-protocol.h | 14 --------------
>  include/uapi/linux/hsi/hsi_char.h    | 14 --------------
>  2 files changed, 28 deletions(-)
> 
> diff --git a/include/uapi/linux/hsi/cs-protocol.h b/include/uapi/linux/hsi/cs-protocol.h
> index c7f6e7672cb5..07c3bfb67463 100644
> --- a/include/uapi/linux/hsi/cs-protocol.h
> +++ b/include/uapi/linux/hsi/cs-protocol.h
> @@ -6,20 +6,6 @@
>   *
>   * Contact: Kai Vehmanen <kai.vehmanen@nokia.com>
>   * Original author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
> - *
> - * 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.
> - *
> - * 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.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
> - * 02110-1301 USA
>   */
>  
>  #ifndef _CS_PROTOCOL_H
> diff --git a/include/uapi/linux/hsi/hsi_char.h b/include/uapi/linux/hsi/hsi_char.h
> index 91623b0398b1..5ef72f0daf94 100644
> --- a/include/uapi/linux/hsi/hsi_char.h
> +++ b/include/uapi/linux/hsi/hsi_char.h
> @@ -5,20 +5,6 @@
>   * Copyright (C) 2010 Nokia Corporation. All rights reserved.
>   *
>   * Contact: Andras Domokos <andras.domokos at nokia.com>
> - *
> - * 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.
> - *
> - * 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.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
> - * 02110-1301 USA
>   */
>  
>  #ifndef __HSI_CHAR_H
> -- 
> 2.34.1
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] headers: Remove some left-over license text in include/uapi/linux/hsi/

[Greg Kroah-Hartman]

On Mon, Nov 14, 2022 at 10:01:55PM +0100, Sebastian Reichel wrote:
> Hi,
> 
> On Sun, Sep 11, 2022 at 01:56:59PM +0200, Christophe JAILLET wrote:
> > Remove some left-over from commit e2be04c7f995 ("License cleanup: add SPDX
> > license identifier to uapi header files with a license")
> > 
> > When the SPDX-License-Identifier tag has been added, the corresponding
> > license text has not been removed.
> > 
> > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> > ---
> 
> IIRC that was intentional, since the plan was to seek for an
> explicit Ack from the copyright holder when removing the text.

Did that ever happen?

> I've added Greg for clarification and hopefully the latest
> mail address from Kai and Peter.

It's fine to remove license "boilerplate" text like this, especially
when it is wrong (hint, is the FSF's address correct?).

thanks,

greg k-h

Re: [PATCH] headers: Remove some left-over license text in include/uapi/linux/hsi/

[Péter Ujfalusi]

Hi,

On 14/11/2022 23:01, Sebastian Reichel wrote:
> Hi,
> 
> On Sun, Sep 11, 2022 at 01:56:59PM +0200, Christophe JAILLET wrote:
>> Remove some left-over from commit e2be04c7f995 ("License cleanup: add SPDX
>> license identifier to uapi header files with a license")
>>
>> When the SPDX-License-Identifier tag has been added, the corresponding
>> license text has not been removed.
>>
>> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
>> ---
> 
> IIRC that was intentional, since the plan was to seek for an
> explicit Ack from the copyright holder when removing the text.
> I've added Greg for clarification and hopefully the latest
> mail address from Kai and Peter.

I'm fine with the removal of the boilerplate text, SPDX is covering that.

I would appreciate if you pick my personal ack for this:

Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>

> 
> -- Sebastian
> 
>>  include/uapi/linux/hsi/cs-protocol.h | 14 --------------
>>  include/uapi/linux/hsi/hsi_char.h    | 14 --------------
>>  2 files changed, 28 deletions(-)
>>
>> diff --git a/include/uapi/linux/hsi/cs-protocol.h b/include/uapi/linux/hsi/cs-protocol.h
>> index c7f6e7672cb5..07c3bfb67463 100644
>> --- a/include/uapi/linux/hsi/cs-protocol.h
>> +++ b/include/uapi/linux/hsi/cs-protocol.h
>> @@ -6,20 +6,6 @@
>>   *
>>   * Contact: Kai Vehmanen <kai.vehmanen@nokia.com>

I don't think Kai's nokia.com mail address is valid as a contact
information...

>>   * Original author: Peter Ujfalusi <peter.ujfalusi@nokia.com>



>> - *
>> - * 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.
>> - *
>> - * 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.
>> - *
>> - * You should have received a copy of the GNU General Public License
>> - * along with this program; if not, write to the Free Software
>> - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
>> - * 02110-1301 USA
>>   */
>>  
>>  #ifndef _CS_PROTOCOL_H
>> diff --git a/include/uapi/linux/hsi/hsi_char.h b/include/uapi/linux/hsi/hsi_char.h
>> index 91623b0398b1..5ef72f0daf94 100644
>> --- a/include/uapi/linux/hsi/hsi_char.h
>> +++ b/include/uapi/linux/hsi/hsi_char.h
>> @@ -5,20 +5,6 @@
>>   * Copyright (C) 2010 Nokia Corporation. All rights reserved.
>>   *
>>   * Contact: Andras Domokos <andras.domokos at nokia.com>
>> - *
>> - * 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.
>> - *
>> - * 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.
>> - *
>> - * You should have received a copy of the GNU General Public License
>> - * along with this program; if not, write to the Free Software
>> - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
>> - * 02110-1301 USA
>>   */
>>  
>>  #ifndef __HSI_CHAR_H
>> -- 
>> 2.34.1
>>

-- 
Péter

Re: [PATCH] headers: Remove some left-over license text in include/uapi/linux/hsi/

[Kai Vehmanen]

Hi,

On Mon, 14 Nov 2022, Sebastian Reichel wrote:

> On Sun, Sep 11, 2022 at 01:56:59PM +0200, Christophe JAILLET wrote:
> > Remove some left-over from commit e2be04c7f995 ("License cleanup: add SPDX
> > license identifier to uapi header files with a license")
> > 
> > When the SPDX-License-Identifier tag has been added, the corresponding
> > license text has not been removed.
> > 
> > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> > ---
> 
> IIRC that was intentional, since the plan was to seek for an
> explicit Ack from the copyright holder when removing the text.
> I've added Greg for clarification and hopefully the latest
> mail address from Kai and Peter.
[...]
> > --- a/include/uapi/linux/hsi/cs-protocol.h
> > +++ b/include/uapi/linux/hsi/cs-protocol.h
> > @@ -6,20 +6,6 @@
> >   *
> >   * Contact: Kai Vehmanen <kai.vehmanen@nokia.com>
> >   * Original author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
> > - *
> > - * 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.
> > - *

sure, this looks ok. I cannot speak on behalf of my old employer,
but as one of the authors of the code in question I can confirm
this patch is ok and thus:

Acked-by: Kai Vehmanen <kvcontact@nosignal.fi>

Cc'ing my private email address.

Br, Kai