Merge branch 'android-4.14-stable' of https://android.googlesource.com/kernel/common into android-feature-ti-linux-4.14.yandroid-feature-ti-linux-4.14.y

* 'android-4.14-stable' of https://android.googlesource.com/kernel/common: (2040 commits)
  Linux 4.14.213
  PCI: Fix pci_slot_release() NULL pointer dereference
  libnvdimm/namespace: Fix reaping of invalidated block-window-namespace labels
  xenbus/xenbus_backend: Disallow pending watch messages
  xen/xenbus: Count pending messages for each watch
  xen/xenbus/xen_bus_type: Support will_handle watch callback
  xen/xenbus: Add 'will_handle' callback support in xenbus_watch_path()
  xen/xenbus: Allow watches discard events before queueing
  xen-blkback: set ring->xenblkd to NULL after kthread_stop()
  clk: mvebu: a3700: fix the XTAL MODE pin to MPP1_9
  md/cluster: fix deadlock when node is doing resync job
  iio:imu:bmi160: Fix too large a buffer.
  iio:pressure:mpl3115: Force alignment of buffer
  iio:light:rpr0521: Fix timestamp alignment and prevent data leak.
  iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume
  iio: buffer: Fix demux update
  mtd: parser: cmdline: Fix parsing of part-names with colons
  soc: qcom: smp2p: Safely acquire spinlock without IRQs
  spi: st-ssc4: Fix unbalanced pm_runtime_disable() in probe error path
  spi: sc18is602: Don't leak SPI master in probe error path
  ...

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

1759 files changed, 21720 insertions, 11149 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index 64e65450f483..e21e2ca3e4f9 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -1524,7 +1524,8 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw
 KernelVersion:  4.3
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Raw (unscaled no offset etc.) percentage reading of a substance.
+                Raw (unscaled no offset etc.) reading of a substance. Units
+                after application of scale and offset are percents.
 
 What:           /sys/bus/iio/devices/iio:deviceX/in_resistance_raw
 What:           /sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 2558a828dfd9..bcfccb8b3ad5 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -552,7 +552,7 @@
                         loops can be debugged more effectively on production
                         systems.
 
-        clearcpuid=BITNUM [X86]
+        clearcpuid=BITNUM[,BITNUM...] [X86]
                         Disable CPUID feature X for the kernel. See
                         arch/x86/include/asm/cpufeatures.h for the valid bit
                         numbers. Note the Linux specific bits are not necessarily
@@ -2455,6 +2455,8 @@
                                                mds=off [X86]
                                                tsx_async_abort=off [X86]
                                                kvm.nx_huge_pages=off [X86]
+                                               no_entry_flush [PPC]
+                                               no_uaccess_flush [PPC]
 
                                 Exceptions:
                                                This does not have any effect on
@@ -2758,6 +2760,8 @@
 
         noefi           Disable EFI runtime services support.
 
+        no_entry_flush  [PPC] Don't flush the L1-D cache when entering the kernel.
+
         noexec          [IA-64]
 
         noexec          [X86]
@@ -2807,6 +2811,9 @@
         nospec_store_bypass_disable
                         [HW] Disable all mitigations for the Speculative Store Bypass vulnerability
 
+        no_uaccess_flush
+                        [PPC] Don't flush the L1-D cache after accessing user data.
+
         noxsave         [BUGS=X86] Disables x86 extended register state save
                         and restore using xsave. The kernel will fallback to
                         enabling legacy floating-point and sse state.
@@ -4756,6 +4763,7 @@
                                         device);
                                 j = NO_REPORT_LUNS (don't use report luns
                                         command, uas only);
+                                k = NO_SAME (do not use WRITE_SAME, uas only)
                                 l = NOT_LOCKABLE (don't try to lock and
                                         unlock ejectable media, not on uas);
                                 m = MAX_SECTORS_64 (don't transfer more
@@ -5035,6 +5043,14 @@
                         Disables the PV optimizations forcing the HVM guest to
                         run as generic HVM guest with no PV drivers.
 
+        xen.event_eoi_delay=    [XEN]
+                        How long to delay EOI handling in case of event
+                        storms (jiffies). Default is 10.
+
+        xen.event_loop_timeout= [XEN]
+                        After which time (jiffies) the event handling loop
+                        should start to delay EOI handling. Default is 2.
+
         xirc2ps_cs=     [NET,PCMCIA]
                         Format:
                         <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]
diff --git a/Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt b/Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt
index c82794002595..89647d714387 100644
--- a/Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt
+++ b/Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt
@@ -21,7 +21,7 @@ controller state. The mux controller state is described in
 
 Example:
         mux: mux-controller {
-                compatible = "mux-gpio";
+                compatible = "gpio-mux";
                 #mux-control-cells = <0>;
 
                 mux-gpios = <&pioA 0 GPIO_ACTIVE_HIGH>,
diff --git a/Documentation/devicetree/bindings/net/nfc/nxp-nci.txt b/Documentation/devicetree/bindings/net/nfc/nxp-nci.txt
index 92486733df71..8ebc5200032a 100644
--- a/Documentation/devicetree/bindings/net/nfc/nxp-nci.txt
+++ b/Documentation/devicetree/bindings/net/nfc/nxp-nci.txt
@@ -26,7 +26,7 @@ Example (for ARM-based BeagleBone with NPC100 NFC controller on I2C2):
                 clock-frequency = <100000>;
 
                 interrupt-parent = <&gpio1>;
-                interrupts = <29 GPIO_ACTIVE_HIGH>;
+                interrupts = <29 IRQ_TYPE_LEVEL_HIGH>;
 
                 enable-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
                 firmware-gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;
diff --git a/Documentation/devicetree/bindings/net/nfc/pn544.txt b/Documentation/devicetree/bindings/net/nfc/pn544.txt
index 538a86f7b2b0..982d4dd4eba3 100644
--- a/Documentation/devicetree/bindings/net/nfc/pn544.txt
+++ b/Documentation/devicetree/bindings/net/nfc/pn544.txt
@@ -26,7 +26,7 @@ Example (for ARM-based BeagleBone with PN544 on I2C2):
                 clock-frequency = <400000>;
 
                 interrupt-parent = <&gpio1>;
-                interrupts = <17 GPIO_ACTIVE_HIGH>;
+                interrupts = <17 IRQ_TYPE_LEVEL_HIGH>;
 
                 enable-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
                 firmware-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;
diff --git a/Documentation/devicetree/bindings/sound/wm8994.txt b/Documentation/devicetree/bindings/sound/wm8994.txt
index 68c4e8d96bed..b309de00cd83 100644
--- a/Documentation/devicetree/bindings/sound/wm8994.txt
+++ b/Documentation/devicetree/bindings/sound/wm8994.txt
@@ -14,9 +14,15 @@ Required properties:
   - #gpio-cells : Must be 2. The first cell is the pin number and the
     second cell is used to specify optional parameters (currently unused).
 
-  - AVDD2-supply, DBVDD1-supply, DBVDD2-supply, DBVDD3-supply, CPVDD-supply,
-    SPKVDD1-supply, SPKVDD2-supply : power supplies for the device, as covered
-    in Documentation/devicetree/bindings/regulator/regulator.txt
+  - power supplies for the device, as covered in
+    Documentation/devicetree/bindings/regulator/regulator.txt, depending
+    on compatible:
+    - for wlf,wm1811 and wlf,wm8958:
+      AVDD1-supply, AVDD2-supply, DBVDD1-supply, DBVDD2-supply, DBVDD3-supply,
+      DCVDD-supply, CPVDD-supply, SPKVDD1-supply, SPKVDD2-supply
+    - for wlf,wm8994:
+      AVDD1-supply, AVDD2-supply, DBVDD-supply, DCVDD-supply, CPVDD-supply,
+      SPKVDD1-supply, SPKVDD2-supply
 
 Optional properties:
 
@@ -68,11 +74,11 @@ codec: wm8994@1a {
 
         lineout1-se;
 
+        AVDD1-supply = <&regulator>;
         AVDD2-supply = <&regulator>;
         CPVDD-supply = <&regulator>;
-        DBVDD1-supply = <&regulator>;
-        DBVDD2-supply = <&regulator>;
-        DBVDD3-supply = <&regulator>;
+        DBVDD-supply = <&regulator>;
+        DCVDD-supply = <&regulator>;
         SPKVDD1-supply = <&regulator>;
         SPKVDD2-supply = <&regulator>;
 };
diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt
index 44e8bab159ad..baee73134d03 100644
--- a/Documentation/devicetree/bindings/usb/dwc3.txt
+++ b/Documentation/devicetree/bindings/usb/dwc3.txt
@@ -47,6 +47,8 @@ Optional properties:
                         from P0 to P1/P2/P3 without delay.
  - snps,dis-tx-ipgap-linecheck-quirk: when set, disable u2mac linestate check
                         during HS transmit.
+ - snps,parkmode-disable-ss-quirk: when set, all SuperSpeed bus instances in
+                        park mode are disabled.
  - snps,dis_metastability_quirk: when set, disable metastability workaround.
                         CAUTION: use only if you are absolutely sure of it.
  - snps,is-utmi-l1-suspend: true when DWC3 asserts output signal
diff --git a/Documentation/driver-api/libata.rst b/Documentation/driver-api/libata.rst
index 4adc056f7635..01ae89efa2bd 100644
--- a/Documentation/driver-api/libata.rst
+++ b/Documentation/driver-api/libata.rst
@@ -251,7 +251,7 @@ High-level taskfile hooks
 
 ::
 
-    void (*qc_prep) (struct ata_queued_cmd *qc);
+    enum ata_completion_errors (*qc_prep) (struct ata_queued_cmd *qc);
     int (*qc_issue) (struct ata_queued_cmd *qc);
 
 
diff --git a/Documentation/filesystems/affs.txt b/Documentation/filesystems/affs.txt
index 71b63c2b9841..a8f1a58e3692 100644
--- a/Documentation/filesystems/affs.txt
+++ b/Documentation/filesystems/affs.txt
@@ -93,13 +93,15 @@ The Amiga protection flags RWEDRWEDHSPARWED are handled as follows:
 
   - R maps to r for user, group and others. On directories, R implies x.
 
-  - If both W and D are allowed, w will be set.
+  - W maps to w.
 
   - E maps to x.
 
-  - H and P are always retained and ignored under Linux.
+  - D is ignored.
 
-  - A is always reset when a file is written to.
+  - H, S and P are always retained and ignored under Linux.
+
+  - A is cleared when a file is written to.
 
 User id and group id will be used unless set[gu]id are given as mount
 options. Since most of the Amiga file systems are single user systems
@@ -111,11 +113,13 @@ Linux -> Amiga:
 
 The Linux rwxrwxrwx file mode is handled as follows:
 
-  - r permission will set R for user, group and others.
+  - r permission will allow R for user, group and others.
+
+  - w permission will allow W for user, group and others.
 
-  - w permission will set W and D for user, group and others.
+  - x permission of the user will allow E for plain files.
 
-  - x permission of the user will set E for plain files.
+  - D will be allowed for user, group and others.
 
   - All other flags (suid, sgid, ...) are ignored and will
     not be retained.
diff --git a/Documentation/media/uapi/v4l/colorspaces-defs.rst b/Documentation/media/uapi/v4l/colorspaces-defs.rst
index f24615544792..16e46bec8093 100644
--- a/Documentation/media/uapi/v4l/colorspaces-defs.rst
+++ b/Documentation/media/uapi/v4l/colorspaces-defs.rst
@@ -29,8 +29,7 @@ whole range, 0-255, dividing the angular value by 1.41. The enum
 :c:type:`v4l2_hsv_encoding` specifies which encoding is used.
 
 .. note:: The default R'G'B' quantization is full range for all
-   colorspaces except for BT.2020 which uses limited range R'G'B'
-   quantization.
+   colorspaces. HSV formats are always full range.
 
 .. tabularcolumns:: |p{6.0cm}|p{11.5cm}|
 
@@ -162,8 +161,8 @@ whole range, 0-255, dividing the angular value by 1.41. The enum
       - Details
     * - ``V4L2_QUANTIZATION_DEFAULT``
       - Use the default quantization encoding as defined by the
-        colorspace. This is always full range for R'G'B' (except for the
-        BT.2020 colorspace) and HSV. It is usually limited range for Y'CbCr.
+        colorspace. This is always full range for R'G'B' and HSV.
+        It is usually limited range for Y'CbCr.
     * - ``V4L2_QUANTIZATION_FULL_RANGE``
       - Use the full range quantization encoding. I.e. the range [0…1] is
         mapped to [0…255] (with possible clipping to [1…254] to avoid the
@@ -173,4 +172,4 @@ whole range, 0-255, dividing the angular value by 1.41. The enum
     * - ``V4L2_QUANTIZATION_LIM_RANGE``
       - Use the limited range quantization encoding. I.e. the range [0…1]
         is mapped to [16…235]. Cb and Cr are mapped from [-0.5…0.5] to
-        [16…240].
+        [16…240]. Limited Range cannot be used with HSV.
diff --git a/Documentation/media/uapi/v4l/colorspaces-details.rst b/Documentation/media/uapi/v4l/colorspaces-details.rst
index 09fabf4cd412..ca7176cae8dd 100644
--- a/Documentation/media/uapi/v4l/colorspaces-details.rst
+++ b/Documentation/media/uapi/v4l/colorspaces-details.rst
@@ -370,9 +370,8 @@ Colorspace BT.2020 (V4L2_COLORSPACE_BT2020)
 The :ref:`itu2020` standard defines the colorspace used by Ultra-high
 definition television (UHDTV). The default transfer function is
 ``V4L2_XFER_FUNC_709``. The default Y'CbCr encoding is
-``V4L2_YCBCR_ENC_BT2020``. The default R'G'B' quantization is limited
-range (!), and so is the default Y'CbCr quantization. The chromaticities
-of the primary colors and the white reference are:
+``V4L2_YCBCR_ENC_BT2020``. The default Y'CbCr quantization is limited range.
+The chromaticities of the primary colors and the white reference are:
 
 
 
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 4606682423cf..b648c006b7d2 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -915,12 +915,14 @@ icmp_ratelimit - INTEGER
 icmp_msgs_per_sec - INTEGER
         Limit maximal number of ICMP packets sent per second from this host.
         Only messages whose type matches icmp_ratemask (see below) are
-        controlled by this limit.
+        controlled by this limit. For security reasons, the precise count
+        of messages per second is randomized.
         Default: 1000
 
 icmp_msgs_burst - INTEGER
         icmp_msgs_per_sec controls number of ICMP packets sent per second,
         while icmp_msgs_burst controls the burst size of these packets.
+        For security reasons, the precise burst size is randomized.
         Default: 50
 
 icmp_ratemask - INTEGER
diff --git a/Makefile b/Makefile
index 604103007232..3765ae717ce1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 14
-SUBLEVEL = 187
+SUBLEVEL = 213
 EXTRAVERSION =
 NAME = Petit Gorille
 
@@ -487,7 +487,7 @@ ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)
 $(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")
 endif
 GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
-CLANG_FLAGS     += --prefix=$(GCC_TOOLCHAIN_DIR)
+CLANG_FLAGS     += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))
 GCC_TOOLCHAIN   := $(realpath $(GCC_TOOLCHAIN_DIR)/..)
 endif
 ifneq ($(GCC_TOOLCHAIN),)
@@ -769,12 +769,20 @@ ifndef CONFIG_FUNCTION_TRACER
 KBUILD_CFLAGS   += -fomit-frame-pointer
 endif
 endif
-
-# Initialize all stack variables with a pattern, if desired.
-ifdef CONFIG_INIT_STACK_ALL
+# Initialize all stack variables with a 0xAA pattern.
+ifdef CONFIG_INIT_STACK_ALL_PATTERN
 KBUILD_CFLAGS   += -ftrivial-auto-var-init=pattern
 endif
 
+# Initialize all stack variables with a zero value.
+ifdef CONFIG_INIT_STACK_ALL_ZERO
+# Future support for zero initialization is still being debated, see
+# https://bugs.llvm.org/show_bug.cgi?id=45497. These flags are subject to being
+# renamed or dropped.
+KBUILD_CFLAGS  += -ftrivial-auto-var-init=zero
+KBUILD_CFLAGS  += -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang
+endif
+
 KBUILD_CFLAGS   += $(call cc-option, -fno-var-tracking-assignments)
 
 ifdef CONFIG_DEBUG_INFO
@@ -1229,7 +1237,7 @@ endif
 endif
 
 # Disable clang-specific config options when using a different compiler
-clang-specific-configs := LTO_CLANG CFI_CLANG SHADOW_CALL_STACK INIT_STACK_ALL
+clang-specific-configs := LTO_CLANG CFI_CLANG SHADOW_CALL_STACK INIT_STACK_ALL_ZERO
 
 PHONY += check-clang-specific-options
 check-clang-specific-options: $(KCONFIG_CONFIG) FORCE
diff --git a/arch/Kconfig b/arch/Kconfig
index defcb5a00417..1ff4d1584abf 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -339,6 +339,13 @@ config HAVE_RCU_TABLE_FREE
 config HAVE_RCU_TABLE_INVALIDATE
         bool
 
+config ARCH_WANT_IRQS_OFF_ACTIVATE_MM
+        bool
+        help
+          Temporary select until all architectures can be converted to have
+          irqs disabled over activate_mm. Architectures that do IPI based TLB
+          shootdowns should enable this.
+
 config ARCH_HAVE_NMI_SAFE_CMPXCHG
         bool
 
diff --git a/arch/alpha/include/asm/io.h b/arch/alpha/include/asm/io.h
index d123ff90f7a8..9995bed6e92e 100644
--- a/arch/alpha/include/asm/io.h
+++ b/arch/alpha/include/asm/io.h
@@ -493,10 +493,10 @@ extern inline void writeq(u64 b, volatile void __iomem *addr)
 }
 #endif
 
-#define ioread16be(p) be16_to_cpu(ioread16(p))
-#define ioread32be(p) be32_to_cpu(ioread32(p))
-#define iowrite16be(v,p) iowrite16(cpu_to_be16(v), (p))
-#define iowrite32be(v,p) iowrite32(cpu_to_be32(v), (p))
+#define ioread16be(p) swab16(ioread16(p))
+#define ioread32be(p) swab32(ioread32(p))
+#define iowrite16be(v,p) iowrite16(swab16(v), (p))
+#define iowrite32be(v,p) iowrite32(swab32(v), (p))
 
 #define inb_p           inb
 #define inw_p           inw
diff --git a/arch/arc/boot/dts/hsdk.dts b/arch/arc/boot/dts/hsdk.dts
index 57d81c6aa379..75aa3a8f9fdc 100644
--- a/arch/arc/boot/dts/hsdk.dts
+++ b/arch/arc/boot/dts/hsdk.dts
@@ -79,6 +79,8 @@
 
         arcpct: pct {
                 compatible = "snps,archs-pct";
+                interrupt-parent = <&cpu_intc>;
+                interrupts = <20>;
         };
 
         /* TIMER0 with interrupt for clockevent */
@@ -161,7 +163,7 @@
                         reg = <0x8000 0x2000>;
                         interrupts = <10>;
                         interrupt-names = "macirq";
-                        phy-mode = "rgmii";
+                        phy-mode = "rgmii-id";
                         snps,pbl = <32>;
                         snps,multicast-filter-bins = <256>;
                         clocks = <&gmacclk>;
@@ -177,7 +179,7 @@
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 compatible = "snps,dwmac-mdio";
-                                phy0: ethernet-phy@0 {
+                                phy0: ethernet-phy@0 { /* Micrel KSZ9031 */
                                         reg = <0>;
                                         ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
                                         ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
diff --git a/arch/arc/include/asm/elf.h b/arch/arc/include/asm/elf.h
index aa2d6da9d187..12c74e826530 100644
--- a/arch/arc/include/asm/elf.h
+++ b/arch/arc/include/asm/elf.h
@@ -26,7 +26,7 @@
 #define  R_ARC_32_PCREL         0x31
 
 /*to set parameters in the core dumps */
-#define ELF_ARCH                EM_ARCOMPACT
+#define ELF_ARCH                EM_ARC_INUSE
 #define ELF_CLASS               ELFCLASS32
 
 #ifdef CONFIG_CPU_BIG_ENDIAN
diff --git a/arch/arc/kernel/stacktrace.c b/arch/arc/kernel/stacktrace.c
index 74315f302971..35d418cde03b 100644
--- a/arch/arc/kernel/stacktrace.c
+++ b/arch/arc/kernel/stacktrace.c
@@ -41,15 +41,15 @@
 
 #ifdef CONFIG_ARC_DW2_UNWIND
 
-static void seed_unwind_frame_info(struct task_struct *tsk,
-                                   struct pt_regs *regs,
-                                   struct unwind_frame_info *frame_info)
+static int
+seed_unwind_frame_info(struct task_struct *tsk, struct pt_regs *regs,
+                       struct unwind_frame_info *frame_info)
 {
         /*
          * synchronous unwinding (e.g. dump_stack)
          *  - uses current values of SP and friends
          */
-        if (tsk == NULL && regs == NULL) {
+        if (regs == NULL && (tsk == NULL || tsk == current)) {
                 unsigned long fp, sp, blink, ret;
                 frame_info->task = current;
 
@@ -68,11 +68,15 @@ static void seed_unwind_frame_info(struct task_struct *tsk,
                 frame_info->call_frame = 0;
         } else if (regs == NULL) {
                 /*
-                 * Asynchronous unwinding of sleeping task
-                 *  - Gets SP etc from task's pt_regs (saved bottom of kernel
-                 *    mode stack of task)
+                 * Asynchronous unwinding of a likely sleeping task
+                 *  - first ensure it is actually sleeping
+                 *  - if so, it will be in __switch_to, kernel mode SP of task
+                 *    is safe-kept and BLINK at a well known location in there
                  */
 
+                if (tsk->state == TASK_RUNNING)
+                        return -1;
+
                 frame_info->task = tsk;
 
                 frame_info->regs.r27 = TSK_K_FP(tsk);
@@ -106,6 +110,8 @@ static void seed_unwind_frame_info(struct task_struct *tsk,
                 frame_info->regs.r63 = regs->ret;
                 frame_info->call_frame = 0;
         }
+
+        return 0;
 }
 
 #endif
@@ -115,11 +121,12 @@ arc_unwind_core(struct task_struct *tsk, struct pt_regs *regs,
                 int (*consumer_fn) (unsigned int, void *), void *arg)
 {
 #ifdef CONFIG_ARC_DW2_UNWIND
-        int ret = 0;
+        int ret = 0, cnt = 0;
         unsigned int address;
         struct unwind_frame_info frame_info;
 
-        seed_unwind_frame_info(tsk, regs, &frame_info);
+        if (seed_unwind_frame_info(tsk, regs, &frame_info))
+                return 0;
 
         while (1) {
                 address = UNW_PC(&frame_info);
@@ -135,6 +142,11 @@ arc_unwind_core(struct task_struct *tsk, struct pt_regs *regs,
                         break;
 
                 frame_info.regs.r63 = frame_info.regs.r31;
+
+                if (cnt++ > 128) {
+                        printk("unwinder looping too long, aborting !\n");
+                        return 0;
+                }
         }
 
         return address;         /* return the last address it saw */
diff --git a/arch/arc/plat-eznps/include/plat/ctop.h b/arch/arc/plat-eznps/include/plat/ctop.h
index 4f6a1673b3a6..ddfca2c3357a 100644
--- a/arch/arc/plat-eznps/include/plat/ctop.h
+++ b/arch/arc/plat-eznps/include/plat/ctop.h
@@ -43,7 +43,6 @@
 #define CTOP_AUX_DPC                            (CTOP_AUX_BASE + 0x02C)
 #define CTOP_AUX_LPC                            (CTOP_AUX_BASE + 0x030)
 #define CTOP_AUX_EFLAGS                         (CTOP_AUX_BASE + 0x080)
-#define CTOP_AUX_IACK                           (CTOP_AUX_BASE + 0x088)
 #define CTOP_AUX_GPA1                           (CTOP_AUX_BASE + 0x08C)
 #define CTOP_AUX_UDMC                           (CTOP_AUX_BASE + 0x300)
 
diff --git a/arch/arc/plat-hsdk/Kconfig b/arch/arc/plat-hsdk/Kconfig
index 8fb1600b29b7..e5f65a044c7b 100644
--- a/arch/arc/plat-hsdk/Kconfig
+++ b/arch/arc/plat-hsdk/Kconfig
@@ -11,4 +11,5 @@ menuconfig ARC_SOC_HSDK
         select ARC_HAS_ACCL_REGS
         select ARC_IRQ_NO_AUTOSAVE
         select CLK_HSDK
+        select RESET_CONTROLLER
         select RESET_HSDK
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a8ba03171f5f..3bd09c797b63 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -602,7 +602,9 @@ config ARCH_S3C24XX
         select HAVE_S3C_RTC if RTC_CLASS
         select MULTI_IRQ_HANDLER
         select NEED_MACH_IO_H
+        select S3C2410_WATCHDOG
         select SAMSUNG_ATAGS
+        select WATCHDOG
         help
           Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443
           and S3C2450 SoCs based systems, such as the Simtec Electronics BAST
diff --git a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
index bdd4c7a45fbf..8d1356311e3f 100644
--- a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
+++ b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
@@ -303,11 +303,6 @@
         reg = <0x11000 0x100>;
 };
 
-&i2c1 {
-        compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
-        reg = <0x11100 0x100>;
-};
-
 &mpic {
         reg = <0x20a00 0x2d0>, <0x21070 0x58>;
 };
diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
index 3af088d2cba7..ce059f9eaa7d 100644
--- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -231,6 +231,11 @@
                                                 atmel,pins =
                                                         <AT91_PIOE 9 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;   /* PE9, conflicts with A9 */
                                         };
+                                        pinctrl_usb_default: usb_default {
+                                                atmel,pins =
+                                                        <AT91_PIOE 3 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
+                                                         AT91_PIOE 4 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+                                        };
                                 };
                         };
                 };
@@ -248,6 +253,8 @@
                                            &pioE 3 GPIO_ACTIVE_LOW
                                            &pioE 4 GPIO_ACTIVE_LOW
                                           >;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_usb_default>;
                         status = "okay";
                 };
 
diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
index 10f2fb9e0ea6..c271ca960cae 100644
--- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
@@ -158,6 +158,11 @@
                                                 atmel,pins =
                                                         <AT91_PIOE 31 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;
                                         };
+                                        pinctrl_usb_default: usb_default {
+                                                atmel,pins =
+                                                        <AT91_PIOE 11 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
+                                                         AT91_PIOE 14 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+                                        };
                                         pinctrl_key_gpio: key_gpio_0 {
                                                 atmel,pins =
                                                         <AT91_PIOE 8 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
@@ -183,6 +188,8 @@
                                            &pioE 11 GPIO_ACTIVE_HIGH
                                            &pioE 14 GPIO_ACTIVE_HIGH
                                           >;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_usb_default>;
                         status = "okay";
                 };
 
diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index 7768342a6638..64273f943992 100644
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -274,23 +274,26 @@
                                 atmel,adc-use-res = "highres";
 
                                 trigger0 {
-                                        trigger-name = "timer-counter-0";
+                                        trigger-name = "external-rising";
                                         trigger-value = <0x1>;
+                                        trigger-external;
                                 };
+
                                 trigger1 {
-                                        trigger-name = "timer-counter-1";
-                                        trigger-value = <0x3>;
+                                        trigger-name = "external-falling";
+                                        trigger-value = <0x2>;
+                                        trigger-external;
                                 };
 
                                 trigger2 {
-                                        trigger-name = "timer-counter-2";
-                                        trigger-value = <0x5>;
+                                        trigger-name = "external-any";
+                                        trigger-value = <0x3>;
+                                        trigger-external;
                                 };
 
                                 trigger3 {
-                                        trigger-name = "external";
-                                        trigger-value = <0x13>;
-                                        trigger-external;
+                                        trigger-name = "continuous";
+                                        trigger-value = <0x6>;
                                 };
                         };
 
diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index 501877e87a5b..dffa8b9bd536 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -426,7 +426,7 @@
         };
 
         spi@18029200 {
-                compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";
+                compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi";
                 reg = <0x18029200 0x184>,
                       <0x18029000 0x124>,
                       <0x1811b408 0x004>,
diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts
index c4de1353e5df..ba135b255b68 100644
--- a/arch/arm/boot/dts/exynos5410-odroidxu.dts
+++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts
@@ -327,6 +327,8 @@
                                 regulator-name = "vddq_lcd";
                                 regulator-min-microvolt = <1800000>;
                                 regulator-max-microvolt = <1800000>;
+                                /* Supplies also GPK and GPJ */
+                                regulator-always-on;
                         };
 
                         ldo8_reg: LDO8 {
@@ -629,11 +631,11 @@
 };
 
 &usbdrd_dwc3_0 {
-        dr_mode = "host";
+        dr_mode = "peripheral";
 };
 
 &usbdrd_dwc3_1 {
-        dr_mode = "peripheral";
+        dr_mode = "host";
 };
 
 &usbdrd3_0 {
diff --git a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
index ff46a1c27182..c11fd125d8ae 100644
--- a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
@@ -563,6 +563,34 @@
                 interrupt-controller;
                 #interrupt-cells = <2>;
         };
+
+        usb3_1_oc: usb3-1-oc {
+                samsung,pins = "gpk2-4", "gpk2-5";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
+        };
+
+        usb3_1_vbusctrl: usb3-1-vbusctrl {
+                samsung,pins = "gpk2-6", "gpk2-7";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
+                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
+        };
+
+        usb3_0_oc: usb3-0-oc {
+                samsung,pins = "gpk3-0", "gpk3-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
+        };
+
+        usb3_0_vbusctrl: usb3-0-vbusctrl {
+                samsung,pins = "gpk3-2", "gpk3-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
+                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
+        };
 };
 
 &pinctrl_2 {
diff --git a/arch/arm/boot/dts/exynos5410.dtsi b/arch/arm/boot/dts/exynos5410.dtsi
index 7628bbb02324..4e1aced47eb0 100644
--- a/arch/arm/boot/dts/exynos5410.dtsi
+++ b/arch/arm/boot/dts/exynos5410.dtsi
@@ -381,6 +381,8 @@
 &usbdrd3_0 {
         clocks = <&clock CLK_USBD300>;
         clock-names = "usbdrd30";
+        pinctrl-names = "default";
+        pinctrl-0 = <&usb3_0_oc>, <&usb3_0_vbusctrl>;
 };
 
 &usbdrd_phy0 {
@@ -392,6 +394,8 @@
 &usbdrd3_1 {
         clocks = <&clock CLK_USBD301>;
         clock-names = "usbdrd30";
+        pinctrl-names = "default";
+        pinctrl-0 = <&usb3_1_oc>, <&usb3_1_vbusctrl>;
 };
 
 &usbdrd_dwc3_1 {
diff --git a/arch/arm/boot/dts/imx50-evk.dts b/arch/arm/boot/dts/imx50-evk.dts
index 98b5faa06e27..07b8870dfff1 100644
--- a/arch/arm/boot/dts/imx50-evk.dts
+++ b/arch/arm/boot/dts/imx50-evk.dts
@@ -65,7 +65,7 @@
                                 MX50_PAD_CSPI_MISO__CSPI_MISO           0x00
                                 MX50_PAD_CSPI_MOSI__CSPI_MOSI           0x00
                                 MX50_PAD_CSPI_SS0__GPIO4_11             0xc4
-                                MX50_PAD_ECSPI1_MOSI__CSPI_SS1          0xf4
+                                MX50_PAD_ECSPI1_MOSI__GPIO4_13          0x84
                         >;
                 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/imx6qdl-udoo.dtsi
index c96c91d83678..fc4ae2e423bd 100644
--- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi
@@ -94,7 +94,7 @@
 &fec {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_enet>;
-        phy-mode = "rgmii";
+        phy-mode = "rgmii-id";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
index bcced922b280..b4779b0ece96 100644
--- a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
+++ b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
@@ -16,8 +16,10 @@
                 #interrupt-cells = <2>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                spi-max-frequency = <3000000>;
+                spi-max-frequency = <9600000>;
                 spi-cs-high;
+                spi-cpol;
+                spi-cpha;
 
                 cpcap_adc: adc {
                         compatible = "motorola,mapphone-cpcap-adc";
diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
index e96c0ca97972..a50e3c884efa 100644
--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
@@ -183,6 +183,7 @@
                                         fixed-link {
                                                 speed = <1000>;
                                                 full-duplex;
+                                                pause;
                                         };
                                 };
                         };
diff --git a/arch/arm/boot/dts/owl-s500.dtsi b/arch/arm/boot/dts/owl-s500.dtsi
index 51a48741d4c0..2557ce026add 100644
--- a/arch/arm/boot/dts/owl-s500.dtsi
+++ b/arch/arm/boot/dts/owl-s500.dtsi
@@ -82,21 +82,21 @@
                 global_timer: timer@b0020200 {
                         compatible = "arm,cortex-a9-global-timer";
                         reg = <0xb0020200 0x100>;
-                        interrupts = <GIC_PPI 0 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
+                        interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
                         status = "disabled";
                 };
 
                 twd_timer: timer@b0020600 {
                         compatible = "arm,cortex-a9-twd-timer";
                         reg = <0xb0020600 0x20>;
-                        interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
+                        interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
                         status = "disabled";
                 };
 
                 twd_wdt: wdt@b0020620 {
                         compatible = "arm,cortex-a9-twd-wdt";
                         reg = <0xb0020620 0xe0>;
-                        interrupts = <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
+                        interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
                         status = "disabled";
                 };
 
diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
index b290a5abb901..a215218237a6 100644
--- a/arch/arm/boot/dts/s5pv210.dtsi
+++ b/arch/arm/boot/dts/s5pv210.dtsi
@@ -101,19 +101,16 @@
                 };
 
                 clocks: clock-controller@e0100000 {
-                        compatible = "samsung,s5pv210-clock", "simple-bus";
+                        compatible = "samsung,s5pv210-clock";
                         reg = <0xe0100000 0x10000>;
                         clock-names = "xxti", "xusbxti";
                         clocks = <&xxti>, <&xusbxti>;
                         #clock-cells = <1>;
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        ranges;
+                };
 
-                        pmu_syscon: syscon@e0108000 {
-                                compatible = "samsung-s5pv210-pmu", "syscon";
-                                reg = <0xe0108000 0x8000>;
-                        };
+                pmu_syscon: syscon@e0108000 {
+                        compatible = "samsung-s5pv210-pmu", "syscon";
+                        reg = <0xe0108000 0x8000>;
                 };
 
                 pinctrl0: pinctrl@e0200000 {
@@ -129,35 +126,28 @@
                         };
                 };
 
-                amba {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        compatible = "simple-bus";
-                        ranges;
-
-                        pdma0: dma@e0900000 {
-                                compatible = "arm,pl330", "arm,primecell";
-                                reg = <0xe0900000 0x1000>;
-                                interrupt-parent = <&vic0>;
-                                interrupts = <19>;
-                                clocks = <&clocks CLK_PDMA0>;
-                                clock-names = "apb_pclk";
-                                #dma-cells = <1>;
-                                #dma-channels = <8>;
-                                #dma-requests = <32>;
-                        };
+                pdma0: dma@e0900000 {
+                        compatible = "arm,pl330", "arm,primecell";
+                        reg = <0xe0900000 0x1000>;
+                        interrupt-parent = <&vic0>;
+                        interrupts = <19>;
+                        clocks = <&clocks CLK_PDMA0>;
+                        clock-names = "apb_pclk";
+                        #dma-cells = <1>;
+                        #dma-channels = <8>;
+                        #dma-requests = <32>;
+                };
 
-                        pdma1: dma@e0a00000 {
-                                compatible = "arm,pl330", "arm,primecell";
-                                reg = <0xe0a00000 0x1000>;
-                                interrupt-parent = <&vic0>;
-                                interrupts = <20>;
-                                clocks = <&clocks CLK_PDMA1>;
-                                clock-names = "apb_pclk";
-                                #dma-cells = <1>;
-                                #dma-channels = <8>;
-                                #dma-requests = <32>;
-                        };
+                pdma1: dma@e0a00000 {
+                        compatible = "arm,pl330", "arm,primecell";
+                        reg = <0xe0a00000 0x1000>;
+                        interrupt-parent = <&vic0>;
+                        interrupts = <20>;
+                        clocks = <&clocks CLK_PDMA1>;
+                        clock-names = "apb_pclk";
+                        #dma-cells = <1>;
+                        #dma-channels = <8>;
+                        #dma-requests = <32>;
                 };
 
                 spi0: spi@e1300000 {
@@ -230,43 +220,36 @@
                         status = "disabled";
                 };
 
-                audio-subsystem {
-                        compatible = "samsung,s5pv210-audss", "simple-bus";
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        ranges;
-
-                        clk_audss: clock-controller@eee10000 {
-                                compatible = "samsung,s5pv210-audss-clock";
-                                reg = <0xeee10000 0x1000>;
-                                clock-names = "hclk", "xxti",
-                                                "fout_epll",
-                                                "sclk_audio0";
-                                clocks = <&clocks DOUT_HCLKP>, <&xxti>,
-                                                <&clocks FOUT_EPLL>,
-                                                <&clocks SCLK_AUDIO0>;
-                                #clock-cells = <1>;
-                        };
+                clk_audss: clock-controller@eee10000 {
+                        compatible = "samsung,s5pv210-audss-clock";
+                        reg = <0xeee10000 0x1000>;
+                        clock-names = "hclk", "xxti",
+                                      "fout_epll",
+                                      "sclk_audio0";
+                        clocks = <&clocks DOUT_HCLKP>, <&xxti>,
+                                 <&clocks FOUT_EPLL>,
+                                 <&clocks SCLK_AUDIO0>;
+                        #clock-cells = <1>;
+                };
 
-                        i2s0: i2s@eee30000 {
-                                compatible = "samsung,s5pv210-i2s";
-                                reg = <0xeee30000 0x1000>;
-                                interrupt-parent = <&vic2>;
-                                interrupts = <16>;
-                                dma-names = "rx", "tx", "tx-sec";
-                                dmas = <&pdma1 9>, <&pdma1 10>, <&pdma1 11>;
-                                clock-names = "iis",
-                                                "i2s_opclk0",
-                                                "i2s_opclk1";
-                                clocks = <&clk_audss CLK_I2S>,
-                                                <&clk_audss CLK_I2S>,
-                                                <&clk_audss CLK_DOUT_AUD_BUS>;
+                i2s0: i2s@eee30000 {
+                        compatible = "samsung,s5pv210-i2s";
+                        reg = <0xeee30000 0x1000>;
+                        interrupt-parent = <&vic2>;
+                        interrupts = <16>;
+                        dma-names = "rx", "tx", "tx-sec";
+                        dmas = <&pdma1 9>, <&pdma1 10>, <&pdma1 11>;
+                        clock-names = "iis",
+                                      "i2s_opclk0",
+                                      "i2s_opclk1";
+                        clocks = <&clk_audss CLK_I2S>,
+                                 <&clk_audss CLK_I2S>,
+                                 <&clk_audss CLK_DOUT_AUD_BUS>;