| Message ID | 88410cddd31197ea26840d7dd71612bece8c6acf.1663871981.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 73dfe93ea1b319482e6d82a54fe06f953ceeeccb |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2] headers: Remove some left-over license text | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Thu, 2022-09-22 at 20:41 +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> > --- > Changes since v1: > - add tools/include/uapi/linux/tc_act/tc_bpf.h [Yonghong Song <yhs@fb.com>] > > v1: https://lore.kernel.org/all/2a15aba72497e78ff08c8b8a8bfe3cf5a3e6ee18.1662897019.git.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 ----- > tools/include/uapi/linux/tc_act/tc_bpf.h | 5 ----- > 6 files changed, 1 insertion(+), 39 deletions(-) > > <snip> > 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> > */ > Looks good to me. Acked-by: Alexander Duyck <alexanderduyck@fb.com>
On Thu, 22 Sep 2022 20:41:40 +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. Jiri, Jamal, would you mind acking this?
Thu, Sep 22, 2022 at 08:41:40PM CEST, christophe.jaillet@wanadoo.fr 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> Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> cheers, jamal On Thu, Sep 22, 2022 at 2:41 PM Christophe JAILLET <christophe.jaillet@wanadoo.fr> 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> > --- > Changes since v1: > - add tools/include/uapi/linux/tc_act/tc_bpf.h [Yonghong Song <yhs@fb.com>] > > v1: https://lore.kernel.org/all/2a15aba72497e78ff08c8b8a8bfe3cf5a3e6ee18.1662897019.git.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 ----- > tools/include/uapi/linux/tc_act/tc_bpf.h | 5 ----- > 6 files changed, 1 insertion(+), 39 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 > diff --git a/tools/include/uapi/linux/tc_act/tc_bpf.h b/tools/include/uapi/linux/tc_act/tc_bpf.h > index 653c4f94f76e..fe6c8f8f3e8c 100644 > --- a/tools/include/uapi/linux/tc_act/tc_bpf.h > +++ b/tools/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 > -- > 2.34.1 >
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Thu, 22 Sep 2022 20:41:40 +0200 you 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> > > [...] Here is the summary with links: - [v2] headers: Remove some left-over license text https://git.kernel.org/netdev/net-next/c/73dfe93ea1b3 You are awesome, thank you!
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 diff --git a/tools/include/uapi/linux/tc_act/tc_bpf.h b/tools/include/uapi/linux/tc_act/tc_bpf.h index 653c4f94f76e..fe6c8f8f3e8c 100644 --- a/tools/include/uapi/linux/tc_act/tc_bpf.h +++ b/tools/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
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> --- Changes since v1: - add tools/include/uapi/linux/tc_act/tc_bpf.h [Yonghong Song <yhs@fb.com>] v1: https://lore.kernel.org/all/2a15aba72497e78ff08c8b8a8bfe3cf5a3e6ee18.1662897019.git.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 ----- tools/include/uapi/linux/tc_act/tc_bpf.h | 5 ----- 6 files changed, 1 insertion(+), 39 deletions(-)