Merge tag 'v3.9-rc3' into drm-intel-next-queued

Backmerge so that I can merge Imre Deak's coalesced sg entries fixes,
which depend upon the new for_each_sg_page introduce in

commit a321e91b6d73ed011ffceed384c40d2785cf723b
Author: Imre Deak <imre.deak@intel.com>
Date:   Wed Feb 27 17:02:56 2013 -0800

    lib/scatterlist: add simple page iterator

The merge itself is just two trivial conflicts:

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 11 insertions, 8 deletions

diff --git a/include/linux/mlx4/qp.h b/include/linux/mlx4/qp.h
index 4b4ad6ffef92..67f46ad6920a 100644
--- a/include/linux/mlx4/qp.h
+++ b/include/linux/mlx4/qp.h
@@ -265,6 +265,11 @@ struct mlx4_wqe_lso_seg {
         __be32                  header[0];
 };
 
+enum mlx4_wqe_bind_seg_flags2 {
+        MLX4_WQE_BIND_ZERO_BASED = (1 << 30),
+        MLX4_WQE_BIND_TYPE_2     = (1 << 31),
+};
+
 struct mlx4_wqe_bind_seg {
         __be32                  flags1;
         __be32                  flags2;
@@ -277,9 +282,9 @@ struct mlx4_wqe_bind_seg {
 enum {
         MLX4_WQE_FMR_PERM_LOCAL_READ    = 1 << 27,
         MLX4_WQE_FMR_PERM_LOCAL_WRITE   = 1 << 28,
-        MLX4_WQE_FMR_PERM_REMOTE_READ   = 1 << 29,
-        MLX4_WQE_FMR_PERM_REMOTE_WRITE  = 1 << 30,
-        MLX4_WQE_FMR_PERM_ATOMIC        = 1 << 31
+        MLX4_WQE_FMR_AND_BIND_PERM_REMOTE_READ  = 1 << 29,
+        MLX4_WQE_FMR_AND_BIND_PERM_REMOTE_WRITE = 1 << 30,
+        MLX4_WQE_FMR_AND_BIND_PERM_ATOMIC       = 1 << 31
 };
 
 struct mlx4_wqe_fmr_seg {
@@ -304,12 +309,10 @@ struct mlx4_wqe_fmr_ext_seg {
 };
 
 struct mlx4_wqe_local_inval_seg {
-        __be32                  flags;
-        u32                     reserved1;
+        u64                     reserved1;
         __be32                  mem_key;
-        u32                     reserved2[2];
-        __be32                  guest_id;
-        __be64                  pa;
+        u32                     reserved2;
+        u64                     reserved3[2];
 };
 
 struct mlx4_wqe_raddr_seg {