Merge branch 'multipath_tcp'

diff --cc fs/nfs/client.c
Simple merge

diff --cc fs/nfs/internal.h
Simple merge

diff --cc include/linux/sunrpc/sched.h
Simple merge

diff --cc net/sunrpc/stats.c
index 48ea776364f831c1c3e0bcb784d33ae6213cfbf9,d26df6074bca100bed4fcb22099ea3f84ee1ec15..7c74197c2ecfc67f1ccb50a7aa7bf5d68f17b90c
--- 1/net/sunrpc/stats.c
--- 2/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@@ -236,13 -233,19 +236,20 @@@ static void _print_rpc_iostats(struct s
                   stats->om_bytes_recv,
                   ktime_to_ms(stats->om_queue),
                   ktime_to_ms(stats->om_rtt),
 -                 ktime_to_ms(stats->om_execute));
 +                 ktime_to_ms(stats->om_execute),
 +                 stats->om_error_status);
  }
  
+ static int do_print_stats(struct rpc_clnt *clnt, struct rpc_xprt *xprt, void *seqv)
+ {
+       struct seq_file *seq = seqv;
+ 
+       xprt->ops->print_stats(xprt, seq);
+       return 0;
+ }
+ 
  void rpc_clnt_show_stats(struct seq_file *seq, struct rpc_clnt *clnt)
  {
-       struct rpc_xprt *xprt;
        unsigned int op, maxproc = clnt->cl_maxproc;
  
        if (!clnt->cl_metrics)