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

batman at open-mesh.org batman at open-mesh.org
Sat Aug 5 00:16:03 CEST 2017


The following commit has been merged in the master branch:
commit cd0edf3ada13e9c268713a913387a88be30634dc
Author: Joe Perches <joe at perches.com>
Date:   Wed Jun 14 02:33:52 2017 -0700

    batman-adv: Remove unnecessary length qualifier in %14pM
    
    It's misleading and unnecessary.
    
    Signed-off-by: Joe Perches <joe at perches.com>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index 6930d6b50f99..b6cfa78e9381 100644
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -834,7 +834,7 @@ int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset)
 			last_seen_msecs = last_seen_msecs % 60000;
 			last_seen_secs = last_seen_msecs / 1000;
 
-			seq_printf(seq, " * %15pI4 %14pM %4i %6i:%02i\n",
+			seq_printf(seq, " * %15pI4 %pM %4i %6i:%02i\n",
 				   &dat_entry->ip, dat_entry->mac_addr,
 				   batadv_print_vid(dat_entry->vid),
 				   last_seen_mins, last_seen_secs);

-- 
LinuxNextTracking


More information about the linux-merge mailing list