The following commit has been merged in the merge/master branch: commit dbfacf6d106ccd90f7a56ce76d1bacbee6cf97e1 Merge: f808f1877a5abaf990e6c21daf63edadac849676 9685688ae7dd85804aec2f6ce760611551fe9635 Author: Marek Lindner mareklindner@neomailbox.ch Date: Sun May 8 06:32:33 2016 +0800

Merge branch 'maint' into next

diff --combined net/batman-adv/bat_v.c index 602e03e,1f960c9..0a12e5c --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@@ -27,6 -27,7 +27,7 @@@ #include <linux/rculist.h> #include <linux/rcupdate.h> #include <linux/seq_file.h> + #include <linux/stddef.h> #include <linux/types.h> #include <linux/workqueue.h>

@@@ -190,8 -191,8 +191,8 @@@ static void batadv_v_neigh_print(struc struct batadv_hard_iface *hard_iface; int batman_count = 0;

- seq_printf(seq, " %-15s %s (%11s) [%10s]\n", "Neighbor", - "last-seen", "throughput", "IF"); + seq_puts(seq, + " Neighbor last-seen ( throughput) [ IF]\n");

rcu_read_lock(); list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { @@@ -230,8 -231,9 +231,8 @@@ static void batadv_v_orig_print(struct int batman_count = 0; u32 i;

- seq_printf(seq, " %-15s %s (%11s) %17s [%10s]: %20s ...\n", - "Originator", "last-seen", "throughput", "Nexthop", - "outgoingIF", "Potential nexthops"); + seq_puts(seq, + " Originator last-seen ( throughput) Nexthop [outgoingIF]: Potential nexthops ...\n");

for (i = 0; i < hash->size; i++) { head = &hash->table[i];