The following commit has been merged in the master branch: commit bad5680b5052f9d3008a8cfcc0b34ba0da08401d Author: Sven Eckelmann sven@narfation.org Date: Sat Oct 7 14:21:22 2017 +0200

batman-adv: Add missing kerneldoc for extack

The parameter extack was added to batadv_softif_slave_add without adding the kernel-doc for it. This caused kernel-doc warnings.

Signed-off-by: Sven Eckelmann sven@narfation.org Acked-by: David Ahern dsahern@gmail.com Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 543d2c3e0f0d..9f673cdfecf8 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -863,6 +863,7 @@ free_bat_counters: * batadv_softif_slave_add - Add a slave interface to a batadv_soft_interface * @dev: batadv_soft_interface used as master interface * @slave_dev: net_device which should become the slave interface + * @extack: extended ACK report struct * * Return: 0 if successful or error otherwise. */