Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/ehca: Use consistent types for ehca_plpar_hcall9()
  IB/ehca: Fix printk format warnings from u64 type change
  IPoIB: Do not print error messages for multicast join retries
  IB/mlx4: Fix memory ordering problem when posting LSO sends
  mlx4_core: Fix min() warning
  IPoIB: Fix deadlock between ipoib_open() and child interface create
  IPoIB: Fix hang in napi_disable() if P_Key is never found

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_uverbs.c b/drivers/infiniband/hw/ehca/ehca_uverbs.c
index e43ed8f8a0c8..3cb688d29131 100644
--- a/drivers/infiniband/hw/ehca/ehca_uverbs.c
+++ b/drivers/infiniband/hw/ehca/ehca_uverbs.c
@@ -114,7 +114,7 @@ static int ehca_mmap_fw(struct vm_area_struct *vma, struct h_galpas *galpas,
 
         physical = galpas->user.fw_handle;
         vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-        ehca_gen_dbg("vsize=%lx physical=%lx", vsize, physical);
+        ehca_gen_dbg("vsize=%llx physical=%llx", vsize, physical);
         /* VM_IO | VM_RESERVED are set by remap_pfn_range() */
         ret = remap_4k_pfn(vma, vma->vm_start, physical >> EHCA_PAGESHIFT,
                            vma->vm_page_prot);