lkml.org 
[lkml]   [2022]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] headers: Remove some left-over license text
    Date
    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/tc_act/tc_bpf.h | 5 -----
    include/uapi/linux/tc_act/tc_skbedit.h | 13 -------------
    include/uapi/linux/tc_act/tc_skbmod.h | 7 +------
    include/uapi/linux/tc_act/tc_tunnel_key.h | 5 -----
    include/uapi/linux/tc_act/tc_vlan.h | 5 -----
    5 files changed, 1 insertion(+), 34 deletions(-)

    diff --git a/include/uapi/linux/tc_act/tc_bpf.h b/include/uapi/linux/tc_act/tc_bpf.h
    index 653c4f94f76e..fe6c8f8f3e8c 100644
    --- a/include/uapi/linux/tc_act/tc_bpf.h
    +++ b/include/uapi/linux/tc_act/tc_bpf.h
    @@ -1,11 +1,6 @@
    /* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
    /*
    * Copyright (c) 2015 Jiri Pirko <jiri@resnulli.us>
    - *
    - * 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.
    */

    #ifndef __LINUX_TC_BPF_H
    diff --git a/include/uapi/linux/tc_act/tc_skbedit.h b/include/uapi/linux/tc_act/tc_skbedit.h
    index 6cb6101208d0..64032513cc4c 100644
    --- a/include/uapi/linux/tc_act/tc_skbedit.h
    +++ b/include/uapi/linux/tc_act/tc_skbedit.h
    @@ -2,19 +2,6 @@
    /*
    * Copyright (c) 2008, Intel Corporation.
    *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope 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., 59 Temple
    - * Place - Suite 330, Boston, MA 02111-1307 USA.
    - *
    * Author: Alexander Duyck <alexander.h.duyck@intel.com>
    */

    diff --git a/include/uapi/linux/tc_act/tc_skbmod.h b/include/uapi/linux/tc_act/tc_skbmod.h
    index af6ef2cfbf3d..ac62c9a993ea 100644
    --- a/include/uapi/linux/tc_act/tc_skbmod.h
    +++ b/include/uapi/linux/tc_act/tc_skbmod.h
    @@ -1,12 +1,7 @@
    /* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
    /*
    * Copyright (c) 2016, Jamal Hadi Salim
    - *
    - * 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.
    -*/
    + */

    #ifndef __LINUX_TC_SKBMOD_H
    #define __LINUX_TC_SKBMOD_H
    diff --git a/include/uapi/linux/tc_act/tc_tunnel_key.h b/include/uapi/linux/tc_act/tc_tunnel_key.h
    index 3f10dc4e7a4b..49ad4033951b 100644
    --- a/include/uapi/linux/tc_act/tc_tunnel_key.h
    +++ b/include/uapi/linux/tc_act/tc_tunnel_key.h
    @@ -2,11 +2,6 @@
    /*
    * Copyright (c) 2016, Amir Vadai <amir@vadai.me>
    * Copyright (c) 2016, Mellanox Technologies. All rights reserved.
    - *
    - * 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.
    */

    #ifndef __LINUX_TC_TUNNEL_KEY_H
    diff --git a/include/uapi/linux/tc_act/tc_vlan.h b/include/uapi/linux/tc_act/tc_vlan.h
    index 5b306fe815cc..3e1f8e57cdd2 100644
    --- a/include/uapi/linux/tc_act/tc_vlan.h
    +++ b/include/uapi/linux/tc_act/tc_vlan.h
    @@ -1,11 +1,6 @@
    /* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
    /*
    * Copyright (c) 2014 Jiri Pirko <jiri@resnulli.us>
    - *
    - * 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.
    */

    #ifndef __LINUX_TC_VLAN_H
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-09-11 13:51    [W:2.567 / U:1.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site