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

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index abc34e3652eaa9cf65c016a37c2da60ea0eaecae,13e54a0e78b9b50878226a479693d3f37863ea16..55df1d444e9f82c150ef144c02357d13169ead31
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -171,8 -169,8 +172,9 @@@ pericom    Pericom Technology Inc
  phytec        PHYTEC Messtechnik GmbH
  picochip      Picochip Ltd
  plathome      Plat'Home Co., Ltd.
 +plda  PLDA
  pixcir  PIXCIR MICROELECTRONICS Co., Ltd
+ pulsedlight   PulsedLight, Inc
  powervr       PowerVR (deprecated, use img)
  qca   Qualcomm Atheros, Inc.
  qcom  Qualcomm Technologies, Inc
@@@ -195,8 -193,8 +197,9 @@@ sbs        Smart Battery Syste
  schindler     Schindler
  seagate       Seagate Technology PLC
  semtech       Semtech Corporation
+ sgx   SGX Sensortech
  sharp Sharp Corporation
 +sigma Sigma Designs, Inc.
  sil   Silicon Image
  silabs        Silicon Laboratories
  siliconmitus  Silicon Mitus, Inc.
@@@ -227,8 -225,8 +230,9 @@@ toradex    Toradex A
  toshiba       Toshiba Corporation
  toumaz        Toumaz
  tplink        TP-LINK Technologies Co., Ltd.
 +tronfy        Tronfy
  truly Truly Semiconductors Limited
+ upisemi       uPI Semiconductor Corp.
  usi   Universal Scientific Industrial Co., Ltd.
  v3    V3 Semiconductor
  variscite     Variscite Ltd.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/adc/max1027.c
index 3bc059c698241a46908c9b5047082f0262cdae26,54a8302aaacec518c46fb8d603b4da62e28d505d..41d495c6035e1a882e03b17ca8066224e767cde6
--- 1/drivers/iio/adc/max1027.c
--- 2/drivers/iio/adc/max1027.c
+++ b/drivers/iio/adc/max1027.c
@@@ -508,6 -508,8 +508,7 @@@ static int max1027_remove(struct spi_de
  static struct spi_driver max1027_driver = {
        .driver = {
                .name   = "max1027",
 -              .owner  = THIS_MODULE,
+               .of_match_table = of_match_ptr(max1027_adc_dt_ids),
        },
        .probe          = max1027_probe,
        .remove         = max1027_remove,

diff --cc drivers/iio/adc/mcp320x.c
index d5d8b4180914d873a673072c5c377e68cd2e603e,41a21e986c1a326593a4864d53f2d33882342a98..8569c8e1f4b276db3e968356626c67fab9b60c16
--- 1/drivers/iio/adc/mcp320x.c
--- 2/drivers/iio/adc/mcp320x.c
+++ b/drivers/iio/adc/mcp320x.c
@@@ -404,6 -404,8 +404,7 @@@ MODULE_DEVICE_TABLE(spi, mcp320x_id)
  static struct spi_driver mcp320x_driver = {
        .driver = {
                .name = "mcp320x",
 -              .owner = THIS_MODULE,
+               .of_match_table = of_match_ptr(mcp320x_dt_ids),
        },
        .probe = mcp320x_probe,
        .remove = mcp320x_remove,

diff --cc drivers/iio/adc/ti-adc128s052.c
index 76b619649409a43329719e17668b851b427e3c84,98c0d2b444bff46048fac8c03979661f7a922a95..ff6f7f63c8d9b8c2c7e758ce932912663b7fbc3f
--- 1/drivers/iio/adc/ti-adc128s052.c
--- 2/drivers/iio/adc/ti-adc128s052.c
+++ b/drivers/iio/adc/ti-adc128s052.c
@@@ -184,6 -191,8 +191,7 @@@ MODULE_DEVICE_TABLE(spi, adc128_id)
  static struct spi_driver adc128_driver = {
        .driver = {
                .name = "adc128s052",
 -              .owner = THIS_MODULE,
+               .of_match_table = of_match_ptr(adc128_of_match),
        },
        .probe = adc128_probe,
        .remove = adc128_remove,

diff --cc drivers/iio/amplifiers/ad8366.c
Simple merge

diff --cc drivers/iio/dac/ad5504.c
Simple merge

diff --cc drivers/iio/dac/ad7303.c
index 399de2cfeb16b52c75180c88f8435e4102a53be5,18a4ad5ff8c50ccfb87bd4a31ce2ec6ca6dbe79d..e690dd11e99f64fa1270da8132010f34d94d7241
--- 1/drivers/iio/dac/ad7303.c
--- 2/drivers/iio/dac/ad7303.c
+++ b/drivers/iio/dac/ad7303.c
@@@ -290,6 -296,8 +296,7 @@@ MODULE_DEVICE_TABLE(spi, ad7303_spi_ids
  static struct spi_driver ad7303_driver = {
        .driver = {
                .name = "ad7303",
 -              .owner = THIS_MODULE,
+               .of_match_table = of_match_ptr(ad7303_spi_of_match),
        },
        .probe = ad7303_probe,
        .remove = ad7303_remove,

diff --cc drivers/iio/frequency/adf4350.c
index b83534cc2ab14bde5fb25819e9a6d854275f2895,73f27e0a08dd3e1313a1160004aae56c1da246af..d2d824b446f5242c09fe8bb9ac276ab8f2fe746f
--- 1/drivers/iio/frequency/adf4350.c
--- 2/drivers/iio/frequency/adf4350.c
+++ b/drivers/iio/frequency/adf4350.c
@@@ -625,6 -633,8 +633,7 @@@ MODULE_DEVICE_TABLE(spi, adf4350_id)
  static struct spi_driver adf4350_driver = {
        .driver = {
                .name   = "adf4350",
 -              .owner  = THIS_MODULE,
+               .of_match_table = of_match_ptr(adf4350_of_match),
        },
        .probe          = adf4350_probe,
        .remove         = adf4350_remove,

diff --cc drivers/iio/proximity/as3935.c
index 2865aa63f4f1de9cf4900700663bbbf617c49e2c,e95035136889342a88f398d33738fe67055e8c1b..f4d29d5dbd5f88d6e5edffef142e86db30076d44
--- 1/drivers/iio/proximity/as3935.c
--- 2/drivers/iio/proximity/as3935.c
+++ b/drivers/iio/proximity/as3935.c
@@@ -443,6 -449,8 +449,7 @@@ MODULE_DEVICE_TABLE(spi, as3935_id)
  static struct spi_driver as3935_driver = {
        .driver = {
                .name   = "as3935",
 -              .owner  = THIS_MODULE,
+               .of_match_table = of_match_ptr(as3935_of_match),
                .pm     = AS3935_PM_OPS,
        },
        .probe          = as3935_probe,

diff --cc drivers/staging/fbtft/fbtft.h
Simple merge

diff --cc drivers/staging/fbtft/flexfb.c
Simple merge

diff --cc drivers/staging/iio/accel/lis3l02dq_core.c
Simple merge

diff --cc drivers/staging/iio/accel/sca3000_core.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7192.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7280a.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7606_spi.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7780.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7816.c
Simple merge

diff --cc drivers/staging/iio/frequency/ad9834.c
Simple merge

diff --cc drivers/staging/iio/gyro/adis16060_core.c
Simple merge

diff --cc drivers/staging/iio/magnetometer/hmc5843_spi.c
Simple merge

diff --cc drivers/staging/iio/meter/ade7753.c
Simple merge

diff --cc drivers/staging/iio/meter/ade7754.c
Simple merge

diff --cc drivers/staging/iio/meter/ade7758_core.c
Simple merge

diff --cc drivers/staging/iio/meter/ade7759.c
Simple merge

diff --cc drivers/staging/iio/meter/ade7854-spi.c
Simple merge

diff --cc drivers/staging/iio/resolver/ad2s1210.c
Simple merge

diff --cc drivers/staging/iio/resolver/ad2s90.c
index cfeedfb7c774e1177a546c370a2ff1747e9dd2cf,c57a29616223ba54b8335691d6b122c7a6553f30..5b1c0db33e7f2dfe4ddbebdc48c117b01f146e5b
--- 1/drivers/staging/iio/resolver/ad2s90.c
--- 2/drivers/staging/iio/resolver/ad2s90.c
+++ b/drivers/staging/iio/resolver/ad2s90.c
@@@ -107,9 -100,9 +100,8 @@@ MODULE_DEVICE_TABLE(spi, ad2s90_id)
  static struct spi_driver ad2s90_driver = {
        .driver = {
                .name = "ad2s90",
 -              .owner = THIS_MODULE,
        },
        .probe = ad2s90_probe,
-       .remove = ad2s90_remove,
        .id_table = ad2s90_id,
  };
  module_spi_driver(ad2s90_driver);

diff --cc drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
index 993d1ff9ba21987612362d122b7082242314b313,5f78b42b427aef46d8567789ce1cb36bf3fae00e..263db37de7c807821ffe98b2156252b4ecf24ebf
--- 1/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
--- 2/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
@@@ -511,30 -490,28 +492,28 @@@ typedef struct kib_r
  
  typedef struct kib_tx                         /* transmit message */
  {
-       struct list_head       tx_list;       /* queue on idle_txs ibc_tx_queue
-                                              * etc. */
-       kib_tx_pool_t          *tx_pool;      /* pool I'm from */
-       struct kib_conn        *tx_conn;      /* owning conn */
-       short                  tx_sending;    /* # tx callbacks outstanding */
-       short                  tx_queued;     /* queued for sending */
-       short                  tx_waiting;    /* waiting for peer */
-       int                    tx_status;     /* LNET completion status */
-       unsigned long          tx_deadline;   /* completion deadline */
-       __u64                  tx_cookie;     /* completion cookie */
-       lnet_msg_t             *tx_lntmsg[2]; /* lnet msgs to finalize on
-                                              * completion */
-       kib_msg_t              *tx_msg;       /* message buffer (host vaddr) */
-       __u64                  tx_msgaddr;    /* message buffer (I/O addr) */
+       struct list_head      tx_list; /* queue on idle_txs ibc_tx_queue etc. */
+       kib_tx_pool_t         *tx_pool;       /* pool I'm from */
+       struct kib_conn       *tx_conn;       /* owning conn */
+       short                 tx_sending;     /* # tx callbacks outstanding */
+       short                 tx_queued;      /* queued for sending */
+       short                 tx_waiting;     /* waiting for peer */
+       int                   tx_status;      /* LNET completion status */
+       unsigned long         tx_deadline;    /* completion deadline */
+       __u64                 tx_cookie;      /* completion cookie */
+       lnet_msg_t *tx_lntmsg[2]; /* lnet msgs to finalize on completion */
+       kib_msg_t             *tx_msg;        /* message buffer (host vaddr) */
+       __u64                 tx_msgaddr;     /* message buffer (I/O addr) */
        DECLARE_PCI_UNMAP_ADDR(tx_msgunmap);  /* for dma_unmap_single() */
-       int                    tx_nwrq;       /* # send work items */
-       struct ib_rdma_wr      *tx_wrq;       /* send work items... */
-       struct ib_sge          *tx_sge;       /* ...and their memory */
-       kib_rdma_desc_t        *tx_rd;        /* rdma descriptor */
-       int                    tx_nfrags;     /* # entries in... */
-       struct scatterlist     *tx_frags;     /* dma_map_sg descriptor */
-       __u64                  *tx_pages;     /* rdma phys page addrs */
-       kib_fmr_t               fmr;          /* FMR */
-       int                    tx_dmadir;     /* dma direction */
+       int                   tx_nwrq;        /* # send work items */
 -      struct ib_send_wr     *tx_wrq;        /* send work items... */
++      struct ib_rdma_wr     *tx_wrq;        /* send work items... */
+       struct ib_sge         *tx_sge;        /* ...and their memory */
+       kib_rdma_desc_t       *tx_rd;         /* rdma descriptor */
+       int                   tx_nfrags;      /* # entries in... */
+       struct scatterlist    *tx_frags;      /* dma_map_sg descriptor */
+       __u64                 *tx_pages;      /* rdma phys page addrs */
+       kib_fmr_t             fmr;            /* FMR */
+       int                   tx_dmadir;      /* dma direction */
  } kib_tx_t;
  
  typedef struct kib_connvars {

diff --cc drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
Simple merge

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

diff --cc drivers/staging/media/lirc/lirc_sasem.c
Simple merge

diff --cc drivers/staging/media/omap4iss/iss.c
Simple merge

diff --cc drivers/staging/media/omap4iss/iss_video.c
Simple merge

diff --cc drivers/staging/mt29f_spinand/mt29f_spinand.c
index b2e6237ae913722e67eaf342d2302b85504d836c,20a3f8eeb264651915530a372861a98aa52a65da..e893d5d8b8628e975982633cdd53d5bf0a5f97f2
--- 1/drivers/staging/mt29f_spinand/mt29f_spinand.c
--- 2/drivers/staging/mt29f_spinand/mt29f_spinand.c
+++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c
@@@ -612,10 -612,10 +612,10 @@@ static int spinand_erase_block(struct s
  
  #ifdef CONFIG_MTD_SPINAND_ONDIEECC
  static int spinand_write_page_hwecc(struct mtd_info *mtd,
-               struct nand_chip *chip, const uint8_t *buf, int oob_required,
-               int page)
+                                   struct nand_chip *chip,
 -                                  const u8 *buf, int oob_required)
++                                  const u8 *buf, int oob_required, int page)
  {
-       const uint8_t *p = buf;
+       const u8 *p = buf;
        int eccsize = chip->ecc.size;
        int eccsteps = chip->ecc.steps;
  

diff --cc drivers/staging/rdma/amso1100/c2_qp.c
Simple merge

diff --cc drivers/staging/rdma/hfi1/mr.c
Simple merge

diff --cc drivers/staging/rdma/hfi1/rc.c
Simple merge

diff --cc drivers/staging/rdma/hfi1/ruc.c
Simple merge

diff --cc drivers/staging/rdma/hfi1/verbs.c
Simple merge

diff --cc drivers/staging/rdma/hfi1/verbs.h
Simple merge

diff --cc drivers/staging/rdma/ipath/ipath_ruc.c
Simple merge

diff --cc drivers/staging/rdma/ipath/ipath_ud.c
Simple merge

diff --cc drivers/staging/rdma/ipath/ipath_verbs.c
Simple merge

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