Merge tag 'staging-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

Pull staging and IIO driver updates from Greg KH:
 "Here's the big staging and iio driver update for 4.7-rc1.

  I think we almost broke even with this release, only adding a few more
  lines than we removed, which isn't bad overall given that there's a
  bunch of new iio drivers added.

  The Lustre developers seem to have woken up from their sleep and have
  been doing a great job in cleaning up the code and pruning unused or
  old cruft, the filesystem is almost readable :)

  Other than that, just a lot of basic coding style cleanups in the
  churn.  All have been in linux-next for a while with no reported
  issues"

* tag 'staging-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (938 commits)
  Staging: emxx_udc: emxx_udc: fixed coding style issue
  staging/gdm724x: fix "alignment should match open parenthesis" issues
  staging/gdm724x: Fix avoid CamelCase
  staging: unisys: rename misleading var ii with frag
  staging: unisys: visorhba: switch success handling to error handling
  staging: unisys: visorhba: main path needs to flow down the left margin
  staging: unisys: visorinput: handle_locking_key() simplifications
  staging: unisys: visorhba: fail gracefully for thread creation failures
  staging: unisys: visornic: comment restructuring and removing bad diction
  staging: unisys: fix format string %Lx to %llx for u64
  staging: unisys: remove unused struct members
  staging: unisys: visorchannel: correct variable misspelling
  staging: unisys: visorhba: replace functionlike macro with function
  staging: dgnc: Need to check for NULL of ch
  staging: dgnc: remove redundant condition check
  staging: dgnc: fix 'line over 80 characters'
  staging: dgnc: clean up the dgnc_get_modem_info()
  staging: lustre: lnet: enable configuration per NI interface
  staging: lustre: o2iblnd: properly set ibr_why
  staging: lustre: o2iblnd: remove last of kiblnd_tunables_fini
  ...

diff --cc Documentation/DocBook/device-drivers.tmpl
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc Documentation/driver-model/devres.txt
index 76a6c0a,bdc2dfb..c63eea0
--- 1/Documentation/driver-model/devres.txt
--- 2/Documentation/driver-model/devres.txt
+++ b/Documentation/driver-model/devres.txt
@@@ -268,10 -267,11 +268,14 @@@ II
    devm_iio_kfifo_free()
    devm_iio_trigger_alloc()
    devm_iio_trigger_free()
+   devm_iio_channel_get()
+   devm_iio_channel_release()
+   devm_iio_channel_get_all()
+   devm_iio_channel_release_all()
  
 +INPUT
 +  devm_input_allocate_device()
 +
  IO region
    devm_release_mem_region()
    devm_release_region()

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_execbuffer.c
Simple merge

diff --cc drivers/iio/dac/Kconfig
Simple merge

diff --cc drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
Simple merge

diff --cc drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
Simple merge

diff --cc drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h
Simple merge

diff --cc drivers/staging/dgnc/dgnc_tty.c
Simple merge

diff --cc drivers/staging/fwserial/fwserial.c
Simple merge

diff --cc drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index 0d32e65,d99b4fa..6c59f2f
--- 1/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
--- 2/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@@ -1493,14 -1651,88 +1651,88 @@@ int kiblnd_fmr_pool_map(kib_fmr_poolset
        list_for_each_entry(fpo, &fps->fps_pool_list, fpo_list) {
                fpo->fpo_deadline = cfs_time_shift(IBLND_POOL_DEADLINE);
                fpo->fpo_map_count++;
-               spin_unlock(&fps->fps_lock);
  
-               pfmr = ib_fmr_pool_map_phys(fpo->fpo_fmr_pool,
-                                           pages, npages, iov);
-               if (likely(!IS_ERR(pfmr))) {
-                       fmr->fmr_pool = fpo;
-                       fmr->fmr_pfmr = pfmr;
-                       return 0;
+               if (fpo->fpo_is_fmr) {
+                       struct ib_pool_fmr *pfmr;
+ 
+                       spin_unlock(&fps->fps_lock);
+ 
+                       if (!tx_pages_mapped) {
+                               npages = kiblnd_map_tx_pages(tx, rd);
+                               tx_pages_mapped = 1;
+                       }
+ 
+                       pfmr = ib_fmr_pool_map_phys(fpo->fmr.fpo_fmr_pool,
+                                                   pages, npages, iov);
+                       if (likely(!IS_ERR(pfmr))) {
+                               fmr->fmr_key = is_rx ? pfmr->fmr->rkey :
+                                                      pfmr->fmr->lkey;
+                               fmr->fmr_frd = NULL;
+                               fmr->fmr_pfmr = pfmr;
+                               fmr->fmr_pool = fpo;
+                               return 0;
+                       }
+                       rc = PTR_ERR(pfmr);
+               } else {
+                       if (!list_empty(&fpo->fast_reg.fpo_pool_list)) {
+                               struct kib_fast_reg_descriptor *frd;
+                               struct ib_reg_wr *wr;
+                               struct ib_mr *mr;
+                               int n;
+ 
+                               frd = list_first_entry(&fpo->fast_reg.fpo_pool_list,
+                                                      struct kib_fast_reg_descriptor,
+                                                      frd_list);
+                               list_del(&frd->frd_list);
+                               spin_unlock(&fps->fps_lock);
+ 
+                               mr = frd->frd_mr;
+ 
+                               if (!frd->frd_valid) {
+                                       __u32 key = is_rx ? mr->rkey : mr->lkey;
+                                       struct ib_send_wr *inv_wr;
+ 
+                                       inv_wr = &frd->frd_inv_wr;
+                                       memset(inv_wr, 0, sizeof(*inv_wr));
+                                       inv_wr->opcode = IB_WR_LOCAL_INV;
+                                       inv_wr->wr_id = IBLND_WID_MR;
+                                       inv_wr->ex.invalidate_rkey = key;
+ 
+                                       /* Bump the key */
+                                       key = ib_inc_rkey(key);
+                                       ib_update_fast_reg_key(mr, key);
+                               }
+ 
+                               n = ib_map_mr_sg(mr, tx->tx_frags,
 -                                               tx->tx_nfrags, PAGE_SIZE);
++                                               tx->tx_nfrags, NULL, PAGE_SIZE);
+                               if (unlikely(n != tx->tx_nfrags)) {
+                                       CERROR("Failed to map mr %d/%d elements\n",
+                                              n, tx->tx_nfrags);
+                                       return n < 0 ? n : -EINVAL;
+                               }
+ 
+                               mr->iova = iov;
+ 
+                               /* Prepare FastReg WR */
+                               wr = &frd->frd_fastreg_wr;
+                               memset(wr, 0, sizeof(*wr));
+                               wr->wr.opcode = IB_WR_REG_MR;
+                               wr->wr.wr_id = IBLND_WID_MR;
+                               wr->wr.num_sge = 0;
+                               wr->wr.send_flags = 0;
+                               wr->mr = mr;
+                               wr->key = is_rx ? mr->rkey : mr->lkey;
+                               wr->access = (IB_ACCESS_LOCAL_WRITE |
+                                             IB_ACCESS_REMOTE_WRITE);
+ 
+                               fmr->fmr_key = is_rx ? mr->rkey : mr->lkey;
+                               fmr->fmr_frd = frd;
+                               fmr->fmr_pfmr = NULL;
+                               fmr->fmr_pool = fpo;
+                               return 0;
+                       }
+                       spin_unlock(&fps->fps_lock);
+                       rc = -EBUSY;
                }
  
                spin_lock(&fps->fps_lock);

diff --cc drivers/staging/lustre/lustre/llite/dir.c
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/llite_internal.h
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/rw26.c
index 0c3459c,9341189..c12a048
--- 1/drivers/staging/lustre/lustre/llite/rw26.c
--- 2/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@@ -364,8 -351,7 +350,8 @@@ static ssize_t ll_direct_IO_26(struct k
        struct cl_io *io;
        struct file *file = iocb->ki_filp;
        struct inode *inode = file->f_mapping->host;
-       struct ccc_object *obj = cl_inode2ccc(inode);
+       struct vvp_object *obj = cl_inode2vvp(inode);
 +      loff_t file_offset = iocb->ki_pos;
        ssize_t count = iov_iter_count(iter);
        ssize_t tot_bytes = 0, result = 0;
        struct ll_inode_info *lli = ll_i2info(inode);

diff --cc drivers/staging/lustre/lustre/llite/xattr.c
Simple merge

diff --cc drivers/staging/rtl8192u/r8192U_core.c
Simple merge

diff --cc drivers/staging/unisys/visorbus/visorchipset.c
Simple merge

diff --cc drivers/staging/vme/devices/vme_pio2_gpio.c
index 6d36120,f52a9ed..ba9fe3b
--- 1/drivers/staging/vme/devices/vme_pio2_gpio.c
--- 2/drivers/staging/vme/devices/vme_pio2_gpio.c
+++ b/drivers/staging/vme/devices/vme_pio2_gpio.c
@@@ -92,10 -97,10 +92,10 @@@ static void pio2_gpio_set(struct gpio_c
  }
  
  /* Directionality configured at board build - send appropriate response */
- static int pio2_gpio_dir_in(struct gpio_chip *chip, unsigned offset)
+ static int pio2_gpio_dir_in(struct gpio_chip *chip, unsigned int offset)
  {
        int data;
 -      struct pio2_card *card = gpio_to_pio2_card(chip);
 +      struct pio2_card *card = gpiochip_get_data(chip);
  
        if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
            (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
@@@ -111,10 -116,11 +111,11 @@@
  }
  
  /* Directionality configured at board build - send appropriate response */
- static int pio2_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int value)
+ static int pio2_gpio_dir_out(struct gpio_chip *chip,
+                            unsigned int offset, int value)
  {
        int data;
 -      struct pio2_card *card = gpio_to_pio2_card(chip);
 +      struct pio2_card *card = gpiochip_get_data(chip);
  
        if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
            (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {

diff --cc drivers/staging/vt6656/main_usb.c
Simple merge

diff --cc drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
Simple merge

diff --cc drivers/staging/wlan-ng/cfg80211.c
Simple merge

diff --cc drivers/staging/wlan-ng/p80211netdev.c
Simple merge

diff --cc include/linux/kernel.h
Simple merge

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