Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/testing/selftests/vm/compaction_test.c b/tools/testing/selftests/vm/compaction_test.c
index 932ff577ffc0..00c4f65d12da 100644
--- a/tools/testing/selftests/vm/compaction_test.c
+++ b/tools/testing/selftests/vm/compaction_test.c
@@ -136,7 +136,7 @@ int check_compaction(unsigned long mem_free, unsigned int hugepage_size)
         printf("No of huge pages allocated = %d\n",
                (atoi(nr_hugepages)));
 
-        if (write(fd, initial_nr_hugepages, sizeof(initial_nr_hugepages))
+        if (write(fd, initial_nr_hugepages, strlen(initial_nr_hugepages))
             != strlen(initial_nr_hugepages)) {
                 perror("Failed to write to /proc/sys/vm/nr_hugepages\n");
                 goto close_fd;