Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ynl: broaden the license even more

I relicensed Netlink spec code to GPL-2.0 OR BSD-3-Clause but
we still put a slightly different license on the uAPI header
than the rest of the code. Use the Linux-syscall-note on all
the specs and all generated code. It's moot for kernel code,
but should not hurt. This way the licenses match everywhere.

Cc: Chuck Lever <chuck.lever@oracle.com>
Fixes: 37d9df224d1e ("ynl: re-license uniformly under GPL-2.0 OR BSD-3-Clause")
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

+19 -18
+1 -1
Documentation/netlink/genetlink.yaml
··· 1 - # SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause 1 + # SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 2 2 %YAML 1.2 3 3 --- 4 4 $id: http://kernel.org/schemas/netlink/genetlink-legacy.yaml#
+1 -1
Documentation/netlink/specs/ethtool.yaml
··· 1 - # SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause 1 + # SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 2 2 3 3 name: ethtool 4 4
+1 -1
Documentation/netlink/specs/fou.yaml
··· 1 - # SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause 1 + # SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 2 2 3 3 name: fou 4 4
+1 -1
Documentation/netlink/specs/netdev.yaml
··· 1 - # SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause 1 + # SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 2 2 3 3 name: netdev 4 4
+2 -1
Documentation/userspace-api/netlink/specs.rst
··· 24 24 This document describes details of the schema. 25 25 See :doc:`intro-specs` for a practical starting guide. 26 26 27 - All specs must be licensed under ``GPL-2.0-only OR BSD-3-Clause`` 27 + All specs must be licensed under 28 + ``((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)`` 28 29 to allow for easy adoption in user space code. 29 30 30 31 Compatibility levels
+1 -1
include/uapi/linux/fou.h
··· 1 - /* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */ 1 + /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ 2 2 /* Do not edit directly, auto-generated from: */ 3 3 /* Documentation/netlink/specs/fou.yaml */ 4 4 /* YNL-GEN uapi header */
+1 -1
include/uapi/linux/netdev.h
··· 1 - /* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */ 1 + /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ 2 2 /* Do not edit directly, auto-generated from: */ 3 3 /* Documentation/netlink/specs/netdev.yaml */ 4 4 /* YNL-GEN uapi header */
+1 -1
net/core/netdev-genl-gen.c
··· 1 - // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause 1 + // SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 2 2 /* Do not edit directly, auto-generated from: */ 3 3 /* Documentation/netlink/specs/netdev.yaml */ 4 4 /* YNL-GEN kernel source */
+1 -1
net/core/netdev-genl-gen.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ 1 + /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ 2 2 /* Do not edit directly, auto-generated from: */ 3 3 /* Documentation/netlink/specs/netdev.yaml */ 4 4 /* YNL-GEN kernel header */
+1 -1
net/ipv4/fou_nl.c
··· 1 - // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause 1 + // SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 2 2 /* Do not edit directly, auto-generated from: */ 3 3 /* Documentation/netlink/specs/fou.yaml */ 4 4 /* YNL-GEN kernel source */
+1 -1
net/ipv4/fou_nl.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ 1 + /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ 2 2 /* Do not edit directly, auto-generated from: */ 3 3 /* Documentation/netlink/specs/fou.yaml */ 4 4 /* YNL-GEN kernel header */
+1 -1
tools/include/uapi/linux/netdev.h
··· 1 - /* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */ 1 + /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ 2 2 /* Do not edit directly, auto-generated from: */ 3 3 /* Documentation/netlink/specs/netdev.yaml */ 4 4 /* YNL-GEN uapi header */
+4 -4
tools/net/ynl/ynl-gen-c.py
··· 1 1 #!/usr/bin/env python3 2 - # SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause 2 + # SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 3 3 4 4 import argparse 5 5 import collections ··· 2068 2068 2069 2069 _, spec_kernel = find_kernel_root(args.spec) 2070 2070 if args.mode == 'uapi': 2071 - cw.p('/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */') 2071 + cw.p('/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */') 2072 2072 else: 2073 2073 if args.header: 2074 - cw.p('/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */') 2074 + cw.p('/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */') 2075 2075 else: 2076 - cw.p('// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause') 2076 + cw.p('// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)') 2077 2077 cw.p("/* Do not edit directly, auto-generated from: */") 2078 2078 cw.p(f"/*\t{spec_kernel} */") 2079 2079 cw.p(f"/* YNL-GEN {args.mode} {'header' if args.header else 'source'} */")