linux-next: build failure after merge of the nfs tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

Hi Trond,

After merging the nfs tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_pmr_pool_map':
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:2: error: implicit declaration of function 'ib_reg_phys_mr' [-Werror=implicit-function-declaration]
  pmr->pmr_mr = ib_reg_phys_mr(hdev->ibh_pd,
  ^
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1828:14: warning: assignment makes pointer from integer without a cast
  pmr->pmr_mr = ib_reg_phys_mr(hdev->ibh_pd,
              ^
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_hdev_setup_mrs':
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2380:6: warning: assignment makes pointer from integer without a cast
   mr = ib_reg_phys_mr(hdev->ibh_pd, &ipb, 1, acflags, &iova);
      ^

Caused by commit

  1241d7bf2ac8 ("core: Remove the ib_reg_phys_mr() and ib_rereg_phys_mr() verbs")

which noted this build failure would occur :-(

Since this commit is self comtained, I have reverted it until someone
provides a fix for the lustre code.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au