RE: [PATCH] tipc: Add SPDX id lines to source files
Tung Quang Nguyen <[email protected]> Fri, 5 Jun 2026 01:37:57 +0000
| Newsgroups | org.kernel.vger.linux-spdx,org.kernel.vger.linux-kernel,org.kernel.vger.netdev |
|---|---|
| Message-ID | <GV1P189MB1988FB0E53EA8D3FCC2533BDC6112@GV1P189MB1988.EURP189.PROD.OUTLOOK.COM> |
>Subject: [PATCH] tipc: Add SPDX id lines to source files > >Most of the tipc source files are missing SPDX-License-Identifier >lines. Add appropriate IDs to these files, and remove the >previous license lines from the headers. In this case, >every file received the 'GPL-2.0 OR BSD-3-Clause' ID expression. The original license of TIPC is GPL-2.0. Why do you think it should be dual= licensing now ? > >Signed-off-by: Tim Bird <[email protected]> >--- > net/tipc/addr.c | 29 +---------------------------- > net/tipc/addr.h | 29 +---------------------------- > net/tipc/bcast.c | 29 +---------------------------- > net/tipc/bcast.h | 29 +---------------------------- > net/tipc/bearer.c | 29 +---------------------------- > net/tipc/bearer.h | 29 +---------------------------- > net/tipc/core.c | 29 +---------------------------- > net/tipc/core.h | 29 +---------------------------- > net/tipc/diag.c | 29 +---------------------------- > net/tipc/discover.c | 29 +---------------------------- > net/tipc/discover.h | 29 +---------------------------- > net/tipc/eth_media.c | 29 +---------------------------- > net/tipc/group.c | 29 +---------------------------- > net/tipc/group.h | 29 +---------------------------- > net/tipc/ib_media.c | 29 +---------------------------- > net/tipc/link.c | 29 +---------------------------- > net/tipc/link.h | 29 +---------------------------- > net/tipc/monitor.c | 29 +---------------------------- > net/tipc/monitor.h | 29 +---------------------------- > net/tipc/msg.c | 29 +---------------------------- > net/tipc/msg.h | 29 +---------------------------- > net/tipc/name_distr.c | 29 +---------------------------- > net/tipc/name_distr.h | 29 +---------------------------- > net/tipc/name_table.c | 29 +---------------------------- > net/tipc/name_table.h | 29 +---------------------------- > net/tipc/net.c | 29 +---------------------------- > net/tipc/net.h | 29 +---------------------------- > net/tipc/netlink.c | 29 +---------------------------- > net/tipc/netlink.h | 29 +---------------------------- > net/tipc/netlink_compat.c | 29 +---------------------------- > net/tipc/node.c | 29 +---------------------------- > net/tipc/node.h | 29 +---------------------------- > net/tipc/socket.c | 29 +---------------------------- > net/tipc/socket.h | 29 +---------------------------- > net/tipc/subscr.c | 29 +---------------------------- > net/tipc/subscr.h | 29 +---------------------------- > net/tipc/sysctl.c | 29 +---------------------------- > net/tipc/topsrv.c | 29 +---------------------------- > net/tipc/topsrv.h | 29 +---------------------------- > net/tipc/trace.c | 29 +---------------------------- > net/tipc/trace.h | 29 +---------------------------- > net/tipc/udp_media.c | 29 +---------------------------- > net/tipc/udp_media.h | 29 +---------------------------- > 43 files changed, 43 insertions(+), 1204 deletions(-) > >diff --git a/net/tipc/addr.c b/net/tipc/addr.c >index 6f5c54cbf8d9..ee73b58bcc69 100644 >--- a/net/tipc/addr.c >+++ b/net/tipc/addr.c >@@ -1,3 +1,4 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/addr.c: TIPC address utility routines > * >@@ -5,34 +6,6 @@ > * Copyright (c) 2004-2005, 2010-2011, Wind River Systems > * Copyright (c) 2020-2021, Red Hat Inc > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include "addr.h" >diff --git a/net/tipc/addr.h b/net/tipc/addr.h >index a113cf7e1f89..0eccd4719092 100644 >--- a/net/tipc/addr.h >+++ b/net/tipc/addr.h >@@ -1,3 +1,4 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/addr.h: Include file for TIPC address utility routines > * >@@ -5,34 +6,6 @@ > * Copyright (c) 2004-2005, Wind River Systems > * Copyright (c) 2020-2021, Red Hat Inc > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_ADDR_H >diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c >index 76a1585d3f6b..27dbb5fcdb3a 100644 >--- a/net/tipc/bcast.c >+++ b/net/tipc/bcast.c >@@ -1,3 +1,4 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/bcast.c: TIPC broadcast code > * >@@ -5,34 +6,6 @@ > * Copyright (c) 2004, Intel Corporation. > * Copyright (c) 2005, 2010-2011, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include <linux/tipc_config.h> >diff --git a/net/tipc/bcast.h b/net/tipc/bcast.h >index 2d9352dc7b0e..8a453b3796af 100644 >--- a/net/tipc/bcast.h >+++ b/net/tipc/bcast.h >@@ -1,37 +1,10 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/bcast.h: Include file for TIPC broadcast code > * > * Copyright (c) 2003-2006, 2014-2015, Ericsson AB > * Copyright (c) 2005, 2010-2011, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_BCAST_H >diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c >index a3bd1ef17558..ba362ea61ccf 100644 >--- a/net/tipc/bearer.c >+++ b/net/tipc/bearer.c >@@ -1,37 +1,10 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/bearer.c: TIPC bearer code > * > * Copyright (c) 1996-2006, 2013-2016, Ericsson AB > * Copyright (c) 2004-2006, 2010-2013, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include <net/sock.h> >diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h >index 41eac1ee0c09..ce913ac16924 100644 >--- a/net/tipc/bearer.h >+++ b/net/tipc/bearer.h >@@ -1,37 +1,10 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/bearer.h: Include file for TIPC bearer code > * > * Copyright (c) 1996-2006, 2013-2016, Ericsson AB > * Copyright (c) 2005, 2010-2011, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_BEARER_H >diff --git a/net/tipc/core.c b/net/tipc/core.c >index 434e70eabe08..0fa53f05fd10 100644 >--- a/net/tipc/core.c >+++ b/net/tipc/core.c >@@ -1,37 +1,10 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/core.c: TIPC module code > * > * Copyright (c) 2003-2006, 2013, Ericsson AB > * Copyright (c) 2005-2006, 2010-2013, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include "core.h" >diff --git a/net/tipc/core.h b/net/tipc/core.h >index 9ce5f9ff6cc0..ff96b66c8bb7 100644 >--- a/net/tipc/core.h >+++ b/net/tipc/core.h >@@ -1,3 +1,4 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/core.h: Include file for TIPC global declarations > * >@@ -5,34 +6,6 @@ > * Copyright (c) 2005-2007, 2010-2013, Wind River Systems > * Copyright (c) 2020, Red Hat Inc > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_CORE_H >diff --git a/net/tipc/diag.c b/net/tipc/diag.c >index 54dde8c4e4d4..e6a1cb0a52da 100644 >--- a/net/tipc/diag.c >+++ b/net/tipc/diag.c >@@ -1,36 +1,9 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/diag.c: TIPC socket diag > * > * Copyright (c) 2018, Ericsson AB > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "ASIS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO,THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include "core.h" >diff --git a/net/tipc/discover.c b/net/tipc/discover.c >index 3e54d2df5683..bb4d7c066521 100644 >--- a/net/tipc/discover.c >+++ b/net/tipc/discover.c >@@ -1,37 +1,10 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/discover.c > * > * Copyright (c) 2003-2006, 2014-2018, Ericsson AB > * Copyright (c) 2005-2006, 2010-2011, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include "core.h" >diff --git a/net/tipc/discover.h b/net/tipc/discover.h >index 521d96c41dfd..87945cd1ed62 100644 >--- a/net/tipc/discover.h >+++ b/net/tipc/discover.h >@@ -1,37 +1,10 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/discover.h > * > * Copyright (c) 2003-2006, Ericsson AB > * Copyright (c) 2005, 2010-2011, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_DISCOVER_H >diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c >index cb0d185e06af..3eb8c5218f73 100644 >--- a/net/tipc/eth_media.c >+++ b/net/tipc/eth_media.c >@@ -1,37 +1,10 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/eth_media.c: Ethernet bearer support for TIPC > * > * Copyright (c) 2001-2007, 2013-2014, Ericsson AB > * Copyright (c) 2005-2008, 2011-2013, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include "core.h" >diff --git a/net/tipc/group.c b/net/tipc/group.c >index 14e6732624e2..5b2990b1533e 100644 >--- a/net/tipc/group.c >+++ b/net/tipc/group.c >@@ -1,37 +1,10 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/group.c: TIPC group messaging code > * > * Copyright (c) 2017, Ericsson AB > * Copyright (c) 2020, Red Hat Inc > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include "core.h" >diff --git a/net/tipc/group.h b/net/tipc/group.h >index ea4c3be64c78..2eefe626d550 100644 >--- a/net/tipc/group.h >+++ b/net/tipc/group.h >@@ -1,37 +1,10 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/group.h: Include file for TIPC group unicast/multicast functi= ons > * > * Copyright (c) 2017, Ericsson AB > * Copyright (c) 2020, Red Hat Inc > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_GROUP_H >diff --git a/net/tipc/ib_media.c b/net/tipc/ib_media.c >index b9ad0434c3cd..504d36777a23 100644 >--- a/net/tipc/ib_media.c >+++ b/net/tipc/ib_media.c >@@ -1,3 +1,4 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/ib_media.c: Infiniband bearer support for TIPC > * >@@ -8,34 +9,6 @@ > * Copyright (c) 2001-2007, Ericsson AB > * Copyright (c) 2005-2008, 2011, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include <linux/if_infiniband.h> >diff --git a/net/tipc/link.c b/net/tipc/link.c >index 49dfc098d89b..ff966b9892ee 100644 >--- a/net/tipc/link.c >+++ b/net/tipc/link.c >@@ -1,37 +1,10 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/link.c: TIPC link code > * > * Copyright (c) 1996-2007, 2012-2016, Ericsson AB > * Copyright (c) 2004-2007, 2010-2013, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include "core.h" >diff --git a/net/tipc/link.h b/net/tipc/link.h >index d80f5649b395..102ff0184fa8 100644 >--- a/net/tipc/link.h >+++ b/net/tipc/link.h >@@ -1,37 +1,10 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/link.h: Include file for TIPC link code > * > * Copyright (c) 1995-2006, 2013-2014, Ericsson AB > * Copyright (c) 2004-2005, 2010-2011, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_LINK_H >diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c >index a94b9b36a700..fe1906e103d3 100644 >--- a/net/tipc/monitor.c >+++ b/net/tipc/monitor.c >@@ -1,36 +1,9 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/monitor.c > * > * Copyright (c) 2016, Ericsson AB > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include <net/genetlink.h> >diff --git a/net/tipc/monitor.h b/net/tipc/monitor.h >index ed63d2e650b0..3b849c683371 100644 >--- a/net/tipc/monitor.h >+++ b/net/tipc/monitor.h >@@ -1,36 +1,9 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/monitor.h > * > * Copyright (c) 2015, Ericsson AB > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_MONITOR_H >diff --git a/net/tipc/msg.c b/net/tipc/msg.c >index b0bba0feef56..22f0274c4505 100644 >--- a/net/tipc/msg.c >+++ b/net/tipc/msg.c >@@ -1,37 +1,10 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/msg.c: TIPC message header routines > * > * Copyright (c) 2000-2006, 2014-2015, Ericsson AB > * Copyright (c) 2005, 2010-2011, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include <net/sock.h> >diff --git a/net/tipc/msg.h b/net/tipc/msg.h >index c5eec16213d7..3416bf07869e 100644 >--- a/net/tipc/msg.h >+++ b/net/tipc/msg.h >@@ -1,37 +1,10 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/msg.h: Include file for TIPC message header routines > * > * Copyright (c) 2000-2007, 2014-2017 Ericsson AB > * Copyright (c) 2005-2008, 2010-2011, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_MSG_H >diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c >index 190b49c5cbc3..e9af08463caf 100644 >--- a/net/tipc/name_distr.c >+++ b/net/tipc/name_distr.c >@@ -1,3 +1,4 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/name_distr.c: TIPC name distribution code > * >@@ -5,34 +6,6 @@ > * Copyright (c) 2005, 2010-2011, Wind River Systems > * Copyright (c) 2020-2021, Red Hat Inc > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include "core.h" >diff --git a/net/tipc/name_distr.h b/net/tipc/name_distr.h >index c677f6f082df..cd08ec9943f9 100644 >--- a/net/tipc/name_distr.h >+++ b/net/tipc/name_distr.h >@@ -1,37 +1,10 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/name_distr.h: Include file for TIPC name distribution code > * > * Copyright (c) 2000-2006, Ericsson AB > * Copyright (c) 2005, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_NAME_DISTR_H >diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c >index 253c72d1366e..b0f95a13a812 100644 >--- a/net/tipc/name_table.c >+++ b/net/tipc/name_table.c >@@ -1,3 +1,4 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/name_table.c: TIPC name table code > * >@@ -5,34 +6,6 @@ > * Copyright (c) 2004-2008, 2010-2014, Wind River Systems > * Copyright (c) 2020-2021, Red Hat Inc > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include <net/sock.h> >diff --git a/net/tipc/name_table.h b/net/tipc/name_table.h >index 7ff6eeebaae6..fff7e79dd936 100644 >--- a/net/tipc/name_table.h >+++ b/net/tipc/name_table.h >@@ -1,3 +1,4 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/name_table.h: Include file for TIPC name table code > * >@@ -5,34 +6,6 @@ > * Copyright (c) 2004-2005, 2010-2011, Wind River Systems > * Copyright (c) 2020-2021, Red Hat Inc > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_NAME_TABLE_H >diff --git a/net/tipc/net.c b/net/tipc/net.c >index 7e65d0b0c4a8..1883f1a76d6b 100644 >--- a/net/tipc/net.c >+++ b/net/tipc/net.c >@@ -1,37 +1,10 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/net.c: TIPC network routing code > * > * Copyright (c) 1995-2006, 2014, Ericsson AB > * Copyright (c) 2005, 2010-2011, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include "core.h" >diff --git a/net/tipc/net.h b/net/tipc/net.h >index 1cb1e43cf34a..1c56ae964c46 100644 >--- a/net/tipc/net.h >+++ b/net/tipc/net.h >@@ -1,37 +1,10 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/net.h: Include file for TIPC network routing code > * > * Copyright (c) 1995-2006, 2014, Ericsson AB > * Copyright (c) 2005, 2010-2011, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_NET_H >diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c >index 1a9a5bdaccf4..8dc5b1daee5b 100644 >--- a/net/tipc/netlink.c >+++ b/net/tipc/netlink.c >@@ -1,37 +1,10 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/netlink.c: TIPC configuration handling > * > * Copyright (c) 2005-2006, 2014, Ericsson AB > * Copyright (c) 2005-2007, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include "core.h" >diff --git a/net/tipc/netlink.h b/net/tipc/netlink.h >index 7cf777723e3e..56b395b216a6 100644 >--- a/net/tipc/netlink.h >+++ b/net/tipc/netlink.h >@@ -1,36 +1,9 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/netlink.h: Include file for TIPC netlink code > * > * Copyright (c) 2014, Ericsson AB > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_NETLINK_H >diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c >index 2a786c56c8c5..c110b9844a91 100644 >--- a/net/tipc/netlink_compat.c >+++ b/net/tipc/netlink_compat.c >@@ -1,34 +1,7 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * Copyright (c) 2014, Ericsson AB > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include "core.h" >diff --git a/net/tipc/node.c b/net/tipc/node.c >index 97aa970a0d83..724fec939a85 100644 >--- a/net/tipc/node.c >+++ b/net/tipc/node.c >@@ -1,37 +1,10 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/node.c: TIPC node management routines > * > * Copyright (c) 2000-2006, 2012-2016, Ericsson AB > * Copyright (c) 2005-2006, 2010-2014, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include "core.h" >diff --git a/net/tipc/node.h b/net/tipc/node.h >index 154a5bbb0d29..28da1d7025e5 100644 >--- a/net/tipc/node.h >+++ b/net/tipc/node.h >@@ -1,37 +1,10 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/node.h: Include file for TIPC node management routines > * > * Copyright (c) 2000-2006, 2014-2016, Ericsson AB > * Copyright (c) 2005, 2010-2014, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_NODE_H >diff --git a/net/tipc/socket.c b/net/tipc/socket.c >index 9329919fb07f..ec79eb6e35b3 100644 >--- a/net/tipc/socket.c >+++ b/net/tipc/socket.c >@@ -1,3 +1,4 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/socket.c: TIPC socket API > * >@@ -5,34 +6,6 @@ > * Copyright (c) 2004-2008, 2010-2013, Wind River Systems > * Copyright (c) 2020-2021, Red Hat Inc > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include <linux/rhashtable.h> >diff --git a/net/tipc/socket.h b/net/tipc/socket.h >index 02cdf166807d..4d3a31590395 100644 >--- a/net/tipc/socket.h >+++ b/net/tipc/socket.h >@@ -1,35 +1,8 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* net/tipc/socket.h: Include file for TIPC socket code > * > * Copyright (c) 2014-2016, Ericsson AB > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_SOCK_H >diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c >index 352d304c3acd..6d6c34871485 100644 >--- a/net/tipc/subscr.c >+++ b/net/tipc/subscr.c >@@ -1,3 +1,4 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/subscr.c: TIPC network topology service > * >@@ -5,34 +6,6 @@ > * Copyright (c) 2005-2007, 2010-2013, Wind River Systems > * Copyright (c) 2020-2021, Red Hat Inc > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include "core.h" >diff --git a/net/tipc/subscr.h b/net/tipc/subscr.h >index 60b877531b66..0262e6589b69 100644 >--- a/net/tipc/subscr.h >+++ b/net/tipc/subscr.h >@@ -1,3 +1,4 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/subscr.h: Include file for TIPC network topology service > * >@@ -5,34 +6,6 @@ > * Copyright (c) 2005-2007, 2012-2013, Wind River Systems > * Copyright (c) 2020-2021, Red Hat Inc > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_SUBSCR_H >diff --git a/net/tipc/sysctl.c b/net/tipc/sysctl.c >index 30d2e06e3d8c..1ce7c6dea30b 100644 >--- a/net/tipc/sysctl.c >+++ b/net/tipc/sysctl.c >@@ -1,36 +1,9 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/sysctl.c: sysctl interface to TIPC subsystem > * > * Copyright (c) 2013, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include "core.h" >diff --git a/net/tipc/topsrv.c b/net/tipc/topsrv.c >index af530c9ed840..9346578327d2 100644 >--- a/net/tipc/topsrv.c >+++ b/net/tipc/topsrv.c >@@ -1,37 +1,10 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/server.c: TIPC server infrastructure > * > * Copyright (c) 2012-2013, Wind River Systems > * Copyright (c) 2017-2018, Ericsson AB > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include "subscr.h" >diff --git a/net/tipc/topsrv.h b/net/tipc/topsrv.h >index c7ea71293748..b98c37c98738 100644 >--- a/net/tipc/topsrv.h >+++ b/net/tipc/topsrv.h >@@ -1,37 +1,10 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/server.h: Include file for TIPC server code > * > * Copyright (c) 2012-2013, Wind River Systems > * Copyright (c) 2017, Ericsson AB > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef _TIPC_SERVER_H >diff --git a/net/tipc/trace.c b/net/tipc/trace.c >index 7d2931521e0e..e052e59dfb44 100644 >--- a/net/tipc/trace.c >+++ b/net/tipc/trace.c >@@ -1,36 +1,9 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * net/tipc/trace.c: TIPC tracepoints code > * > * Copyright (c) 2018, Ericsson AB > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "ASIS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO,THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #define CREATE_TRACE_POINTS >diff --git a/net/tipc/trace.h b/net/tipc/trace.h >index 865142ed0ab4..47656cb64c67 100644 >--- a/net/tipc/trace.h >+++ b/net/tipc/trace.h >@@ -1,36 +1,9 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/trace.h: TIPC tracepoints > * > * Copyright (c) 2018, Ericsson AB > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "ASIS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO,THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #undef TRACE_SYSTEM >diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c >index 2c66b356025a..b2aeb63ad48f 100644 >--- a/net/tipc/udp_media.c >+++ b/net/tipc/udp_media.c >@@ -1,35 +1,8 @@ >+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* net/tipc/udp_media.c: IP bearer support for TIPC > * > * Copyright (c) 2015, Ericsson AB > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #include <linux/socket.h> >diff --git a/net/tipc/udp_media.h b/net/tipc/udp_media.h >index e7455cc73e16..8b92aef7246a 100644 >--- a/net/tipc/udp_media.h >+++ b/net/tipc/udp_media.h >@@ -1,37 +1,10 @@ >+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > /* > * net/tipc/udp_media.h: Include file for UDP bearer media > * > * Copyright (c) 1996-2006, 2013-2016, Ericsson AB > * Copyright (c) 2005, 2010-2011, Wind River Systems > * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions are= met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution= . >- * 3. Neither the names of the copyright holders nor the names of its >- * contributors may be used to endorse or promote products derived fro= m >- * this software without specific prior written permission. >- * >- * Alternatively, this software may be distributed under the terms of the >- * GNU General Public License ("GPL") version 2 as published by the Free >- * Software Foundation. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >CONTRIBUTORS "AS IS" >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR >CONTRIBUTORS BE >- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR >BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF >ADVISED OF THE >- * POSSIBILITY OF SUCH DAMAGE. > */ > > #ifdef CONFIG_TIPC_MEDIA_UDP >-- >2.43.0 >