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

Pull staging/IIO updates from Greg KH:
 "Here is the big Staging and IIO driver patches for 4.16-rc1.

  There is the normal amount of new IIO drivers added, like all
  releases.

  The networking IPX and the ncpfs filesystem are moved into the staging
  tree, as they are on their way out of the kernel due to lack of use
  anymore.

  The visorbus subsystem finall has started moving out of the staging
  tree to the "real" part of the kernel, and the most and fsl-mc
  codebases are almost ready to move out, that will probably happen for
  4.17-rc1 if all goes well.

  Other than that, there is a bunch of license header cleanups in the
  tree, along with the normal amount of coding style churn that we all
  know and love for this codebase. I also got frustrated at the
  Meltdown/Spectre mess and took it out on the dgnc tty driver, deleting
  huge chunks of it that were never even being used.

  Full details of everything is in the shortlog.

  All of these patches have been in linux-next for a while with no
  reported issues"

* tag 'staging-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (627 commits)
  staging: rtlwifi: remove redundant initialization of 'cfg_cmd'
  staging: rtl8723bs: remove a couple of redundant initializations
  staging: comedi: reformat lines to 80 chars or less
  staging: lustre: separate a connection destroy from free struct kib_conn
  Staging: rtl8723bs: Use !x instead of NULL comparison
  Staging: rtl8723bs: Remove dead code
  Staging: rtl8723bs: Change names to conform to the kernel code
  staging: ccree: Fix missing blank line after declaration
  staging: rtl8188eu: remove redundant initialization of 'pwrcfgcmd'
  staging: rtlwifi: remove unused RTLHALMAC_ST and RTLPHYDM_ST
  staging: fbtft: remove unused FB_TFT_SSD1325 kconfig
  staging: comedi: dt2811: remove redundant initialization of 'ns'
  staging: wilc1000: fix alignments to match open parenthesis
  staging: wilc1000: removed unnecessary defined enums typedef
  staging: wilc1000: remove unnecessary use of parentheses
  staging: rtl8192u: remove redundant initialization of 'timeout'
  staging: sm750fb: fix CamelCase for dispSet var
  staging: lustre: lnet/selftest: fix compile error on UP build
  staging: rtl8723bs: hal_com_phycfg: Remove unneeded semicolons
  staging: rts5208: Fix "seg_no" calculation in reset_ms_card()
  ...

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/iio/industrialio-buffer.c
Simple merge

diff --cc drivers/staging/android/ashmem.c
Simple merge

diff --cc drivers/staging/comedi/comedi_fops.c
Simple merge

diff --cc drivers/staging/comedi/drivers/serial2002.c
Simple merge

diff --cc drivers/staging/ipx/ipx_proc.c
Simple merge

diff --cc drivers/staging/lustre/lnet/lnet/lib-socket.c
Simple merge

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/most/cdev/cdev.c
index 69f5309,dd9456f..c183489
--- 1/drivers/staging/most/aim-cdev/cdev.c
--- 2/drivers/staging/most/cdev/cdev.c
+++ b/drivers/staging/most/cdev/cdev.c
@@@ -287,10 -283,10 +283,10 @@@ comp_read(struct file *filp, char __use
        return copied;
  }
  
- static __poll_t aim_poll(struct file *filp, poll_table *wait)
 -static unsigned int comp_poll(struct file *filp, poll_table *wait)
++static __poll_t comp_poll(struct file *filp, poll_table *wait)
  {
-       struct aim_channel *c = filp->private_data;
+       struct comp_channel *c = filp->private_data;
 -      unsigned int mask = 0;
 +      __poll_t mask = 0;
  
        poll_wait(filp, &c->wq, wait);
  

diff --cc drivers/staging/most/video/video.c
index 7783bc2,0988738..ef23e85
--- 1/drivers/staging/most/aim-v4l2/video.c
--- 2/drivers/staging/most/video/video.c
+++ b/drivers/staging/most/video/video.c
@@@ -209,11 -203,11 +203,11 @@@ static ssize_t comp_vdev_read(struct fi
        return ret;
  }
  
- static __poll_t aim_vdev_poll(struct file *filp, poll_table *wait)
 -static unsigned int comp_vdev_poll(struct file *filp, poll_table *wait)
++static __poll_t comp_vdev_poll(struct file *filp, poll_table *wait)
  {
-       struct aim_fh *fh = filp->private_data;
+       struct comp_fh *fh = filp->private_data;
        struct most_video_dev *mdev = fh->mdev;
 -      unsigned int mask = 0;
 +      __poll_t mask = 0;
  
        /* only wait if no data is available */
        if (!data_ready(mdev))

diff --cc drivers/staging/ncpfs/sock.c
Simple merge

diff --cc drivers/staging/speakup/speakup_soft.c
Simple merge

diff --cc drivers/staging/vme/devices/vme_user.c
Simple merge

diff --cc fs/Kconfig
Simple merge

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

diff --cc kernel/workqueue.c
Simple merge

diff --cc net/Kconfig
Simple merge