[00/19] pull request for net-next: batman-adv 2017-12-20
Message ID | 20171220110124.13117-1-sw@simonwunderlich.de (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers |
Return-Path: <b.a.t.m.a.n-bounces@lists.open-mesh.org> X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id 418F481DB9; Wed, 20 Dec 2017 12:01:40 +0100 (CET) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=79.140.42.25; helo=mail.mail.packetmixer.de; envelope-from=sw@simonwunderlich.de; receiver=<UNKNOWN> Received: from mail.mail.packetmixer.de (packetmixer.de [79.140.42.25]) by open-mesh.org (Postfix) with ESMTPS id A69BB809DA for <b.a.t.m.a.n@lists.open-mesh.org>; Wed, 20 Dec 2017 12:01:30 +0100 (CET) Received: from kero.packetmixer.de (p2003007C6F45300071310ADA0098614F.dip0.t-ipconnect.de [IPv6:2003:7c:6f45:3000:7131:ada:98:614f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mail.packetmixer.de (Postfix) with ESMTPSA id 78FCD6201E; Wed, 20 Dec 2017 12:01:28 +0100 (CET) From: Simon Wunderlich <sw@simonwunderlich.de> To: davem@davemloft.net Date: Wed, 20 Dec 2017 12:01:05 +0100 Message-Id: <20171220110124.13117-1-sw@simonwunderlich.de> X-Mailer: git-send-email 2.11.0 Subject: [B.A.T.M.A.N.] [PATCH 00/19] pull request for net-next: batman-adv 2017-12-20 X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n.lists.open-mesh.org> List-Unsubscribe: <https://lists.open-mesh.org/mm/options/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=unsubscribe> List-Archive: <http://lists.open-mesh.org/pipermail/b.a.t.m.a.n/> List-Post: <mailto:b.a.t.m.a.n@lists.open-mesh.org> List-Help: <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=help> List-Subscribe: <https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=subscribe> Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n@lists.open-mesh.org> Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" <b.a.t.m.a.n-bounces@lists.open-mesh.org> |
Pull-request
git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20171220Message
Simon Wunderlich
Dec. 20, 2017, 11:01 a.m. UTC
Hi David, here is the updated feature/cleanup pull request of batman-adv to go into net-next. Compared to batman-adv 2017-12-15 pull request, we have dropped the 'batman-adv: Add License-Filename to GPL-2.0 files' as per your suggestion. Please pull or let me know of any problem! Thank you, Simon The following changes since commit 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323: Linux 4.15-rc1 (2017-11-26 16:01:47 -0800) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20171220 for you to fetch changes up to ff15c27c97303fbe5abc49c25c73ea299ab72d31: batman-adv: Add kernel-doc to externally visible functions (2017-12-15 17:29:24 +0100) ---------------------------------------------------------------- This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - de-inline hash functions to save memory footprint, by Denys Vlasenko - Add License information to various files, by Sven Eckelmann (3 patches) - Change batman_adv.h from ISC to MIT, by Sven Eckelmann - Improve various includes, by Sven Eckelmann (5 patches) - Lots of kernel-doc work by Sven Eckelmann (8 patches) ---------------------------------------------------------------- Denys Vlasenko (1): batman-adv: Deinline batadv_orig_hash_find, save 7339 bytes Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (17): batman-adv: Add SPDX license identifier above copyright header batman-adv: Add SPDX license identifier to batman-adv.rst batman-adv: Add license header to Kconfig batman-adv: Change batman_adv.h license to MIT batman-adv: include gfp.h for GFP_* defines batman-adv: include build_bug.h for BUILD_BUG_ON define batman-adv: Include net.h for net_ratelimited_function batman-adv: include kobject.h for kobject_* functions batman-adv: Remove unused sched.h include batman-adv: Add missing kernel-doc to packet.h batman-adv: Use parentheses in function kernel-doc batman-adv: Use inline kernel-doc for enum/struct batman-adv: Fix kernel-doc references to struct members batman-adv: Add kernel-doc to structs in headers batman-adv: Add kernel-doc to enums in headers batman-adv: Add kernel-doc to functions in headers batman-adv: Add kernel-doc to externally visible functions Documentation/networking/batman-adv.rst | 2 + include/uapi/linux/batman_adv.h | 27 +- net/batman-adv/Kconfig | 17 + net/batman-adv/Makefile | 2 +- net/batman-adv/bat_algo.c | 35 +- net/batman-adv/bat_algo.h | 1 + net/batman-adv/bat_iv_ogm.c | 105 +- net/batman-adv/bat_iv_ogm.h | 1 + net/batman-adv/bat_v.c | 49 +- net/batman-adv/bat_v.h | 1 + net/batman-adv/bat_v_elp.c | 27 +- net/batman-adv/bat_v_elp.h | 1 + net/batman-adv/bat_v_ogm.c | 37 +- net/batman-adv/bat_v_ogm.h | 1 + net/batman-adv/bitarray.c | 3 +- net/batman-adv/bitarray.h | 10 +- net/batman-adv/bridge_loop_avoidance.c | 112 +- net/batman-adv/bridge_loop_avoidance.h | 5 +- net/batman-adv/debugfs.c | 30 +- net/batman-adv/debugfs.h | 1 + net/batman-adv/distributed-arp-table.c | 80 +- net/batman-adv/distributed-arp-table.h | 7 +- net/batman-adv/fragmentation.c | 23 +- net/batman-adv/fragmentation.h | 3 +- net/batman-adv/gateway_client.c | 65 +- net/batman-adv/gateway_client.h | 1 + net/batman-adv/gateway_common.c | 28 +- net/batman-adv/gateway_common.h | 6 +- net/batman-adv/hard-interface.c | 65 +- net/batman-adv/hard-interface.h | 59 +- net/batman-adv/hash.c | 20 +- net/batman-adv/hash.h | 28 +- net/batman-adv/icmp_socket.c | 15 +- net/batman-adv/icmp_socket.h | 1 + net/batman-adv/log.c | 19 + net/batman-adv/log.h | 62 +- net/batman-adv/main.c | 52 +- net/batman-adv/main.h | 123 +- net/batman-adv/multicast.c | 81 +- net/batman-adv/multicast.h | 17 +- net/batman-adv/netlink.c | 25 +- net/batman-adv/netlink.h | 1 + net/batman-adv/network-coding.c | 124 +- net/batman-adv/network-coding.h | 1 + net/batman-adv/originator.c | 154 ++- net/batman-adv/originator.h | 47 +- net/batman-adv/packet.h | 26 +- net/batman-adv/routing.c | 54 +- net/batman-adv/routing.h | 1 + net/batman-adv/send.c | 66 +- net/batman-adv/send.h | 5 +- net/batman-adv/soft-interface.c | 64 +- net/batman-adv/soft-interface.h | 1 + net/batman-adv/sysfs.c | 56 +- net/batman-adv/sysfs.h | 14 + net/batman-adv/tp_meter.c | 75 +- net/batman-adv/tp_meter.h | 1 + net/batman-adv/translation-table.c | 232 ++-- net/batman-adv/translation-table.h | 1 + net/batman-adv/tvlv.c | 41 +- net/batman-adv/tvlv.h | 1 + net/batman-adv/types.h | 1993 +++++++++++++++++++++---------- 62 files changed, 2852 insertions(+), 1353 deletions(-)
Comments
From: Simon Wunderlich <sw@simonwunderlich.de> Date: Wed, 20 Dec 2017 12:01:05 +0100 > here is the updated feature/cleanup pull request of batman-adv to go > into net-next. Compared to batman-adv 2017-12-15 pull request, we have > dropped the 'batman-adv: Add License-Filename to GPL-2.0 files' as per > your suggestion. > > Please pull or let me know of any problem! Pulled, but there was a minor docbook annotation conflict I had to address. This pull added () to the function names in the docbook comments, but this overlapped with the fix of a variable name in the docbook info for the same function. It was trivial, but please take a look. Thanks.
On Mittwoch, 20. Dezember 2017 14:39:46 CET David Miller wrote: [...] > Pulled, but there was a minor docbook annotation conflict I had to > address. > > This pull added () to the function names in the docbook comments, > but this overlapped with the fix of a variable name in the docbook > info for the same function. > > It was trivial, but please take a look. Thanks, looks exactly like the merge I did while testing the net fixes with the net-next changes. Kind regards, Sven