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

Pull staging driver updates from Greg KH:
 "Here is the big staging driver pull request for 4.6-rc1.

  Lots of little things here, over 1600 patches or so.  Notable is all
  of the good Lustre work happening, those developers have finally woken
  up and are cleaning up their code greatly.  The Outreachy intern
  application process is also happening, which brought in another 400 or
  so patches.  Full details are in the very long shortlog.

  All of these have been in linux-next with no reported issues"

* tag 'staging-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1673 commits)
  staging: lustre: fix aligments in lnet selftest
  staging: lustre: report minimum of two buffers for LNet selftest load test
  staging: lustre: test for proper errno code in lstcon_rpc_trans_abort
  staging: lustre: filter remaining extra spacing for lnet selftest
  staging: lustre: remove extra spacing when setting variable for lnet selftest
  staging: lustre: remove extra spacing of variable declartions for lnet selftest
  staging: lustre: fix spacing issues checkpatch reported in lnet selftest
  staging: lustre: remove returns in void function for lnet selftest
  staging: lustre: fix bogus lst errors for lnet selftest
  staging: netlogic: Replacing pr_err with dev_err after the call to devm_kzalloc
  staging: mt29f_spinand: Replacing pr_info with dev_info after the call to devm_kzalloc
  staging: android: ion: fix up file mode
  staging: ion: debugfs invalid gfp mask
  staging: rts5208: Replace pci_enable_device with pcim_enable_device
  Staging: ieee80211: Place constant on right side of the test.
  staging: speakup: Replace del_timer with del_timer_sync
  staging: lowmemorykiller: fix 2 checks that checkpatch complained
  staging: mt29f_spinand: Drop void pointer cast
  staging: rdma: hfi1: file_ops: Replace ALIGN with PAGE_ALIGN
  staging: rdma: hfi1: driver: Replace IS_ALIGNED with PAGE_ALIGNED
  ...

7 files changed, 70 insertions, 4 deletions

diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h
index fa05e04c5531..d8414502edb4 100644
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
@@ -97,6 +97,12 @@ enum fid_type {
         FILEID_FAT_WITH_PARENT = 0x72,
 
         /*
+         * 128 bit child FID (struct lu_fid)
+         * 128 bit parent FID (struct lu_fid)
+         */
+        FILEID_LUSTRE = 0x97,
+
+        /*
          * Filesystems must not use 0xff file ID.
          */
         FILEID_INVALID = 0xff,
diff --git a/include/linux/fence.h b/include/linux/fence.h
index bb522011383b..605bd88246a6 100644
--- a/include/linux/fence.h
+++ b/include/linux/fence.h
@@ -79,6 +79,8 @@ struct fence {
         unsigned long flags;
         ktime_t timestamp;
         int status;
+        struct list_head child_list;
+        struct list_head active_list;
 };
 
 enum fence_flag_bits {
diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
index 2fe939c73cd2..6670c3d25c58 100644
--- a/include/linux/iio/common/st_sensors.h
+++ b/include/linux/iio/common/st_sensors.h
@@ -119,6 +119,8 @@ struct st_sensor_bdu {
  * @addr: address of the register.
  * @mask_int1: mask to enable/disable IRQ on INT1 pin.
  * @mask_int2: mask to enable/disable IRQ on INT2 pin.
+ * @addr_ihl: address to enable/disable active low on the INT lines.
+ * @mask_ihl: mask to enable/disable active low on the INT lines.
  * struct ig1 - represents the Interrupt Generator 1 of sensors.
  * @en_addr: address of the enable ig1 register.
  * @en_mask: mask to write the on/off value for enable.
@@ -127,6 +129,8 @@ struct st_sensor_data_ready_irq {
         u8 addr;
         u8 mask_int1;
         u8 mask_int2;
+        u8 addr_ihl;
+        u8 mask_ihl;
         struct {
                 u8 en_addr;
                 u8 en_mask;
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index b5894118755f..b2b16772c651 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -180,18 +180,18 @@ struct iio_event_spec {
  * @address:            Driver specific identifier.
  * @scan_index:         Monotonic index to give ordering in scans when read
  *                      from a buffer.
- * @scan_type:          Sign:           's' or 'u' to specify signed or unsigned
+ * @scan_type:          sign:           's' or 'u' to specify signed or unsigned
  *                      realbits:       Number of valid bits of data
- *                      storage_bits:   Realbits + padding
+ *                      storagebits:    Realbits + padding
  *                      shift:          Shift right by this before masking out
  *                                      realbits.
- *                      endianness:     little or big endian
  *                      repeat:         Number of times real/storage bits
  *                                      repeats. When the repeat element is
  *                                      more than 1, then the type element in
  *                                      sysfs will show a repeat value.
  *                                      Otherwise, the number of repetitions is
  *                                      omitted.
+ *                      endianness:     little or big endian
  * @info_mask_separate: What information is to be exported that is specific to
  *                      this channel.
  * @info_mask_shared_by_type: What information is to be exported that is shared
@@ -448,7 +448,7 @@ struct iio_buffer_setup_ops {
  * @buffer:             [DRIVER] any buffer present
  * @buffer_list:        [INTERN] list of all buffers currently attached
  * @scan_bytes:         [INTERN] num bytes captured to be fed to buffer demux
- * @mlock:              [INTERN] lock used to prevent simultaneous device state
+ * @mlock:              [DRIVER] lock used to prevent simultaneous device state
  *                      changes
  * @available_scan_masks: [DRIVER] optional array of allowed bitmasks
  * @masklength:         [INTERN] the length of the mask established from
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index ed48594e96d2..2aed04396210 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -75,6 +75,7 @@ enum irq_domain_bus_token {
         DOMAIN_BUS_PLATFORM_MSI,
         DOMAIN_BUS_NEXUS,
         DOMAIN_BUS_IPI,
+        DOMAIN_BUS_FSL_MC_MSI,
 };
 
 /**
diff --git a/include/linux/msi.h b/include/linux/msi.h
index a2a0068a8387..8b425c66305a 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -33,6 +33,14 @@ struct platform_msi_desc {
 };
 
 /**
+ * fsl_mc_msi_desc - FSL-MC device specific msi descriptor data
+ * @msi_index:          The index of the MSI descriptor
+ */
+struct fsl_mc_msi_desc {
+        u16                             msi_index;
+};
+
+/**
  * struct msi_desc - Descriptor structure for MSI based interrupts
  * @list:       List head for management
  * @irq:        The base interrupt number
@@ -87,6 +95,7 @@ struct msi_desc {
                  * tree wide cleanup.
                  */
                 struct platform_msi_desc platform;
+                struct fsl_mc_msi_desc fsl_mc;
         };
 };
 
diff --git a/include/linux/platform_data/ad5761.h b/include/linux/platform_data/ad5761.h
new file mode 100644
index 000000000000..7bd8ed7d978e
--- /dev/null
+++ b/include/linux/platform_data/ad5761.h
@@ -0,0 +1,44 @@
+/*
+ * AD5721, AD5721R, AD5761, AD5761R, Voltage Output Digital to Analog Converter
+ *
+ * Copyright 2016 Qtechnology A/S
+ * 2016 Ricardo Ribalda <ricardo.ribalda@gmail.com>
+ *
+ * Licensed under the GPL-2.
+ */
+#ifndef __LINUX_PLATFORM_DATA_AD5761_H__
+#define __LINUX_PLATFORM_DATA_AD5761_H__
+
+/**
+ * enum ad5761_voltage_range - Voltage range the AD5761 is configured for.
+ * @AD5761_VOLTAGE_RANGE_M10V_10V:  -10V to  10V
+ * @AD5761_VOLTAGE_RANGE_0V_10V:      0V to  10V
+ * @AD5761_VOLTAGE_RANGE_M5V_5V:     -5V to   5V
+ * @AD5761_VOLTAGE_RANGE_0V_5V:       0V to   5V
+ * @AD5761_VOLTAGE_RANGE_M2V5_7V5: -2.5V to 7.5V
+ * @AD5761_VOLTAGE_RANGE_M3V_3V:     -3V to   3V
+ * @AD5761_VOLTAGE_RANGE_0V_16V:      0V to  16V
+ * @AD5761_VOLTAGE_RANGE_0V_20V:      0V to  20V
+ */
+
+enum ad5761_voltage_range {
+        AD5761_VOLTAGE_RANGE_M10V_10V,
+        AD5761_VOLTAGE_RANGE_0V_10V,
+        AD5761_VOLTAGE_RANGE_M5V_5V,
+        AD5761_VOLTAGE_RANGE_0V_5V,
+        AD5761_VOLTAGE_RANGE_M2V5_7V5,
+        AD5761_VOLTAGE_RANGE_M3V_3V,
+        AD5761_VOLTAGE_RANGE_0V_16V,
+        AD5761_VOLTAGE_RANGE_0V_20V,
+};
+
+/**
+ * struct ad5761_platform_data - AD5761 DAC driver platform data
+ * @voltage_range: Voltage range the AD5761 is configured for
+ */
+
+struct ad5761_platform_data {
+        enum ad5761_voltage_range voltage_range;
+};
+
+#endif