Merge branch 'work.get_user_pages_fast' of git://git.kernel.org/pub/scm/linux/kernel...

Pull get_user_pages_fast() conversion from Al Viro:
 "A bunch of places switched to get_user_pages_fast()"

* 'work.get_user_pages_fast' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ceph: use get_user_pages_fast()
  pvr2fs: use get_user_pages_fast()
  atomisp: use get_user_pages_fast()
  st: use get_user_pages_fast()
  via_dmablit(): use get_user_pages_fast()
  fsl_hypervisor: switch to get_user_pages_fast()
  rapidio: switch to get_user_pages_fast()
  vchiq_2835_arm: switch to get_user_pages_fast()

diff --cc drivers/rapidio/devices/rio_mport_cdev.c
Simple merge

diff --cc drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
Simple merge

diff --cc drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index eea2d78b0ec6a6b867da7b2e797b0afd75a9ea54,cd2b19f335d8d1466855cd515d8ab80b31f9716c..315b49c1de3bb323f4383e4ba8acb3e3ded422b1
--- 1/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
--- 2/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@@ -387,16 -381,15 +385,15 @@@ cleanup_pagelistinfo(struct vchiq_pagel
  }
  
  /* There is a potential problem with partial cache lines (pages?)
 -** at the ends of the block when reading. If the CPU accessed anything in
 -** the same line (page?) then it may have pulled old data into the cache,
 -** obscuring the new data underneath. We can solve this by transferring the
 -** partial cache lines separately, and allowing the ARM to copy into the
 -** cached area.
 -*/
 + * at the ends of the block when reading. If the CPU accessed anything in
 + * the same line (page?) then it may have pulled old data into the cache,
 + * obscuring the new data underneath. We can solve this by transferring the
 + * partial cache lines separately, and allowing the ARM to copy into the
 + * cached area.
 + */
  
  static struct vchiq_pagelist_info *
- create_pagelist(char __user *buf, size_t count, unsigned short type,
-               struct task_struct *task)
+ create_pagelist(char __user *buf, size_t count, unsigned short type)
  {
        PAGELIST_T *pagelist;
        struct vchiq_pagelist_info *pagelistinfo;

diff --cc net/ceph/pagevec.c
Simple merge