Merge remote-tracking branch 'staging/staging-next'

diff --cc Documentation/DocBook/Makefile
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/Kconfig
index 3f9f058,e29293c..66d796f
--- 1/drivers/staging/Kconfig
--- 2/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -112,10 -108,6 +108,12 @@@ source "drivers/staging/fsl-mc/Kconfig
  
  source "drivers/staging/wilc1000/Kconfig"
  
 +source "drivers/staging/amso1100/Kconfig"
 +
 +source "drivers/staging/ipath/Kconfig"
 +
 +source "drivers/staging/hfi1/Kconfig"
 +
+ source "drivers/staging/most/Kconfig"
+ 
  endif # STAGING

diff --cc drivers/staging/Makefile
index 20f8276,50824dd..026d3a0
--- 1/drivers/staging/Makefile
--- 2/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -48,6 -46,4 +46,7 @@@ obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) +
  obj-$(CONFIG_FB_TFT)          += fbtft/
  obj-$(CONFIG_FSL_MC_BUS)      += fsl-mc/
  obj-$(CONFIG_WILC1000)                += wilc1000/
 +obj-$(CONFIG_INFINIBAND_AMSO1100)     += amso1100/
 +obj-$(CONFIG_INFINIBAND_IPATH)        += ipath/
 +obj-$(CONFIG_INFINIBAND_HFI1) += hfi1/
+ obj-$(CONFIG_MOST)            += most/

diff --cc drivers/staging/android/ion/ion_chunk_heap.c
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/lloop.c
index 1e33d54,06f5e51..2d317f7
--- 1/drivers/staging/lustre/lustre/llite/lloop.c
--- 2/drivers/staging/lustre/lustre/llite/lloop.c
+++ b/drivers/staging/lustre/lustre/llite/lloop.c
@@@ -378,7 -376,7 +378,7 @@@ static inline void loop_handle_bio(stru
        while (bio) {
                struct bio *tmp = bio->bi_next;
                bio->bi_next = NULL;
-               cfs_bio_endio(bio, bio->bi_iter.bi_size, ret);
 -              bio_endio(bio, ret);
++              bio_endio(bio);
                bio = tmp;
        }
  }

diff --cc drivers/staging/octeon/ethernet-tx.c
Simple merge

diff --cc drivers/staging/octeon/ethernet.c
Simple merge

diff --cc drivers/staging/wilc1000/linux_mon.c
index a1f66ad,123468a..b8d7d04
--- 1/drivers/staging/wilc1000/linux_mon.c
--- 2/drivers/staging/wilc1000/linux_mon.c
+++ b/drivers/staging/wilc1000/linux_mon.c
@@@ -493,9 -480,9 +480,9 @@@ static void WILC_WFI_mon_setup(struct n
        /* dev->destructor = free_netdev; */
        PRINT_INFO(CORECONFIG_DBG, "In Ethernet setup function\n");
        ether_setup(dev);
 -      dev->tx_queue_len = 0;
 +      dev->priv_flags |= IFF_NO_QUEUE;
        dev->type = ARPHRD_IEEE80211_RADIOTAP;
-       memset(dev->dev_addr, 0, ETH_ALEN);
+       eth_zero_addr(dev->dev_addr);
  
        #ifdef USE_WIRELESS
        {

diff --cc drivers/video/fbdev/Kconfig
Simple merge