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

Conflicts:
	drivers/Kconfig
	drivers/Makefile
	drivers/misc/altera-stapl/altera.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/brcm80211/brcmfmac/dhd_linux.c
	drivers/staging/brcm80211/brcmsmac/mac80211_if.c
	drivers/staging/comedi/drivers/ni_labpc.c
	drivers/staging/et131x/et1310_tx.c
	drivers/staging/hv/Makefile
	drivers/staging/rtl8192e/r8192E_core.c
	drivers/staging/xgifb/XGI_main_26.c
	drivers/staging/zram/zram_drv.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/Kconfig
index a1efd75070aa1104b800e65c1fa865cfb35f146e,ce3c35f4041c89a1f37cc63817dd0aeff92f9dfc..128d02cea418082747a3a8d57b902b5c0fd3271a
--- 1/drivers/Kconfig
--- 2/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -130,6 -130,6 +130,8 @@@ source "drivers/iommu/Kconfig
  
  source "drivers/virt/Kconfig"
  
+ source "drivers/hv/Kconfig"
+ 
 +source "drivers/devfreq/Kconfig"
 +
  endmenu

diff --cc drivers/Makefile
index 97c957b50819839e08eb168d6e44daf587278a5c,ef693cfb4813e859e4b8b4a7b4382fd5fcc0ab78..e0d9c12045b1e859f7af18c230764aa6a1510d73
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -127,5 -127,5 +127,6 @@@ obj-$(CONFIG_IOMMU_SUPPORT)        += iommu
  
  # Virtualization drivers
  obj-$(CONFIG_VIRT_DRIVERS)    += virt/
+ obj-$(CONFIG_HYPERV)          += hv/
  
 +obj-$(CONFIG_PM_DEVFREQ)      += devfreq/

diff --cc drivers/misc/altera-stapl/altera.c
index 1a2c50b82f94aa219a998ccd7ddb16934a21a942,c2eff6a82db1fb3699f9a50f33085607f15ff44e..24272e022bec926f729d6cf26fd5953e63316ad7
--- 1/drivers/misc/altera-stapl/altera.c
--- 2/drivers/staging/altera-stapl/altera.c
+++ b/drivers/misc/altera-stapl/altera.c
@@@ -28,7 -28,8 +28,8 @@@
  #include <linux/string.h>
  #include <linux/firmware.h>
  #include <linux/slab.h>
 -#include "altera.h"
+ #include <linux/module.h>
 +#include <misc/altera.h>
  #include "altera-exprt.h"
  #include "altera-jtag.h"
  

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/Makefile
Simple merge

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

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

diff --cc drivers/staging/et131x/et1310_tx.c
index e4f51e64c7a84765128fccd4f9882d4839b7406f,cd12500a265d6d57c622ef8edc1a83b381a54fac..ce5a86110066d6759c43d6ba73f967107ba30cff
--- 1/drivers/staging/et131x/et1310_tx.c
--- 2/drivers/staging/et131x/et1310_tx.c
+++ b/drivers/staging/et131x/et1310_tx.c
@@@ -519,12 -391,12 +391,12 @@@ static int nic_send_packet(struct et131
                         * returned by pci_map_page() is always 32-bit
                         * addressable (as defined by the pci/dma subsystem)
                         */
 -                      desc[frag++].addr_lo =
 -                          pci_map_page(adapter->pdev,
 -                                       frags[i - 1].page,
 -                                       frags[i - 1].page_offset,
 -                                       frags[i - 1].size,
 -                                       PCI_DMA_TODEVICE);
 +                      desc[frag++].addr_lo = skb_frag_dma_map(
-                                                       &etdev->pdev->dev,
++                                                      &adapter->pdev->dev,
 +                                                      &frags[i - 1],
 +                                                      0,
 +                                                      frags[i - 1].size,
 +                                                      DMA_TO_DEVICE);
                }
        }
  

diff --cc drivers/staging/et131x/et131x_netdev.c
Simple merge

diff --cc drivers/staging/hv/Makefile
index 14e3c6a14ea42c3f27c2b3e727f295f2b90e7211,e071c12c8f69b70f813aa7df773fae999a63821e..0f55ceee919bf98b02fa27fd59e789276ceddaaf
--- 1/drivers/staging/hv/Makefile
--- 2/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@@ -1,14 -1,7 +1,6 @@@
- obj-$(CONFIG_HYPERV)          += hv_vmbus.o
 -obj-$(CONFIG_HYPERV)          += hv_timesource.o
  obj-$(CONFIG_HYPERV_STORAGE)  += hv_storvsc.o
- obj-$(CONFIG_HYPERV_BLOCK)    += hv_blkvsc.o
  obj-$(CONFIG_HYPERV_NET)      += hv_netvsc.o
- obj-$(CONFIG_HYPERV_UTILS)    += hv_utils.o
  obj-$(CONFIG_HYPERV_MOUSE)    += hv_mouse.o
  
- hv_vmbus-y := vmbus_drv.o \
-                hv.o connection.o channel.o \
-                channel_mgmt.o ring_buffer.o
- hv_storvsc-y := storvsc_drv.o storvsc.o
- hv_blkvsc-y := blkvsc_drv.o  storvsc.o
+ hv_storvsc-y := storvsc_drv.o
  hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o
- hv_utils-y := hv_util.o hv_kvp.o

diff --cc drivers/staging/hv/netvsc_drv.c
Simple merge

diff --cc drivers/staging/iio/addac/adt7316-i2c.c
Simple merge

diff --cc drivers/staging/iio/dds/ad9832.c
Simple merge

diff --cc drivers/staging/vt6655/device_main.c
Simple merge

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

diff --cc drivers/staging/wlags49_h2/wl_netdev.c
Simple merge

diff --cc drivers/staging/xgifb/XGI_main_26.c
index f8b88add9520dab5c4cfe6a934711f85a26be5ec,36db231cd804c51e6f0dc23d987857ba7d98a10a..544fcd228c67de69e0e297382d87f0a9f0a6b17f
--- 1/drivers/staging/xgifb/XGI_main_26.c
--- 2/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@@ -1363,8 -1300,8 +1300,8 @@@ static int XGIfb_do_set_var(struct fb_v
        return 0;
  }
  
- #ifdef XGIFB_PAN
- static int XGIfb_pan_var(struct fb_var_screeninfo *var, struct fb_info *info)
+ static int XGIfb_pan_var(struct xgifb_video_info *xgifb_info,
 -                       struct fb_var_screeninfo *var)
++                       struct fb_var_screeninfo *var, struct fb_info *info)
  {
        unsigned int base;
  
@@@ -1686,7 -1634,7 +1624,7 @@@ static int XGIfb_pan_display(struct fb_
                                                > info->var.yres_virtual)
                        return -EINVAL;
        }
-       err = XGIfb_pan_var(var, info);
 -      err = XGIfb_pan_var(xgifb_info, var);
++      err = XGIfb_pan_var(xgifb_info, var, info);
        if (err < 0)
                return err;
  

diff --cc drivers/staging/zcache/zcache-main.c
Simple merge

diff --cc drivers/staging/zram/zram_drv.c
index 02589cab67109c871cda806f191914d7a8adf774,b9926ee0052c37bc5d6f68cada276f010ea6bad9..09de99fbb7e0e5e5874b2d5f662ad6b51408e8c3
--- 1/drivers/staging/zram/zram_drv.c
--- 2/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@@ -572,9 -573,18 +573,17 @@@ static void zram_make_request(struct re
        }
  
        __zram_make_request(zram, bio, bio_data_dir(bio));
 -      return 0;
+       up_read(&zram->init_lock);
+ 
 -      return 0;
++      return;
+ 
+ error_unlock:
+       up_read(&zram->init_lock);
+ error:
+       bio_io_error(bio);
  }
  
- void zram_reset_device(struct zram *zram)
+ void __zram_reset_device(struct zram *zram)
  {
        size_t index;