[linux-next] LinuxNextTracking branch, master, updated. next-20171221

batman at open-mesh.org batman at open-mesh.org
Fri Dec 22 00:16:30 CET 2017


The following commit has been merged in the master branch:
commit 9969ffa85ff28a56adc9c1570b5f956161f6e6a4
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Nov 19 15:05:13 2017 +0100

    batman-adv: Add license header to Kconfig
    
    The last remaining file without license notice and/or SPDX license
    identifier under net/batman-adv/ is the Kconfig. It should have been
    licensed under the same conditions as the rest of batman-adv and the
    Makefile which uses the CONFIG_* variables from Kconfig.
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
index b73b96a2854b..c44f6515be5e 100644
--- a/net/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -1,3 +1,20 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2007-2017  B.A.T.M.A.N. contributors:
+#
+# Marek Lindner, Simon Wunderlich
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public
+# License as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
 #
 # B.A.T.M.A.N meshing protocol
 #

-- 
LinuxNextTracking


More information about the linux-merge mailing list