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

batman at open-mesh.org batman at open-mesh.org
Thu Jun 15 00:15:37 CEST 2017

The following commit has been merged in the master branch:
commit 912eeed9f5208515b75103e91ff8b64cfdcca7b9
Author: Markus Elfring <elfring at users.sourceforge.net>
Date:   Sat May 6 17:57:36 2017 +0200

    batman-adv: Combine two seq_puts() calls into one call in batadv_nc_nodes_seq_print_text()
    A bit of text was put into a sequence by two separate function calls.
    Print the same data by a single function call instead.
    This issue was detected by using the Coccinelle software.
    Signed-off-by: Markus Elfring <elfring at users.sourceforge.net>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
index e1f6fc72fe3e..3604d7899e2c 100644
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@ -1935,9 +1935,7 @@ int batadv_nc_nodes_seq_print_text(struct seq_file *seq, void *offset)
 				seq_printf(seq, "%pM ",
-			seq_puts(seq, "\n");
-			seq_puts(seq, " Outgoing: ");
+			seq_puts(seq, "\n Outgoing: ");
 			/* For out_nc_node to this orig_node */


More information about the linux-merge mailing list