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

batman at open-mesh.org batman at open-mesh.org
Tue Apr 2 00:21:10 CEST 2019


The following commit has been merged in the master branch:
commit ede1fd1851467a107f14faace274479dfe28a36c
Merge: 356d71e00d278d865f8c7f68adebd6ce4698a7e2 32e727449c792b689c2a06a8b4cc9fef6270c5a7
Author: David S. Miller <davem at davemloft.net>
Date:   Thu Mar 28 09:52:42 2019 -0700

    Merge tag 'batadv-next-for-davem-20190328' of git://git.open-mesh.org/linux-merge
    
    Simon Wunderlich says:
    
    ====================
    This feature/cleanup patchset includes the following patches:
    
     - Drop license boilerplate (obsoleted by SPDX license IDs),
       by Sven Eckelmann
    
     - Drop documentation for sysfs and debugfs Documentation,
       by Sven Eckelmann (2 patches)
    
     - Mark sysfs as optional and deprecated, by Sven Eckelmann (3 patches)
    
     - Update MAINTAINERS Tree, Chat and Bugtracker,
       by Sven Eckelmann (3 patches)
    
     - Rename batadv_dat_send_data, by Sven Eckelmann
    
     - update DAT entries with incoming ARP replies, by Linus Luessing
    
     - add multicast-to-unicast support for limited destinations,
       by Linus Luessing
    ====================
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

diff --combined MAINTAINERS
index 3e5a5d263f29,01eb5225e4ab..35cc403471ea
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2793,10 -2793,13 +2793,13 @@@ M:	Simon Wunderlich <sw at simonwunderlich
  M:	Antonio Quartulli <a at unstable.cc>
  L:	b.a.t.m.a.n at lists.open-mesh.org (moderated for non-subscribers)
  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/testing/sysfs-class-net-batman-adv
- F:	Documentation/ABI/testing/sysfs-class-net-mesh
+ F:	Documentation/ABI/obsolete/sysfs-class-net-batman-adv
+ F:	Documentation/ABI/obsolete/sysfs-class-net-mesh
  F:	Documentation/networking/batman-adv.rst
  F:	include/uapi/linux/batadv_packet.h
  F:	include/uapi/linux/batman_adv.h
@@@ -5278,7 -5281,7 +5281,7 @@@ DRM DRIVERS FOR VIVANTE GPU I
  M:	Lucas Stach <l.stach at pengutronix.de>
  R:	Russell King <linux+etnaviv at armlinux.org.uk>
  R:	Christian Gmeiner <christian.gmeiner at gmail.com>
 -L:	etnaviv at lists.freedesktop.org
 +L:	etnaviv at lists.freedesktop.org (moderated for non-subscribers)
  L:	dri-devel at lists.freedesktop.org
  S:	Maintained
  F:	drivers/gpu/drm/etnaviv/
@@@ -8096,16 -8099,6 +8099,16 @@@ F:	include/linux/iommu.
  F:	include/linux/of_iommu.h
  F:	include/linux/iova.h
  
 +IO_URING
 +M:	Jens Axboe <axboe at kernel.dk>
 +L:	linux-block at vger.kernel.org
 +L:	linux-fsdevel at vger.kernel.org
 +T:	git git://git.kernel.dk/linux-block
 +T:	git git://git.kernel.dk/liburing
 +S:	Maintained
 +F:	fs/io_uring.c
 +F:	include/uapi/linux/io_uring.h
 +
  IP MASQUERADING
  M:	Juanjo Ciarlante <jjciarla at raiz.uncu.edu.ar>
  S:	Maintained
@@@ -8471,7 -8464,6 +8474,7 @@@ F:	include/linux/kvm
  F:	include/kvm/iodev.h
  F:	virt/kvm/*
  F:	tools/kvm/
 +F:	tools/testing/selftests/kvm/
  
  KERNEL VIRTUAL MACHINE FOR AMD-V (KVM/amd)
  M:	Joerg Roedel <joro at 8bytes.org>
@@@ -8481,25 -8473,29 +8484,25 @@@ S:	Maintaine
  F:	arch/x86/include/asm/svm.h
  F:	arch/x86/kvm/svm.c
  
 -KERNEL VIRTUAL MACHINE FOR ARM (KVM/arm)
 +KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
  M:	Christoffer Dall <christoffer.dall at arm.com>
  M:	Marc Zyngier <marc.zyngier at arm.com>
 +R:	James Morse <james.morse at arm.com>
 +R:	Julien Thierry <julien.thierry at arm.com>
 +R:	Suzuki K Pouloze <suzuki.poulose at arm.com>
  L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
  L:	kvmarm at lists.cs.columbia.edu
  W:	http://systems.cs.columbia.edu/projects/kvm-arm
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
 -S:	Supported
 +S:	Maintained
  F:	arch/arm/include/uapi/asm/kvm*
  F:	arch/arm/include/asm/kvm*
  F:	arch/arm/kvm/
 -F:	virt/kvm/arm/
 -F:	include/kvm/arm_*
 -
 -KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
 -M:	Christoffer Dall <christoffer.dall at arm.com>
 -M:	Marc Zyngier <marc.zyngier at arm.com>
 -L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
 -L:	kvmarm at lists.cs.columbia.edu
 -S:	Maintained
  F:	arch/arm64/include/uapi/asm/kvm*
  F:	arch/arm64/include/asm/kvm*
  F:	arch/arm64/kvm/
 +F:	virt/kvm/arm/
 +F:	include/kvm/arm_*
  
  KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
  M:	James Hogan <jhogan at kernel.org>
diff --combined net/batman-adv/netlink.c
index d3033a3d2a63,daf56933223d..e7907308b331
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@@ -2,18 -2,6 +2,6 @@@
  /* Copyright (C) 2016-2019  B.A.T.M.A.N. contributors:
   *
   * Matthias Schiffer
-  *
-  * 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/>.
   */
  
  #include "netlink.h"
@@@ -157,6 -145,7 +145,7 @@@ static const struct nla_policy batadv_n
  	[BATADV_ATTR_HOP_PENALTY]		= { .type = NLA_U8 },
  	[BATADV_ATTR_LOG_LEVEL]			= { .type = NLA_U32 },
  	[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED]	= { .type = NLA_U8 },
+ 	[BATADV_ATTR_MULTICAST_FANOUT]		= { .type = NLA_U32 },
  	[BATADV_ATTR_NETWORK_CODING_ENABLED]	= { .type = NLA_U8 },
  	[BATADV_ATTR_ORIG_INTERVAL]		= { .type = NLA_U32 },
  	[BATADV_ATTR_ELP_INTERVAL]		= { .type = NLA_U32 },
@@@ -353,6 -342,10 +342,10 @@@ static int batadv_netlink_mesh_fill(str
  	if (nla_put_u8(msg, BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED,
  		       !atomic_read(&bat_priv->multicast_mode)))
  		goto nla_put_failure;
+ 
+ 	if (nla_put_u32(msg, BATADV_ATTR_MULTICAST_FANOUT,
+ 			atomic_read(&bat_priv->multicast_fanout)))
+ 		goto nla_put_failure;
  #endif /* CONFIG_BATMAN_ADV_MCAST */
  
  #ifdef CONFIG_BATMAN_ADV_NC
@@@ -592,6 -585,12 +585,12 @@@ static int batadv_netlink_set_mesh(stru
  
  		atomic_set(&bat_priv->multicast_mode, !nla_get_u8(attr));
  	}
+ 
+ 	if (info->attrs[BATADV_ATTR_MULTICAST_FANOUT]) {
+ 		attr = info->attrs[BATADV_ATTR_MULTICAST_FANOUT];
+ 
+ 		atomic_set(&bat_priv->multicast_fanout, nla_get_u32(attr));
+ 	}
  #endif /* CONFIG_BATMAN_ADV_MCAST */
  
  #ifdef CONFIG_BATMAN_ADV_NC
@@@ -1345,29 -1344,34 +1344,29 @@@ static const struct genl_ops batadv_net
  	{
  		.cmd = BATADV_CMD_GET_MESH,
  		/* can be retrieved by unprivileged users */
 -		.policy = batadv_netlink_policy,
  		.doit = batadv_netlink_get_mesh,
  		.internal_flags = BATADV_FLAG_NEED_MESH,
  	},
  	{
  		.cmd = BATADV_CMD_TP_METER,
  		.flags = GENL_ADMIN_PERM,
 -		.policy = batadv_netlink_policy,
  		.doit = batadv_netlink_tp_meter_start,
  		.internal_flags = BATADV_FLAG_NEED_MESH,
  	},
  	{
  		.cmd = BATADV_CMD_TP_METER_CANCEL,
  		.flags = GENL_ADMIN_PERM,
 -		.policy = batadv_netlink_policy,
  		.doit = batadv_netlink_tp_meter_cancel,
  		.internal_flags = BATADV_FLAG_NEED_MESH,
  	},
  	{
  		.cmd = BATADV_CMD_GET_ROUTING_ALGOS,
  		.flags = GENL_ADMIN_PERM,
 -		.policy = batadv_netlink_policy,
  		.dumpit = batadv_algo_dump,
  	},
  	{
  		.cmd = BATADV_CMD_GET_HARDIF,
  		/* can be retrieved by unprivileged users */
 -		.policy = batadv_netlink_policy,
  		.dumpit = batadv_netlink_dump_hardif,
  		.doit = batadv_netlink_get_hardif,
  		.internal_flags = BATADV_FLAG_NEED_MESH |
@@@ -1376,57 -1380,68 +1375,57 @@@
  	{
  		.cmd = BATADV_CMD_GET_TRANSTABLE_LOCAL,
  		.flags = GENL_ADMIN_PERM,
 -		.policy = batadv_netlink_policy,
  		.dumpit = batadv_tt_local_dump,
  	},
  	{
  		.cmd = BATADV_CMD_GET_TRANSTABLE_GLOBAL,
  		.flags = GENL_ADMIN_PERM,
 -		.policy = batadv_netlink_policy,
  		.dumpit = batadv_tt_global_dump,
  	},
  	{
  		.cmd = BATADV_CMD_GET_ORIGINATORS,
  		.flags = GENL_ADMIN_PERM,
 -		.policy = batadv_netlink_policy,
  		.dumpit = batadv_orig_dump,
  	},
  	{
  		.cmd = BATADV_CMD_GET_NEIGHBORS,
  		.flags = GENL_ADMIN_PERM,
 -		.policy = batadv_netlink_policy,
  		.dumpit = batadv_hardif_neigh_dump,
  	},
  	{
  		.cmd = BATADV_CMD_GET_GATEWAYS,
  		.flags = GENL_ADMIN_PERM,
 -		.policy = batadv_netlink_policy,
  		.dumpit = batadv_gw_dump,
  	},
  	{
  		.cmd = BATADV_CMD_GET_BLA_CLAIM,
  		.flags = GENL_ADMIN_PERM,
 -		.policy = batadv_netlink_policy,
  		.dumpit = batadv_bla_claim_dump,
  	},
  	{
  		.cmd = BATADV_CMD_GET_BLA_BACKBONE,
  		.flags = GENL_ADMIN_PERM,
 -		.policy = batadv_netlink_policy,
  		.dumpit = batadv_bla_backbone_dump,
  	},
  	{
  		.cmd = BATADV_CMD_GET_DAT_CACHE,
  		.flags = GENL_ADMIN_PERM,
 -		.policy = batadv_netlink_policy,
  		.dumpit = batadv_dat_cache_dump,
  	},
  	{
  		.cmd = BATADV_CMD_GET_MCAST_FLAGS,
  		.flags = GENL_ADMIN_PERM,
 -		.policy = batadv_netlink_policy,
  		.dumpit = batadv_mcast_flags_dump,
  	},
  	{
  		.cmd = BATADV_CMD_SET_MESH,
  		.flags = GENL_ADMIN_PERM,
 -		.policy = batadv_netlink_policy,
  		.doit = batadv_netlink_set_mesh,
  		.internal_flags = BATADV_FLAG_NEED_MESH,
  	},
  	{
  		.cmd = BATADV_CMD_SET_HARDIF,
  		.flags = GENL_ADMIN_PERM,
 -		.policy = batadv_netlink_policy,
  		.doit = batadv_netlink_set_hardif,
  		.internal_flags = BATADV_FLAG_NEED_MESH |
  				  BATADV_FLAG_NEED_HARDIF,
@@@ -1434,6 -1449,7 +1433,6 @@@
  	{
  		.cmd = BATADV_CMD_GET_VLAN,
  		/* can be retrieved by unprivileged users */
 -		.policy = batadv_netlink_policy,
  		.doit = batadv_netlink_get_vlan,
  		.internal_flags = BATADV_FLAG_NEED_MESH |
  				  BATADV_FLAG_NEED_VLAN,
@@@ -1441,6 -1457,7 +1440,6 @@@
  	{
  		.cmd = BATADV_CMD_SET_VLAN,
  		.flags = GENL_ADMIN_PERM,
 -		.policy = batadv_netlink_policy,
  		.doit = batadv_netlink_set_vlan,
  		.internal_flags = BATADV_FLAG_NEED_MESH |
  				  BATADV_FLAG_NEED_VLAN,
@@@ -1452,7 -1469,6 +1451,7 @@@ struct genl_family batadv_netlink_famil
  	.name = BATADV_NL_NAME,
  	.version = 1,
  	.maxattr = BATADV_ATTR_MAX,
 +	.policy = batadv_netlink_policy,
  	.netnsok = true,
  	.pre_doit = batadv_pre_doit,
  	.post_doit = batadv_post_doit,

-- 
LinuxNextTracking


More information about the linux-merge mailing list