The annotated tag, v5.1-rc3 has been created
at e40bc7462f998035ea03e93daab2e5b27ed22149 (tag)
tagging 79a3aaa7b82e3106be97842dedfd8429248896e6 (commit)
replaces v5.1-rc2
tagged by Linus Torvalds
on Sun Mar 31 14:39:35 2019 -0700
- Shortlog ------------------------------------------------------------
Linux 5.1-rc3
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlyhM5ceHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiG7iEH/RSN8uIxLXrhI9yb
cVQq1d/dLS+1vMEbjF35m+jkHOdty7ShLd6Qv5kaeqzIznvzhNaMZwUpoqlCn/Px
vXeVH/e5eBBBw7EVCq+FqK22H/TNs10xidBR6bsP/VwrW4Rz3gBt2nsx7Hvpwrxx
zCkC6E/qzRv1kkjsF85Zt0lIbFAex7Uk/+ZXK2zXKxk1Dp7Y6h5Aj+jmRByvaUwQ
0Syq1FDexUN3cI+dTmvYE8L/Dblyd2VONxnEXMOP3isk+poAwyVHWtkOzuL+myIz
5OoqSNdu8P02ldm7rEiXrqFNseZJK9sur4OOIg6CMdiXTG1q1QIY5hvUkX/R3tIZ
0E4wxXM=
=hkav
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
Repository : ssh://git@open-mesh.org/openwrt-feed-devel
On branch : master
>---------------------------------------------------------------
commit b759df59b3891fa454a1cba9400d7c2a7c32adad
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Thu Mar 28 21:44:27 2019 +0100
batman-adv-devel: Make sysfs support optional
The sysfs files will be marked as deprecated in the near future. They are
already replaced by the batadv generic netlink family. Add an Kconfig
option to disable the sysfs support for users who want to test their tools
or want to safe some space. This setting should currently still be enabled
by default to keep backward compatible with legacy tools.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
b759df59b3891fa454a1cba9400d7c2a7c32adad
batman-adv-devel/Config.in | 24 ++++++++++++------------
batman-adv-devel/Makefile | 1 +
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in
index 7ea862c..79beb3b 100644
--- a/batman-adv-devel/Config.in
+++ b/batman-adv-devel/Config.in
@@ -2,18 +2,6 @@
# Copyright (C) 2007-2019 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
@@ -98,6 +86,18 @@ config BATMAN_ADV_DEVEL_DEBUG
buffer. The output is controlled via the batadv netdev specific
log_level setting.
+config BATMAN_ADV_DEVEL_SYSFS
+ bool "batman-adv sysfs entries"
+ depends on PACKAGE_kmod-batman-adv-devel
+ default y
+ help
+ Say Y here if you want to enable batman-adv device configuration and
+ status interface through sysfs attributes. It is replaced by the
+ batadv generic netlink family but still used by various userspace
+ tools and scripts.
+
+ If unsure, say Y.
+
config BATMAN_ADV_DEVEL_TRACING
bool "B.A.T.M.A.N. tracing support"
depends on PACKAGE_kmod-batman-adv-devel
diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile
index bede8cc..de3cdb4 100644
--- a/batman-adv-devel/Makefile
+++ b/batman-adv-devel/Makefile
@@ -73,6 +73,7 @@ PKG_EXTRA_KCONFIG:= \
CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_BATMAN_ADV_DEVEL_MCAST),y,n) \
CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_BATMAN_ADV_DEVEL_NC),y,n) \
CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_BATMAN_ADV_DEVEL_BATMAN_V),y,n) \
+ CONFIG_BATMAN_ADV_SYSFS=$(if $(CONFIG_BATMAN_ADV_DEVEL_SYSFS),y,n) \
CONFIG_BATMAN_ADV_TRACING=$(if $(CONFIG_BATMAN_ADV_DEVEL_TRACING),y,n) \
PKG_EXTRA_CFLAGS:= \
Repository : ssh://git@open-mesh.org/alfred
On branch : master
>---------------------------------------------------------------
commit ca623970258a05d758d68da187f0aaf20f8686ac
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sun Mar 3 15:52:04 2019 +0100
alfred: Switch packet.h license to MIT
The ISC license is considered as not recommended in "Linux kernel licensing
rules". It should only be used for existing code or for importing code from
a different project with that license.
Since we already use this license for the batman-adv related uapi headers,
we should also use this for our packet.h. This fixes at the same time the
SPDX license identifier which switched incorrectly to GPL-2.0 in commit
ea81a05080bd ("alfred: Add SPDX license identifier above copyright
header").
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
ca623970258a05d758d68da187f0aaf20f8686ac
packet.h | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/packet.h b/packet.h
index 4378694..e2112e4 100644
--- a/packet.h
+++ b/packet.h
@@ -1,21 +1,27 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: MIT */
/* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Sven Eckelmann
*
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
*
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
*
- * License-Filename: LICENSES/preferred/GPL-2.0
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * License-Filename: LICENSES/preferred/MIT
*/
#ifndef _ALFRED_PACKET_H
Repository : ssh://git@open-mesh.org/alfred
On branch : master
>---------------------------------------------------------------
commit 62a2314852b83b259cf4fa0017bfeeaad4c6b2d5
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sun Mar 3 15:52:05 2019 +0100
alfred: Drop license boilerplate
All files got a SPDX-License-Identifier with commit ea81a05080bd
("alfred: Add SPDX license identifier above copyright header"). All the
required information about the license conditions can be found in
LICENSES/.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
62a2314852b83b259cf4fa0017bfeeaad4c6b2d5
Makefile | 14 --------------
alfred.h | 14 --------------
batadv_query.c | 14 --------------
batadv_query.h | 14 --------------
batadv_querynl.c | 14 --------------
batadv_querynl.h | 14 --------------
batman_adv.h | 18 ------------------
bitops.h | 18 +-----------------
client.c | 14 --------------
debugfs.c | 14 --------------
debugfs.h | 14 --------------
gpsd/Makefile | 14 --------------
gpsd/alfred-gpsd.c | 14 --------------
gpsd/alfred-gpsd.h | 14 --------------
hash.c | 14 --------------
hash.h | 14 --------------
list.h | 14 --------------
main.c | 14 --------------
netlink.c | 14 --------------
netlink.h | 14 --------------
netsock.c | 14 --------------
packet.h | 18 ------------------
recv.c | 14 --------------
send.c | 14 --------------
server.c | 14 --------------
unix_sock.c | 14 --------------
util.c | 14 --------------
vis/Makefile | 14 --------------
vis/vis.c | 14 --------------
vis/vis.h | 14 --------------
30 files changed, 1 insertion(+), 431 deletions(-)
diff --git a/Makefile b/Makefile
index 0a54c1b..8840961 100755
--- a/Makefile
+++ b/Makefile
@@ -4,20 +4,6 @@
#
# Copyright (C) 2012-2019 B.A.T.M.A.N. contributors
#
-# 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA
-#
# License-Filename: LICENSES/preferred/GPL-2.0
# alfred build
diff --git a/alfred.h b/alfred.h
index 22d2897..c7ee518 100644
--- a/alfred.h
+++ b/alfred.h
@@ -3,20 +3,6 @@
*
* 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/batadv_query.c b/batadv_query.c
index 7486bf4..fb72e77 100644
--- a/batadv_query.c
+++ b/batadv_query.c
@@ -3,20 +3,6 @@
*
* 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/batadv_query.h b/batadv_query.h
index fd7eb2e..7e93791 100644
--- a/batadv_query.h
+++ b/batadv_query.h
@@ -3,20 +3,6 @@
*
* Simon Wunderlich, Marek Lindner
*
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _BATADV_QUERY_H
diff --git a/batadv_querynl.c b/batadv_querynl.c
index 20ab8b3..d5e9402 100644
--- a/batadv_querynl.c
+++ b/batadv_querynl.c
@@ -3,20 +3,6 @@
*
* Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch>
*
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/batadv_querynl.h b/batadv_querynl.h
index 565c0e1..e2066c2 100644
--- a/batadv_querynl.h
+++ b/batadv_querynl.h
@@ -3,20 +3,6 @@
*
* Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch>
*
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/batman_adv.h b/batman_adv.h
index 305bf31..e53f2b5 100644
--- a/batman_adv.h
+++ b/batman_adv.h
@@ -2,24 +2,6 @@
/* Copyright (C) 2016-2019 B.A.T.M.A.N. contributors:
*
* Matthias Schiffer
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
*/
#ifndef _UAPI_LINUX_BATMAN_ADV_H_
diff --git a/bitops.h b/bitops.h
index c4dc5af..ead4a4f 100644
--- a/bitops.h
+++ b/bitops.h
@@ -4,23 +4,7 @@
*
* Copyright (c) 2012-2019, Sven Eckelmann <sven(a)narfation.org>
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * License-Filename: LICENSES/preferred/MIT
*/
#ifndef __LINUX_LIKE_BITOPS_H__
diff --git a/client.c b/client.c
index c3bd0cb..85a05ce 100644
--- a/client.c
+++ b/client.c
@@ -3,20 +3,6 @@
*
* 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/debugfs.c b/debugfs.c
index 1cea8ac..5a71d65 100644
--- a/debugfs.c
+++ b/debugfs.c
@@ -2,20 +2,6 @@
/* Copyright (C) 2009 Clark Williams <williams(a)redhat.com>
* Copyright (C) 2009 Xiao Guangrong <xiaoguangrong(a)cn.fujitsu.com>
*
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/debugfs.h b/debugfs.h
index 6e49efa..61384f9 100644
--- a/debugfs.h
+++ b/debugfs.h
@@ -2,20 +2,6 @@
/* Copyright (C) 2009 Clark Williams <williams(a)redhat.com>
* Copyright (C) 2009 Xiao Guangrong <xiaoguangrong(a)cn.fujitsu.com>
*
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/gpsd/Makefile b/gpsd/Makefile
index 33129c1..81bf254 100755
--- a/gpsd/Makefile
+++ b/gpsd/Makefile
@@ -4,20 +4,6 @@
#
# Copyright (C) 2013-2019 B.A.T.M.A.N. contributors
#
-# 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA
-#
# License-Filename: LICENSES/preferred/GPL-2.0
# alfred-gpsd build
diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c
index 1db9ff9..6e9137c 100644
--- a/gpsd/alfred-gpsd.c
+++ b/gpsd/alfred-gpsd.c
@@ -3,20 +3,6 @@
*
* Andrew Lunn, 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h
index 70fd2c4..85dcc72 100644
--- a/gpsd/alfred-gpsd.h
+++ b/gpsd/alfred-gpsd.h
@@ -3,20 +3,6 @@
*
* Andrew Lunn, 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/hash.c b/hash.c
index 778a7f4..02ac15e 100644
--- a/hash.c
+++ b/hash.c
@@ -3,20 +3,6 @@
*
* Simon Wunderlich, Marek Lindner
*
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/hash.h b/hash.h
index d3fedb1..f5a8fb5 100644
--- a/hash.h
+++ b/hash.h
@@ -3,20 +3,6 @@
*
* Simon Wunderlich, Marek Lindner
*
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _BATMAN_HASH_H
diff --git a/list.h b/list.h
index f6c0cae..0fa634f 100644
--- a/list.h
+++ b/list.h
@@ -3,20 +3,6 @@
*
* Linus Torvalds, ...
*
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/main.c b/main.c
index 6378c49..f633462 100644
--- a/main.c
+++ b/main.c
@@ -3,20 +3,6 @@
*
* 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/netlink.c b/netlink.c
index ffc29f2..eac8245 100644
--- a/netlink.c
+++ b/netlink.c
@@ -3,20 +3,6 @@
*
* Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch>
*
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/netlink.h b/netlink.h
index fcea003..26ad1e8 100644
--- a/netlink.h
+++ b/netlink.h
@@ -3,20 +3,6 @@
*
* Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch>
*
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/netsock.c b/netsock.c
index 927e5cc..fcbc20b 100644
--- a/netsock.c
+++ b/netsock.c
@@ -3,20 +3,6 @@
*
* 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/packet.h b/packet.h
index e2112e4..564afad 100644
--- a/packet.h
+++ b/packet.h
@@ -3,24 +3,6 @@
*
* Simon Wunderlich, Sven Eckelmann
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
* License-Filename: LICENSES/preferred/MIT
*/
diff --git a/recv.c b/recv.c
index a2e0602..e7c2c24 100644
--- a/recv.c
+++ b/recv.c
@@ -3,20 +3,6 @@
*
* 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/send.c b/send.c
index f7f37d8..d4043bc 100644
--- a/send.c
+++ b/send.c
@@ -3,20 +3,6 @@
*
* 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/server.c b/server.c
index 4cbbc7b..18109cc 100644
--- a/server.c
+++ b/server.c
@@ -3,20 +3,6 @@
*
* 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/unix_sock.c b/unix_sock.c
index 25348e8..1d17cee 100644
--- a/unix_sock.c
+++ b/unix_sock.c
@@ -3,20 +3,6 @@
*
* 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/util.c b/util.c
index ed7407b..e14350e 100644
--- a/util.c
+++ b/util.c
@@ -3,20 +3,6 @@
*
* 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/vis/Makefile b/vis/Makefile
index 50e6112..53d1f44 100755
--- a/vis/Makefile
+++ b/vis/Makefile
@@ -4,20 +4,6 @@
#
# Copyright (C) 2013-2019 B.A.T.M.A.N. contributors
#
-# 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA
-#
# License-Filename: LICENSES/preferred/GPL-2.0
# batadv-vis build
diff --git a/vis/vis.c b/vis/vis.c
index 3953475..beaeca1 100644
--- a/vis/vis.c
+++ b/vis/vis.c
@@ -3,20 +3,6 @@
*
* 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
diff --git a/vis/vis.h b/vis/vis.h
index d899f4e..6870dd4 100644
--- a/vis/vis.h
+++ b/vis/vis.h
@@ -3,20 +3,6 @@
*
* 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
* License-Filename: LICENSES/preferred/GPL-2.0
*/
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit db4530a81b1d045b93d88f404449915225f621d5
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sun Mar 17 10:13:13 2019 +0100
MAINTAINERS: Add T(ree) field for batman-adv
The linux-merge.git repository on git.open-mesh.org is used since 8 years
to send PRs for net.git and net-next.git. It is time to officially specify
list it as SCM tree.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
db4530a81b1d045b93d88f404449915225f621d5
MAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index a828735e..4b1b53d5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7,6 +7,7 @@ W: https://www.open-mesh.org/
B: https://www.open-mesh.org/projects/batman-adv/issues
C: irc://chat.freenode.net/batman
Q: https://patchwork.open-mesh.org/project/batman/list/
+T: git https://git.open-mesh.org/linux-merge.git
S: Maintained
F: Documentation/ABI/obsolete/sysfs-class-net-batman-adv
F: Documentation/ABI/obsolete/sysfs-class-net-mesh