13 files changed, 39 insertions, 42 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 95990dd2678c..c2066f4c3286 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8922,7 +8922,7 @@ M:	Stephen Warren <swarren@wwwdotorg.org>
 M:      Thierry Reding <thierry.reding@gmail.com>
 L:      linux-tegra@vger.kernel.org
 Q:      http://patchwork.ozlabs.org/project/linux-tegra/list/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git
 S:      Supported
 N:      [^a-z]tegra
 
diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts
index f557feb997f4..90d8b6c7a205 100644
--- a/arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts
@@ -4,7 +4,7 @@
  */
 
 /dts-v1/;
-/include/ "ste-nomadik-stn8815.dtsi"
+#include "ste-nomadik-stn8815.dtsi"
 
 / {
         model = "Calao Systems USB-S8815";
diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
index d316c955bd5f..dbcf521b017f 100644
--- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
@@ -1,7 +1,9 @@
 /*
  * Device Tree for the ST-Ericsson Nomadik 8815 STn8815 SoC
  */
-/include/ "skeleton.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include "skeleton.dtsi"
 
 / {
         #address-cells = <1>;
@@ -842,8 +844,7 @@
                         bus-width = <4>;
                         cap-mmc-highspeed;
                         cap-sd-highspeed;
-                        cd-gpios = <&gpio3 15 0x1>;
-                        cd-inverted;
+                        cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&mmcsd_default_mux>, <&mmcsd_default_mode>;
                         vmmc-supply = <&vmmc_regulator>;
diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
index bba3cf88e624..0a8b519226b8 100644
--- a/arch/x86/include/asm/irqflags.h
+++ b/arch/x86/include/asm/irqflags.h
@@ -129,7 +129,7 @@ static inline notrace unsigned long arch_local_irq_save(void)
 
 #define PARAVIRT_ADJUST_EXCEPTION_FRAME /*  */
 
-#define INTERRUPT_RETURN        iretq
+#define INTERRUPT_RETURN        jmp native_iret
 #define USERGS_SYSRET64                         \
         swapgs;                                 \
         sysretq;
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index b25ca969edd2..c844f0816ab8 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -830,27 +830,24 @@ restore_args:
         RESTORE_ARGS 1,8,1
 
 irq_return:
+        INTERRUPT_RETURN
+
+ENTRY(native_iret)
         /*
          * Are we returning to a stack segment from the LDT?  Note: in
          * 64-bit mode SS:RSP on the exception stack is always valid.
          */
 #ifdef CONFIG_X86_ESPFIX64
         testb $4,(SS-RIP)(%rsp)
-        jnz irq_return_ldt
+        jnz native_irq_return_ldt
 #endif
 
-irq_return_iret:
-        INTERRUPT_RETURN
-        _ASM_EXTABLE(irq_return_iret, bad_iret)
-
-#ifdef CONFIG_PARAVIRT
-ENTRY(native_iret)
+native_irq_return_iret:
         iretq
-        _ASM_EXTABLE(native_iret, bad_iret)
-#endif
+        _ASM_EXTABLE(native_irq_return_iret, bad_iret)
 
 #ifdef CONFIG_X86_ESPFIX64
-irq_return_ldt:
+native_irq_return_ldt:
         pushq_cfi %rax
         pushq_cfi %rdi
         SWAPGS
@@ -872,7 +869,7 @@ irq_return_ldt:
         SWAPGS
         movq %rax,%rsp
         popq_cfi %rax
-        jmp irq_return_iret
+        jmp native_irq_return_iret
 #endif
 
         .section .fixup,"ax"
@@ -956,13 +953,8 @@ __do_double_fault:
         cmpl $__KERNEL_CS,CS(%rdi)
         jne do_double_fault
         movq RIP(%rdi),%rax
-        cmpq $irq_return_iret,%rax
-#ifdef CONFIG_PARAVIRT
-        je 1f
-        cmpq $native_iret,%rax
-#endif
+        cmpq $native_irq_return_iret,%rax
         jne do_double_fault             /* This shouldn't happen... */
-1:
         movq PER_CPU_VAR(kernel_stack),%rax
         subq $(6*8-KERNEL_STACK_OFFSET),%rax    /* Reset to original stack */
         movq %rax,RSP(%rdi)
@@ -1428,7 +1420,7 @@ error_sti:
  */
 error_kernelspace:
         incl %ebx
-        leaq irq_return_iret(%rip),%rcx
+        leaq native_irq_return_iret(%rip),%rcx
         cmpq %rcx,RIP+8(%rsp)
         je error_swapgs
         movl %ecx,%eax  /* zero extend */
diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
index 3f08f34f93eb..a1da6737ba5b 100644
--- a/arch/x86/kernel/paravirt_patch_64.c
+++ b/arch/x86/kernel/paravirt_patch_64.c
@@ -6,7 +6,6 @@ DEF_NATIVE(pv_irq_ops, irq_disable, "cli");
 DEF_NATIVE(pv_irq_ops, irq_enable, "sti");
 DEF_NATIVE(pv_irq_ops, restore_fl, "pushq %rdi; popfq");
 DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
-DEF_NATIVE(pv_cpu_ops, iret, "iretq");
 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
@@ -50,7 +49,6 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
                 PATCH_SITE(pv_irq_ops, save_fl);
                 PATCH_SITE(pv_irq_ops, irq_enable);
                 PATCH_SITE(pv_irq_ops, irq_disable);
-                PATCH_SITE(pv_cpu_ops, iret);
                 PATCH_SITE(pv_cpu_ops, irq_enable_sysexit);
                 PATCH_SITE(pv_cpu_ops, usergs_sysret32);
                 PATCH_SITE(pv_cpu_ops, usergs_sysret64);
diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index a7e68c81f89d..a077cc86421b 100644
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -68,13 +68,13 @@
 /* Defaults values */
 #define BMA180_DEF_PMODE        0
 #define BMA180_DEF_BW           20
-#define BMA180_DEF_SCALE        250
+#define BMA180_DEF_SCALE        2452
 
 /* Available values for sysfs */
 #define BMA180_FLP_FREQ_AVAILABLE \
         "10 20 40 75 150 300"
 #define BMA180_SCALE_AVAILABLE \
-        "0.000130 0.000190 0.000250 0.000380 0.000500 0.000990 0.001980"
+        "0.001275 0.001863 0.002452 0.003727 0.004903 0.009709 0.019417"
 
 struct bma180_data {
         struct i2c_client *client;
@@ -94,7 +94,7 @@ enum bma180_axis {
 };
 
 static int bw_table[] = { 10, 20, 40, 75, 150, 300 }; /* Hz */
-static int scale_table[] = { 130, 190, 250, 380, 500, 990, 1980 };
+static int scale_table[] = { 1275, 1863, 2452, 3727, 4903, 9709, 19417 };
 
 static int bma180_get_acc_reg(struct bma180_data *data, enum bma180_axis axis)
 {
@@ -376,6 +376,8 @@ static int bma180_write_raw(struct iio_dev *indio_dev,
                 mutex_unlock(&data->mutex);
                 return ret;
         case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:
+                if (val2)
+                        return -EINVAL;
                 mutex_lock(&data->mutex);
                 ret = bma180_set_bw(data, val);
                 mutex_unlock(&data->mutex);
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 36b1ae92e239..9f1a14009901 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -966,7 +966,7 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev,
 
         /* Now we have the two masks, work from least sig and build up sizes */
         for_each_set_bit(out_ind,
-                         indio_dev->active_scan_mask,
+                         buffer->scan_mask,
                          indio_dev->masklength) {
                 in_ind = find_next_bit(indio_dev->active_scan_mask,
                                        indio_dev->masklength,
diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c
index 4e84095833db..d724459860d9 100644
--- a/drivers/md/dm-bufio.c
+++ b/drivers/md/dm-bufio.c
@@ -1541,7 +1541,7 @@ struct dm_bufio_client *dm_bufio_client_create(struct block_device *bdev, unsign
         BUG_ON(block_size < 1 << SECTOR_SHIFT ||
                (block_size & (block_size - 1)));
 
-        c = kmalloc(sizeof(*c), GFP_KERNEL);
+        c = kzalloc(sizeof(*c), GFP_KERNEL);
         if (!c) {
                 r = -ENOMEM;
                 goto bad_client;
diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c
index 5f054c44b485..2c63326638b6 100644
--- a/drivers/md/dm-cache-target.c
+++ b/drivers/md/dm-cache-target.c
@@ -231,7 +231,7 @@ struct cache {
         /*
          * cache_size entries, dirty if set
          */
-        dm_cblock_t nr_dirty;
+        atomic_t nr_dirty;
         unsigned long *dirty_bitset;
 
         /*
@@ -492,7 +492,7 @@ static bool is_dirty(struct cache *cache, dm_cblock_t b)
 static void set_dirty(struct cache *cache, dm_oblock_t oblock, dm_cblock_t cblock)
 {
         if (!test_and_set_bit(from_cblock(cblock), cache->dirty_bitset)) {
-                cache->nr_dirty = to_cblock(from_cblock(cache->nr_dirty) + 1);
+                atomic_inc(&cache->nr_dirty);
                 policy_set_dirty(cache->policy, oblock);
         }
 }
@@ -501,8 +501,7 @@ static void clear_dirty(struct cache *cache, dm_oblock_t oblock, dm_cblock_t cbl
 {
         if (test_and_clear_bit(from_cblock(cblock), cache->dirty_bitset)) {
                 policy_clear_dirty(cache->policy, oblock);
-                cache->nr_dirty = to_cblock(from_cblock(cache->nr_dirty) - 1);
-                if (!from_cblock(cache->nr_dirty))
+                if (atomic_dec_return(&cache->nr_dirty) == 0)
                         dm_table_event(cache->ti->table);
         }
 }
@@ -2269,7 +2268,7 @@ static int cache_create(struct cache_args *ca, struct cache **result)
         atomic_set(&cache->quiescing_ack, 0);
 
         r = -ENOMEM;
-        cache->nr_dirty = 0;
+        atomic_set(&cache->nr_dirty, 0);
         cache->dirty_bitset = alloc_bitset(from_cblock(cache->cache_size));
         if (!cache->dirty_bitset) {
                 *error = "could not allocate dirty bitset";
@@ -2808,7 +2807,7 @@ static void cache_status(struct dm_target *ti, status_type_t type,
 
                 residency = policy_residency(cache->policy);
 
-                DMEMIT("%u %llu/%llu %u %llu/%llu %u %u %u %u %u %u %llu ",
+                DMEMIT("%u %llu/%llu %u %llu/%llu %u %u %u %u %u %u %lu ",
                        (unsigned)(DM_CACHE_METADATA_BLOCK_SIZE >> SECTOR_SHIFT),
                        (unsigned long long)(nr_blocks_metadata - nr_free_blocks_metadata),
                        (unsigned long long)nr_blocks_metadata,
@@ -2821,7 +2820,7 @@ static void cache_status(struct dm_target *ti, status_type_t type,
                        (unsigned) atomic_read(&cache->stats.write_miss),
                        (unsigned) atomic_read(&cache->stats.demotion),
                        (unsigned) atomic_read(&cache->stats.promotion),
-                       (unsigned long long) from_cblock(cache->nr_dirty));
+                       (unsigned long) atomic_read(&cache->nr_dirty));
 
                 if (writethrough_mode(&cache->features))
                         DMEMIT("1 writethrough ");
diff --git a/drivers/staging/rtl8723au/os_dep/usb_intf.c b/drivers/staging/rtl8723au/os_dep/usb_intf.c
index 8b25c1aa2025..ebb19b22f47f 100644
--- a/drivers/staging/rtl8723au/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8723au/os_dep/usb_intf.c
@@ -530,8 +530,10 @@ int rtw_resume_process23a(struct rtw_adapter *padapter)
         pwrpriv->bkeepfwalive = false;
 
         DBG_8723A("bkeepfwalive(%x)\n", pwrpriv->bkeepfwalive);
-        if (pm_netdev_open23a(pnetdev, true) != 0)
+        if (pm_netdev_open23a(pnetdev, true) != 0) {
+                up(&pwrpriv->lock);
                 goto exit;
+        }
 
         netif_device_attach(pnetdev);
         netif_carrier_on(pnetdev);
diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c
index 59679cd46816..69b80e80b011 100644
--- a/drivers/staging/vt6655/bssdb.c
+++ b/drivers/staging/vt6655/bssdb.c
@@ -981,7 +981,7 @@ start:
                 pDevice->byERPFlag &= ~(WLAN_SET_ERP_USE_PROTECTION(1));
         }
 
-        {
+        if (pDevice->eCommandState == WLAN_ASSOCIATE_WAIT) {
                 pDevice->byReAssocCount++;
                 /* 10 sec timeout */
                 if ((pDevice->byReAssocCount > 10) && (!pDevice->bLinkPass)) {
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 1d3908d044d0..5a5fd937a442 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -2318,6 +2318,7 @@ static  irqreturn_t  device_intr(int irq,  void *dev_instance) {
         int             handled = 0;
         unsigned char byData = 0;
         int             ii = 0;
+        unsigned long flags;
 
         MACvReadISR(pDevice->PortOffset, &pDevice->dwIsr);
 
@@ -2331,7 +2332,8 @@ static  irqreturn_t  device_intr(int irq,  void *dev_instance) {
 
         handled = 1;
         MACvIntDisable(pDevice->PortOffset);
-        spin_lock_irq(&pDevice->lock);
+
+        spin_lock_irqsave(&pDevice->lock, flags);
 
         //Make sure current page is 0
         VNSvInPortB(pDevice->PortOffset + MAC_REG_PAGE1SEL, &byOrgPageSel);
@@ -2560,7 +2562,8 @@ static  irqreturn_t  device_intr(int irq,  void *dev_instance) {
         if (byOrgPageSel == 1)
                 MACvSelectPage1(pDevice->PortOffset);
 
-        spin_unlock_irq(&pDevice->lock);
+        spin_unlock_irqrestore(&pDevice->lock, flags);
+
         MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE);
 
         return IRQ_RETVAL(handled);