Merge 4.12-rc5 into staging-next

We want the IIO fixes and other staging driver fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/iio/proximity/as3935.c
Simple merge

diff --cc drivers/staging/ccree/ssi_buffer_mgr.c
index 1ff603f8f8f5a0c79812cf37b1b2f1d195d4f492,6471d3d2d3752ff52ff6f7ba064858b81bfed9a4..88ebda854377243d03bf022aed62654375b6d29c
--- 1/drivers/staging/ccree/ssi_buffer_mgr.c
--- 2/drivers/staging/ccree/ssi_buffer_mgr.c
+++ b/drivers/staging/ccree/ssi_buffer_mgr.c
@@@ -136,13 -210,14 +136,14 @@@ void ssi_buffer_mgr_zero_sgl(struct sca
   */
  void ssi_buffer_mgr_copy_scatterlist_portion(
        u8 *dest, struct scatterlist *sg,
 -      uint32_t to_skip,  uint32_t end,
 +      u32 to_skip,  u32 end,
        enum ssi_sg_cpy_direct direct)
  {
 -      uint32_t nents, lbytes;
 +      u32 nents, lbytes;
  
        nents = ssi_buffer_mgr_get_sgl_nents(sg, end, &lbytes, NULL);
-       sg_copy_buffer(sg, nents, (void *)dest, (end - to_skip), 0, (direct == SSI_SG_TO_BUF));
+       sg_copy_buffer(sg, nents, (void *)dest, (end - to_skip + 1), to_skip,
+                      (direct == SSI_SG_TO_BUF));
  }
  
  static inline int ssi_buffer_mgr_render_buff_to_mlli(

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