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/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index b677a6ea6001..7706c8dc5fa6 100644
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -2645,7 +2645,7 @@ static void btrfsic_dump_tree_sub(const struct btrfsic_state *state,
          * This algorithm is recursive because the amount of used stack space
          * is very small and the max recursion depth is limited.
          */
-        indent_add = sprintf(buf, "%c-%llu(%s/%llu/%d)",
+        indent_add = sprintf(buf, "%c-%llu(%s/%llu/%u)",
                              btrfsic_get_block_type(state, block),
                              block->logical_bytenr, block->dev_state->name,
                              block->dev_bytenr, block->mirror_num);