138 files changed, 1428 insertions, 1010 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e17ebf70b548..3e5a5d263f29 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8096,6 +8096,16 @@ F:	include/linux/iommu.h
 F:      include/linux/of_iommu.h
 F:      include/linux/iova.h
+IO_URING
+M:      Jens Axboe <axboe@kernel.dk>
+L:      linux-block@vger.kernel.org
+L:      linux-fsdevel@vger.kernel.org
+T:      git git://git.kernel.dk/linux-block
+T:      git git://git.kernel.dk/liburing
+S:      Maintained
+F:      fs/io_uring.c
+F:      include/uapi/linux/io_uring.h
 IP MASQUERADING
 M:      Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
 S:      Maintained
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index df55672c59e6..c781e45d1d99 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -144,11 +144,11 @@ config ARC_CPU_770
          Support for ARC770 core introduced with Rel 4.10 (Summer 2011)
          This core has a bunch of cool new features:
          -MMU-v3: Variable Page Sz (4k, 8k, 16k), bigger J-TLB (128x4)
-                   Shared Address Spaces (for sharing TLB entries in MMU)
+                   Shared Address Spaces (for sharing TLB entries in MMU)
          -Caches: New Prog Model, Region Flush
          -Insns: endian swap, load-locked/store-conditional, time-stamp-ctr
-endif   #ISA_ARCOMPACT
+endif #ISA_ARCOMPACT
 config ARC_CPU_HS
        bool "ARC-HS"
@@ -198,7 +198,7 @@ config ARC_SMP_HALT_ON_RESET
          at designated entry point. For other case, all jump to common
          entry point and spin wait for Master's signal.
-endif   #SMP
+endif #SMP
 config ARC_MCIP
        bool "ARConnect Multicore IP (MCIP) Support "
@@ -249,7 +249,7 @@ config ARC_CACHE_VIPT_ALIASING
        bool "Support VIPT Aliasing D$"
        depends on ARC_HAS_DCACHE && ISA_ARCOMPACT
-endif   #ARC_CACHE
+endif #ARC_CACHE
 config ARC_HAS_ICCM
        bool "Use ICCM"
@@ -370,7 +370,7 @@ config ARC_FPU_SAVE_RESTORE
          based on actual usage of FPU by a task. Thus our implemn does
          this for all tasks in system.
-endif   #ISA_ARCOMPACT
+endif #ISA_ARCOMPACT
 config ARC_CANT_LLSC
        def_bool n
@@ -386,6 +386,15 @@ config ARC_HAS_SWAPE
 if ISA_ARCV2
+config ARC_USE_UNALIGNED_MEM_ACCESS
+        bool "Enable unaligned access in HW"
+        default y
+        select HAVE_EFFICIENT_UNALIGNED_ACCESS
+        help
+          The ARC HS architecture supports unaligned memory access
+          which is disabled by default. Enable unaligned access in
+          hardware and use software to use it
 config ARC_HAS_LL64
        bool "Insn: 64bit LDD/STD"
        help
@@ -414,7 +423,7 @@ config ARC_IRQ_NO_AUTOSAVE
          This is programmable and can be optionally disabled in which case
          software INTERRUPT_PROLOGUE/EPILGUE do the needed work
-endif   # ISA_ARCV2
+endif # ISA_ARCV2
 endmenu   # "ARC CPU Configuration"
diff --git a/arch/arc/Makefile b/arch/arc/Makefile
index df00578c279d..e2b991f75bc5 100644
--- a/arch/arc/Makefile
+++ b/arch/arc/Makefile
@@ -28,6 +28,12 @@ cflags-$(CONFIG_ARC_HAS_SWAPE)		+= -mswape
 ifdef CONFIG_ISA_ARCV2
+ifdef CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS
+cflags-y                                += -munaligned-access
+else
+cflags-y                                += -mno-unaligned-access
+endif
 ifndef CONFIG_ARC_HAS_LL64
 cflags-y                                += -mno-ll64
 endif
diff --git a/arch/arc/boot/dts/abilis_tb100.dtsi b/arch/arc/boot/dts/abilis_tb100.dtsi
index 02410b211433..c0bcd97522bb 100644
--- a/arch/arc/boot/dts/abilis_tb100.dtsi
+++ b/arch/arc/boot/dts/abilis_tb100.dtsi
@@ -38,7 +38,7 @@
                        clock-div = <6>;
                };
-                iomux: iomux@FF10601c {
+                iomux: iomux@ff10601c {
                        /* Port 1 */
                        pctl_tsin_s0: pctl-tsin-s0 {   /* Serial TS-in 0 */
                                abilis,function = "mis0";
@@ -162,182 +162,182 @@
                        };
                };
-                gpioa: gpio@FF140000 {
+                gpioa: gpio@ff140000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF140000 0x1000>;
+                        reg = <0xff140000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <3>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpioa";
                };
-                gpiob: gpio@FF141000 {
+                gpiob: gpio@ff141000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF141000 0x1000>;
+                        reg = <0xff141000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <2>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpiob";
                };
-                gpioc: gpio@FF142000 {
+                gpioc: gpio@ff142000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF142000 0x1000>;
+                        reg = <0xff142000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <3>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpioc";
                };
-                gpiod: gpio@FF143000 {
+                gpiod: gpio@ff143000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF143000 0x1000>;
+                        reg = <0xff143000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <2>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpiod";
                };
-                gpioe: gpio@FF144000 {
+                gpioe: gpio@ff144000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF144000 0x1000>;
+                        reg = <0xff144000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <3>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpioe";
                };
-                gpiof: gpio@FF145000 {
+                gpiof: gpio@ff145000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF145000 0x1000>;
+                        reg = <0xff145000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <2>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpiof";
                };
-                gpiog: gpio@FF146000 {
+                gpiog: gpio@ff146000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF146000 0x1000>;
+                        reg = <0xff146000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <3>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpiog";
                };
-                gpioh: gpio@FF147000 {
+                gpioh: gpio@ff147000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF147000 0x1000>;
+                        reg = <0xff147000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <2>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpioh";
                };
-                gpioi: gpio@FF148000 {
+                gpioi: gpio@ff148000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF148000 0x1000>;
+                        reg = <0xff148000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <12>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpioi";
                };
-                gpioj: gpio@FF149000 {
+                gpioj: gpio@ff149000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF149000 0x1000>;
+                        reg = <0xff149000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <32>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpioj";
                };
-                gpiok: gpio@FF14a000 {
+                gpiok: gpio@ff14a000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF14A000 0x1000>;
+                        reg = <0xff14a000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <22>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpiok";
                };
-                gpiol: gpio@FF14b000 {
+                gpiol: gpio@ff14b000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF14B000 0x1000>;
+                        reg = <0xff14b000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <4>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpiol";
                };
-                gpiom: gpio@FF14c000 {
+                gpiom: gpio@ff14c000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF14C000 0x1000>;
+                        reg = <0xff14c000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <4>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpiom";
                };
-                gpion: gpio@FF14d000 {
+                gpion: gpio@ff14d000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF14D000 0x1000>;
+                        reg = <0xff14d000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <5>;
diff --git a/arch/arc/boot/dts/abilis_tb100_dvk.dts b/arch/arc/boot/dts/abilis_tb100_dvk.dts
index 3acf04db8030..c968e677db46 100644
--- a/arch/arc/boot/dts/abilis_tb100_dvk.dts
+++ b/arch/arc/boot/dts/abilis_tb100_dvk.dts
@@ -37,27 +37,27 @@
        };
        soc100 {
-                uart@FF100000 {
+                uart@ff100000 {
                        pinctrl-names = "default";
                        pinctrl-0 = <&pctl_uart0>;
                };
-                ethernet@FE100000 {
+                ethernet@fe100000 {
                        phy-mode = "rgmii";
                };
-                i2c0: i2c@FF120000 {
+                i2c0: i2c@ff120000 {
                        i2c-sda-hold-time-ns = <432>;
                };
-                i2c1: i2c@FF121000 {
+                i2c1: i2c@ff121000 {
                        i2c-sda-hold-time-ns = <432>;
                };
-                i2c2: i2c@FF122000 {
+                i2c2: i2c@ff122000 {
                        i2c-sda-hold-time-ns = <432>;
                };
-                i2c3: i2c@FF123000 {
+                i2c3: i2c@ff123000 {
                        i2c-sda-hold-time-ns = <432>;
                };
-                i2c4: i2c@FF124000 {
+                i2c4: i2c@ff124000 {
                        i2c-sda-hold-time-ns = <432>;
                };
diff --git a/arch/arc/boot/dts/abilis_tb101.dtsi b/arch/arc/boot/dts/abilis_tb101.dtsi
index f9e7686044eb..6a1615f58f05 100644
--- a/arch/arc/boot/dts/abilis_tb101.dtsi
+++ b/arch/arc/boot/dts/abilis_tb101.dtsi
@@ -38,7 +38,7 @@
                        clock-div = <6>;
                };
-                iomux: iomux@FF10601c {
+                iomux: iomux@ff10601c {
                        /* Port 1 */
                        pctl_tsin_s0: pctl-tsin-s0 {   /* Serial TS-in 0 */
                                abilis,function = "mis0";
@@ -171,182 +171,182 @@
                        };
                };
-                gpioa: gpio@FF140000 {
+                gpioa: gpio@ff140000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF140000 0x1000>;
+                        reg = <0xff140000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <3>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpioa";
                };
-                gpiob: gpio@FF141000 {
+                gpiob: gpio@ff141000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF141000 0x1000>;
+                        reg = <0xff141000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <2>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpiob";
                };
-                gpioc: gpio@FF142000 {
+                gpioc: gpio@ff142000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF142000 0x1000>;
+                        reg = <0xff142000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <3>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpioc";
                };
-                gpiod: gpio@FF143000 {
+                gpiod: gpio@ff143000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF143000 0x1000>;
+                        reg = <0xff143000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <2>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpiod";
                };
-                gpioe: gpio@FF144000 {
+                gpioe: gpio@ff144000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF144000 0x1000>;
+                        reg = <0xff144000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <3>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpioe";
                };
-                gpiof: gpio@FF145000 {
+                gpiof: gpio@ff145000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF145000 0x1000>;
+                        reg = <0xff145000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <2>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpiof";
                };
-                gpiog: gpio@FF146000 {
+                gpiog: gpio@ff146000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF146000 0x1000>;
+                        reg = <0xff146000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <3>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpiog";
                };
-                gpioh: gpio@FF147000 {
+                gpioh: gpio@ff147000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF147000 0x1000>;
+                        reg = <0xff147000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <2>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpioh";
                };
-                gpioi: gpio@FF148000 {
+                gpioi: gpio@ff148000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF148000 0x1000>;
+                        reg = <0xff148000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <12>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpioi";
                };
-                gpioj: gpio@FF149000 {
+                gpioj: gpio@ff149000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF149000 0x1000>;
+                        reg = <0xff149000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <32>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpioj";
                };
-                gpiok: gpio@FF14a000 {
+                gpiok: gpio@ff14a000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF14A000 0x1000>;
+                        reg = <0xff14a000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <22>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpiok";
                };
-                gpiol: gpio@FF14b000 {
+                gpiol: gpio@ff14b000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF14B000 0x1000>;
+                        reg = <0xff14b000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <4>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpiol";
                };
-                gpiom: gpio@FF14c000 {
+                gpiom: gpio@ff14c000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF14C000 0x1000>;
+                        reg = <0xff14c000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <4>;
                        gpio-ranges = <&iomux 0 0 0>;
                        gpio-ranges-group-names = "gpiom";
                };
-                gpion: gpio@FF14d000 {
+                gpion: gpio@ff14d000 {
                        compatible = "abilis,tb10x-gpio";
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <27 2>;
-                        reg = <0xFF14D000 0x1000>;
+                        reg = <0xff14d000 0x1000>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        abilis,ngpio = <5>;
diff --git a/arch/arc/boot/dts/abilis_tb101_dvk.dts b/arch/arc/boot/dts/abilis_tb101_dvk.dts
index 37d88c5dd181..05143ce9c120 100644
--- a/arch/arc/boot/dts/abilis_tb101_dvk.dts
+++ b/arch/arc/boot/dts/abilis_tb101_dvk.dts
@@ -37,27 +37,27 @@
        };
        soc100 {
-                uart@FF100000 {
+                uart@ff100000 {
                        pinctrl-names = "default";
                        pinctrl-0 = <&pctl_uart0>;
                };
-                ethernet@FE100000 {
+                ethernet@fe100000 {
                        phy-mode = "rgmii";
                };
-                i2c0: i2c@FF120000 {
+                i2c0: i2c@ff120000 {
                        i2c-sda-hold-time-ns = <432>;
                };
-                i2c1: i2c@FF121000 {
+                i2c1: i2c@ff121000 {
                        i2c-sda-hold-time-ns = <432>;
                };
-                i2c2: i2c@FF122000 {
+                i2c2: i2c@ff122000 {
                        i2c-sda-hold-time-ns = <432>;
                };
-                i2c3: i2c@FF123000 {
+                i2c3: i2c@ff123000 {
                        i2c-sda-hold-time-ns = <432>;
                };
-                i2c4: i2c@FF124000 {
+                i2c4: i2c@ff124000 {
                        i2c-sda-hold-time-ns = <432>;
                };
diff --git a/arch/arc/boot/dts/abilis_tb10x.dtsi b/arch/arc/boot/dts/abilis_tb10x.dtsi
index 3121536b25a3..2fbf1bdfe6de 100644
--- a/arch/arc/boot/dts/abilis_tb10x.dtsi
+++ b/arch/arc/boot/dts/abilis_tb10x.dtsi
@@ -54,7 +54,7 @@
                #size-cells     = <1>;
                device_type     = "soc";
                ranges          = <0xfe000000 0xfe000000 0x02000000
-                                0x000F0000 0x000F0000 0x00010000>;
+                                0x000f0000 0x000f0000 0x00010000>;
                compatible      = "abilis,tb10x", "simple-bus";
                pll0: oscillator {
@@ -75,10 +75,10 @@
                        clock-output-names = "ahb_clk";
                };
-                iomux: iomux@FF10601c {
+                iomux: iomux@ff10601c {
                        compatible = "abilis,tb10x-iomux";
                        #gpio-range-cells = <3>;
-                        reg = <0xFF10601c 0x4>;
+                        reg = <0xff10601c 0x4>;
                };
                intc: interrupt-controller {
@@ -88,7 +88,7 @@
                };
                tb10x_ictl: pic@fe002000 {
                        compatible = "abilis,tb10x-ictl";
-                        reg = <0xFE002000 0x20>;
+                        reg = <0xfe002000 0x20>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
                        interrupt-parent = <&intc>;
@@ -96,27 +96,27 @@
                                        20 21 22 23 24 25 26 27 28 29 30 31>;
                };
-                uart@FF100000 {
+                uart@ff100000 {
                        compatible = "snps,dw-apb-uart";
-                        reg = <0xFF100000 0x100>;
+                        reg = <0xff100000 0x100>;
                        clock-frequency = <166666666>;
                        interrupts = <25 8>;
                        reg-shift = <2>;
                        reg-io-width = <4>;
                        interrupt-parent = <&tb10x_ictl>;
                };
-                ethernet@FE100000 {
+                ethernet@fe100000 {
                        compatible = "snps,dwmac-3.70a","snps,dwmac";
-                        reg = <0xFE100000 0x1058>;
+                        reg = <0xfe100000 0x1058>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <6 8>;
                        interrupt-names = "macirq";
                        clocks = <&ahb_clk>;
                        clock-names = "stmmaceth";
                };
-                dma@FE000000 {
+                dma@fe000000 {
                        compatible = "snps,dma-spear1340";
-                        reg = <0xFE000000 0x400>;
+                        reg = <0xfe000000 0x400>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <14 8>;
                        dma-channels = <6>;
@@ -132,70 +132,70 @@
                        multi-block = <1 1 1 1 1 1>;
                };
-                i2c0: i2c@FF120000 {
+                i2c0: i2c@ff120000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "snps,designware-i2c";
-                        reg = <0xFF120000 0x1000>;
+                        reg = <0xff120000 0x1000>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <12 8>;
                        clocks = <&ahb_clk>;
                };
-                i2c1: i2c@FF121000 {
+                i2c1: i2c@ff121000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "snps,designware-i2c";
-                        reg = <0xFF121000 0x1000>;
+                        reg = <0xff121000 0x1000>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <12 8>;
                        clocks = <&ahb_clk>;
                };
-                i2c2: i2c@FF122000 {
+                i2c2: i2c@ff122000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "snps,designware-i2c";
-                        reg = <0xFF122000 0x1000>;
+                        reg = <0xff122000 0x1000>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <12 8>;
                        clocks = <&ahb_clk>;
                };
-                i2c3: i2c@FF123000 {
+                i2c3: i2c@ff123000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "snps,designware-i2c";
-                        reg = <0xFF123000 0x1000>;
+                        reg = <0xff123000 0x1000>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <12 8>;
                        clocks = <&ahb_clk>;
                };
-                i2c4: i2c@FF124000 {
+                i2c4: i2c@ff124000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "snps,designware-i2c";
-                        reg = <0xFF124000 0x1000>;
+                        reg = <0xff124000 0x1000>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <12 8>;
                        clocks = <&ahb_clk>;
                };
-                spi0: spi@0xFE010000 {
+                spi0: spi@fe010000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        cell-index = <0>;
                        compatible = "abilis,tb100-spi";
                        num-cs = <1>;
-                        reg = <0xFE010000 0x20>;
+                        reg = <0xfe010000 0x20>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <26 8>;
                        clocks = <&ahb_clk>;
                };
-                spi1: spi@0xFE011000 {
+                spi1: spi@fe011000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        cell-index = <1>;
                        compatible = "abilis,tb100-spi";
                        num-cs = <2>;
-                        reg = <0xFE011000 0x20>;
+                        reg = <0xfe011000 0x20>;
                        interrupt-parent = <&tb10x_ictl>;
                        interrupts = <10 8>;
                        clocks = <&ahb_clk>;
@@ -226,23 +226,23 @@
                        interrupts = <20 2>, <19 2>;
                        interrupt-names = "cmd_irq", "event_irq";
                };
-                tb10x_mdsc0: tb10x-mdscr@FF300000 {
+                tb10x_mdsc0: tb10x-mdscr@ff300000 {
                        compatible = "abilis,tb100-mdscr";
-                        reg = <0xFF300000 0x7000>;
+                        reg = <0xff300000 0x7000>;
                        tb100-mdscr-manage-tsin;
                };
-                tb10x_mscr0: tb10x-mdscr@FF307000 {
+                tb10x_mscr0: tb10x-mdscr@ff307000 {
                        compatible = "abilis,tb100-mdscr";
-                        reg = <0xFF307000 0x7000>;
+                        reg = <0xff307000 0x7000>;
                };
                tb10x_scr0: tb10x-mdscr@ff30e000 {
                        compatible = "abilis,tb100-mdscr";
-                        reg = <0xFF30e000 0x4000>;
+                        reg = <0xff30e000 0x4000>;
                        tb100-mdscr-manage-tsin;
                };
                tb10x_scr1: tb10x-mdscr@ff312000 {
                        compatible = "abilis,tb100-mdscr";
-                        reg = <0xFF312000 0x4000>;
+                        reg = <0xff312000 0x4000>;
                        tb100-mdscr-manage-tsin;
                };
                tb10x_wfb: tb10x-wfb@ff319000 {
diff --git a/arch/arc/boot/dts/axc001.dtsi b/arch/arc/boot/dts/axc001.dtsi
index fdc266504ada..37be3bf03ad6 100644
--- a/arch/arc/boot/dts/axc001.dtsi
+++ b/arch/arc/boot/dts/axc001.dtsi
@@ -41,7 +41,7 @@
                 * this GPIO block ORs all interrupts on CPU card (creg,..)
                 * to uplink only 1 IRQ to ARC core intc
                 */
-                dw-apb-gpio@0x2000 {
+                dw-apb-gpio@2000 {
                        compatible = "snps,dw-apb-gpio";
                        reg = < 0x2000 0x80 >;
                        #address-cells = <1>;
@@ -60,7 +60,7 @@
                        };
                };
-                debug_uart: dw-apb-uart@0x5000 {
+                debug_uart: dw-apb-uart@5000 {
                        compatible = "snps,dw-apb-uart";
                        reg = <0x5000 0x100>;
                        clock-frequency = <33333000>;
@@ -88,7 +88,7 @@
         * avoid duplicating the MB dtsi file given that IRQ from
         * this intc to cpu intc are different for axs101 and axs103
         */
-        mb_intc: dw-apb-ictl@0xe0012000 {
+        mb_intc: dw-apb-ictl@e0012000 {
                #interrupt-cells = <1>;
                compatible = "snps,dw-apb-ictl";
                reg = < 0x0 0xe0012000 0x0 0x200 >;
diff --git a/arch/arc/boot/dts/axc003.dtsi b/arch/arc/boot/dts/axc003.dtsi
index d75d65ddf8e3..effa37536d7a 100644
--- a/arch/arc/boot/dts/axc003.dtsi
+++ b/arch/arc/boot/dts/axc003.dtsi
@@ -55,7 +55,7 @@
                 * this GPIO block ORs all interrupts on CPU card (creg,..)
                 * to uplink only 1 IRQ to ARC core intc
                 */
-                dw-apb-gpio@0x2000 {
+                dw-apb-gpio@2000 {
                        compatible = "snps,dw-apb-gpio";
                        reg = < 0x2000 0x80 >;
                        #address-cells = <1>;
@@ -74,7 +74,7 @@
                        };
                };
-                debug_uart: dw-apb-uart@0x5000 {
+                debug_uart: dw-apb-uart@5000 {
                        compatible = "snps,dw-apb-uart";
                        reg = <0x5000 0x100>;
                        clock-frequency = <33333000>;
@@ -102,19 +102,19 @@
         * external DMA buffer located outside of IOC aperture.
         */
        axs10x_mb {
-                ethernet@0x18000 {
+                ethernet@18000 {
                        dma-coherent;
                };
-                ehci@0x40000 {
+                ehci@40000 {
                        dma-coherent;
                };
-                ohci@0x60000 {
+                ohci@60000 {
                        dma-coherent;
                };
-                mmc@0x15000 {
+                mmc@15000 {
                        dma-coherent;
                };
        };
@@ -132,7 +132,7 @@
         * avoid duplicating the MB dtsi file given that IRQ from
         * this intc to cpu intc are different for axs101 and axs103
         */
-        mb_intc: dw-apb-ictl@0xe0012000 {
+        mb_intc: dw-apb-ictl@e0012000 {
                #interrupt-cells = <1>;
                compatible = "snps,dw-apb-ictl";
                reg = < 0x0 0xe0012000 0x0 0x200 >;
@@ -153,7 +153,7 @@
                #size-cells = <2>;
                ranges;
                /*
-                 * Move frame buffer out of IOC aperture (0x8z-0xAz).
+                 * Move frame buffer out of IOC aperture (0x8z-0xaz).
                 */
                frame_buffer: frame_buffer@be000000 {
                        compatible = "shared-dma-pool";
diff --git a/arch/arc/boot/dts/axc003_idu.dtsi b/arch/arc/boot/dts/axc003_idu.dtsi
index a05bb737ea63..e401e59f6180 100644
--- a/arch/arc/boot/dts/axc003_idu.dtsi
+++ b/arch/arc/boot/dts/axc003_idu.dtsi
@@ -62,7 +62,7 @@
                 * this GPIO block ORs all interrupts on CPU card (creg,..)
                 * to uplink only 1 IRQ to ARC core intc
                 */
-                dw-apb-gpio@0x2000 {
+                dw-apb-gpio@2000 {
                        compatible = "snps,dw-apb-gpio";
                        reg = < 0x2000 0x80 >;
                        #address-cells = <1>;
@@ -81,7 +81,7 @@
                        };
                };
-                debug_uart: dw-apb-uart@0x5000 {
+                debug_uart: dw-apb-uart@5000 {
                        compatible = "snps,dw-apb-uart";
                        reg = <0x5000 0x100>;
                        clock-frequency = <33333000>;
@@ -109,19 +109,19 @@
         * external DMA buffer located outside of IOC aperture.
         */
        axs10x_mb {
-                ethernet@0x18000 {
+                ethernet@18000 {
                        dma-coherent;
                };
-                ehci@0x40000 {
+                ehci@40000 {
                        dma-coherent;
                };
-                ohci@0x60000 {
+                ohci@60000 {
                        dma-coherent;
                };
-                mmc@0x15000 {
+                mmc@15000 {
                        dma-coherent;
                };
        };
@@ -138,7 +138,7 @@
         * avoid duplicating the MB dtsi file given that IRQ from
         * this intc to cpu intc are different for axs101 and axs103
         */
-        mb_intc: dw-apb-ictl@0xe0012000 {
+        mb_intc: dw-apb-ictl@e0012000 {
                #interrupt-cells = <1>;
                compatible = "snps,dw-apb-ictl";
                reg = < 0x0 0xe0012000 0x0 0x200 >;
@@ -159,7 +159,7 @@
                #size-cells = <2>;
                ranges;
                /*
-                 * Move frame buffer out of IOC aperture (0x8z-0xAz).
+                 * Move frame buffer out of IOC aperture (0x8z-0xaz).
                 */
                frame_buffer: frame_buffer@be000000 {
                        compatible = "shared-dma-pool";
diff --git a/arch/arc/boot/dts/axs10x_mb.dtsi b/arch/arc/boot/dts/axs10x_mb.dtsi
index 37bafd44e36d..4ead6dc9af2f 100644
--- a/arch/arc/boot/dts/axs10x_mb.dtsi
+++ b/arch/arc/boot/dts/axs10x_mb.dtsi
@@ -72,7 +72,7 @@
                        };
                };
-                gmac: ethernet@0x18000 {
+                gmac: ethernet@18000 {
                        #interrupt-cells = <1>;
                        compatible = "snps,dwmac";
                        reg = < 0x18000 0x2000 >;
@@ -88,13 +88,13 @@
                        mac-address = [00 00 00 00 00 00]; /* Filled in by U-Boot */
                };
-                ehci@0x40000 {
+                ehci@40000 {
                        compatible = "generic-ehci";
                        reg = < 0x40000 0x100 >;
                        interrupts = < 8 >;
                };
-                ohci@0x60000 {
+                ohci@60000 {
                        compatible = "generic-ohci";
                        reg = < 0x60000 0x100 >;
                        interrupts = < 8 >;
@@ -118,7 +118,7 @@
                 * dw_mci_pltfm_prepare_command() is used in generic platform
                 * code.
                 */
-                mmc@0x15000 {
+                mmc@15000 {
                        compatible = "altr,socfpga-dw-mshc";
                        reg = < 0x15000 0x400 >;
                        fifo-depth = < 16 >;
@@ -129,7 +129,7 @@
                        bus-width = < 4 >;
                };
-                uart@0x20000 {
+                uart@20000 {
                        compatible = "snps,dw-apb-uart";
                        reg = <0x20000 0x100>;
                        clock-frequency = <33333333>;
@@ -139,7 +139,7 @@
                        reg-io-width = <4>;
                };
-                uart@0x21000 {
+                uart@21000 {
                        compatible = "snps,dw-apb-uart";
                        reg = <0x21000 0x100>;
                        clock-frequency = <33333333>;
@@ -150,7 +150,7 @@
                };
                /* UART muxed with USB data port (ttyS3) */
-                uart@0x22000 {
+                uart@22000 {
                        compatible = "snps,dw-apb-uart";
                        reg = <0x22000 0x100>;
                        clock-frequency = <33333333>;
@@ -160,7 +160,7 @@
                        reg-io-width = <4>;
                };
-                i2c@0x1d000 {
+                i2c@1d000 {
                        compatible = "snps,designware-i2c";
                        reg = <0x1d000 0x100>;
                        clock-frequency = <400000>;
@@ -177,7 +177,7 @@
                        #sound-dai-cells = <0>;
                };
-                i2c@0x1f000 {
+                i2c@1f000 {
                        compatible = "snps,designware-i2c";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -218,13 +218,13 @@
                                };
                        };
-                        eeprom@0x54{
+                        eeprom@54{
                                compatible = "atmel,24c01";
                                reg = <0x54>;
                                pagesize = <0x8>;
                        };
-                        eeprom@0x57{
+                        eeprom@57{
                                compatible = "atmel,24c04";
                                reg = <0x57>;
                                pagesize = <0x8>;
diff --git a/arch/arc/boot/dts/hsdk.dts b/arch/arc/boot/dts/hsdk.dts
index 43f17b51ee89..69bc1c9e8e50 100644
--- a/arch/arc/boot/dts/hsdk.dts
+++ b/arch/arc/boot/dts/hsdk.dts
@@ -110,12 +110,12 @@
                cgu_rst: reset-controller@8a0 {
                        compatible = "snps,hsdk-reset";
                        #reset-cells = <1>;
-                        reg = <0x8A0 0x4>, <0xFF0 0x4>;
+                        reg = <0x8a0 0x4>, <0xff0 0x4>;
                };
                core_clk: core-clk@0 {
                        compatible = "snps,hsdk-core-pll-clock";
-                        reg = <0x00 0x10>, <0x14B8 0x4>;
+                        reg = <0x00 0x10>, <0x14b8 0x4>;
                        #clock-cells = <0>;
                        clocks = <&input_clk>;
@@ -167,6 +167,18 @@
                        #clock-cells = <0>;
                };
+                dmac_core_clk: dmac-core-clk {
+                        compatible = "fixed-clock";
+                        clock-frequency = <400000000>;
+                        #clock-cells = <0>;
+                };
+                dmac_cfg_clk: dmac-gpu-cfg-clk {
+                        compatible = "fixed-clock";
+                        clock-frequency = <200000000>;
+                        #clock-cells = <0>;
+                };
                gmac: ethernet@8000 {
                        #interrupt-cells = <1>;
                        compatible = "snps,dwmac";
@@ -200,6 +212,7 @@
                        compatible = "snps,hsdk-v1.0-ohci", "generic-ohci";
                        reg = <0x60000 0x100>;
                        interrupts = <15>;
+                        resets = <&cgu_rst HSDK_USB_RESET>;
                        dma-coherent;
                };
@@ -207,6 +220,7 @@
                        compatible = "snps,hsdk-v1.0-ehci", "generic-ehci";
                        reg = <0x40000 0x100>;
                        interrupts = <15>;
+                        resets = <&cgu_rst HSDK_USB_RESET>;
                        dma-coherent;
                };
@@ -237,6 +251,21 @@
                                reg = <0>;
                        };
                };
+                dmac: dmac@80000 {
+                        compatible = "snps,axi-dma-1.01a";
+                        reg = <0x80000 0x400>;
+                        interrupts = <27>;
+                        clocks = <&dmac_core_clk>, <&dmac_cfg_clk>;
+                        clock-names = "core-clk", "cfgr-clk";
+                        dma-channels = <4>;
+                        snps,dma-masters = <2>;
+                        snps,data-width = <3>;
+                        snps,block-size = <4096 4096 4096 4096>;
+                        snps,priority = <0 1 2 3>;
+                        snps,axi-max-burst-len = <16>;
+                };
        };
        memory@80000000 {
diff --git a/arch/arc/boot/dts/vdk_axc003.dtsi b/arch/arc/boot/dts/vdk_axc003.dtsi
index 0fd6ba985b16..84e8766c8ca2 100644
--- a/arch/arc/boot/dts/vdk_axc003.dtsi
+++ b/arch/arc/boot/dts/vdk_axc003.dtsi
@@ -36,7 +36,7 @@
                        #interrupt-cells = <1>;
                };
-                debug_uart: dw-apb-uart@0x5000 {
+                debug_uart: dw-apb-uart@5000 {
                        compatible = "snps,dw-apb-uart";
                        reg = <0x5000 0x100>;
                        clock-frequency = <2403200>;
@@ -49,7 +49,7 @@
        };
-        mb_intc: dw-apb-ictl@0xe0012000 {
+        mb_intc: dw-apb-ictl@e0012000 {
                #interrupt-cells = <1>;
                compatible = "snps,dw-apb-ictl";
                reg = < 0xe0012000 0x200 >;
diff --git a/arch/arc/boot/dts/vdk_axc003_idu.dtsi b/arch/arc/boot/dts/vdk_axc003_idu.dtsi
index 28956f9a9f3d..eb7e705e8a27 100644
--- a/arch/arc/boot/dts/vdk_axc003_idu.dtsi
+++ b/arch/arc/boot/dts/vdk_axc003_idu.dtsi
@@ -44,7 +44,7 @@
                        #interrupt-cells = <1>;
                };
-                debug_uart: dw-apb-uart@0x5000 {
+                debug_uart: dw-apb-uart@5000 {
                        compatible = "snps,dw-apb-uart";
                        reg = <0x5000 0x100>;
                        clock-frequency = <2403200>;
@@ -57,7 +57,7 @@
        };
-        mb_intc: dw-apb-ictl@0xe0012000 {
+        mb_intc: dw-apb-ictl@e0012000 {
                #interrupt-cells = <1>;
                compatible = "snps,dw-apb-ictl";
                reg = < 0xe0012000 0x200 >;
diff --git a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
index 48bb4b4cd234..925d5cc95dbb 100644
--- a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
+++ b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
@@ -36,7 +36,7 @@
                        };
                };
-                ethernet@0x18000 {
+                ethernet@18000 {
                        #interrupt-cells = <1>;
                        compatible = "snps,dwmac";
                        reg = < 0x18000 0x2000 >;
@@ -49,13 +49,13 @@
                        clock-names = "stmmaceth";
                };
-                ehci@0x40000 {
+                ehci@40000 {
                        compatible = "generic-ehci";
                        reg = < 0x40000 0x100 >;
                        interrupts = < 8 >;
                };
-                uart@0x20000 {
+                uart@20000 {
                        compatible = "snps,dw-apb-uart";
                        reg = <0x20000 0x100>;
                        clock-frequency = <2403200>;
@@ -65,7 +65,7 @@
                        reg-io-width = <4>;
                };
-                uart@0x21000 {
+                uart@21000 {
                        compatible = "snps,dw-apb-uart";
                        reg = <0x21000 0x100>;
                        clock-frequency = <2403200>;
@@ -75,7 +75,7 @@
                        reg-io-width = <4>;
                };
-                uart@0x22000 {
+                uart@22000 {
                        compatible = "snps,dw-apb-uart";
                        reg = <0x22000 0x100>;
                        clock-frequency = <2403200>;
@@ -101,7 +101,7 @@
                        interrupt-names = "arc_ps2_irq";
                };
-                mmc@0x15000 {
+                mmc@15000 {
                        compatible = "snps,dw-mshc";
                        reg = <0x15000 0x400>;
                        fifo-depth = <1024>;
@@ -117,11 +117,11 @@
         * Embedded Vision subsystem UIO mappings; only relevant for EV VDK
         *
         * This node is intentionally put outside of MB above becase
-         * it maps areas outside of MB's 0xEz-0xFz.
+         * it maps areas outside of MB's 0xez-0xfz.
         */
-        uio_ev: uio@0xD0000000 {
+        uio_ev: uio@d0000000 {
                compatible = "generic-uio";
-                reg = <0xD0000000 0x2000 0xD1000000 0x2000 0x90000000 0x10000000 0xC0000000 0x10000000>;
+                reg = <0xd0000000 0x2000 0xd1000000 0x2000 0x90000000 0x10000000 0xc0000000 0x10000000>;
                reg-names = "ev_gsa", "ev_ctrl", "ev_shared_mem", "ev_code_mem";
                interrupt-parent = <&mb_intc>;
                interrupts = <23>;
diff --git a/arch/arc/configs/hsdk_defconfig b/arch/arc/configs/hsdk_defconfig
index 6fd3d29546af..0e5fd29ed238 100644
--- a/arch/arc/configs/hsdk_defconfig
+++ b/arch/arc/configs/hsdk_defconfig
@@ -8,6 +8,7 @@ CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
 # CONFIG_PID_NS is not set
 CONFIG_BLK_DEV_INITRD=y
+CONFIG_BLK_DEV_RAM=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_VM_EVENT_COUNTERS is not set
diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h
index a27eafdc8260..a7d4be87b2f0 100644
--- a/arch/arc/include/asm/arcregs.h
+++ b/arch/arc/include/asm/arcregs.h
@@ -82,6 +82,7 @@
 #define ECR_V_DTLB_MISS                 0x05
 #define ECR_V_PROTV                     0x06
 #define ECR_V_TRAP                      0x09
+#define ECR_V_MISALIGN                  0x0d
 #endif
 /* DTLB Miss and Protection Violation Cause Codes */
@@ -167,14 +168,6 @@ struct bcr_mpy {
 #endif
 };
-struct bcr_extn_xymem {
-#ifdef CONFIG_CPU_BIG_ENDIAN
-        unsigned int ram_org:2, num_banks:4, bank_sz:4, ver:8;
-#else
-        unsigned int ver:8, bank_sz:4, num_banks:4, ram_org:2;
-#endif
-};
 struct bcr_iccm_arcompact {
 #ifdef CONFIG_CPU_BIG_ENDIAN
        unsigned int base:16, pad:5, sz:3, ver:8;
@@ -312,7 +305,7 @@ struct cpuinfo_arc {
        struct cpuinfo_arc_bpu bpu;
        struct bcr_identity core;
        struct bcr_isa_arcv2 isa;
-        const char *details, *name;
+        const char *release, *name;
        unsigned int vec_base;
        struct cpuinfo_arc_ccm iccm, dccm;
        struct {
@@ -322,7 +315,6 @@ struct cpuinfo_arc {
                             timer0:1, timer1:1, rtc:1, gfrc:1, pad4:4;
        } extn;
        struct bcr_mpy extn_mpy;
-        struct bcr_extn_xymem extn_xymem;
 };
 extern struct cpuinfo_arc cpuinfo_arc700[];
diff --git a/arch/arc/include/asm/irqflags-arcv2.h b/arch/arc/include/asm/irqflags-arcv2.h
index 8a4f77ea3238..e66d0339e1d8 100644
--- a/arch/arc/include/asm/irqflags-arcv2.h
+++ b/arch/arc/include/asm/irqflags-arcv2.h
@@ -44,7 +44,13 @@
 #define ARCV2_IRQ_DEF_PRIO      1
 /* seed value for status register */
-#define ISA_INIT_STATUS_BITS    (STATUS_IE_MASK | STATUS_AD_MASK | \
+#ifdef CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS
+#define __AD_ENB        STATUS_AD_MASK
+#else
+#define __AD_ENB        0
+#endif
+#define ISA_INIT_STATUS_BITS    (STATUS_IE_MASK | __AD_ENB | \
                                        (ARCV2_IRQ_DEF_PRIO << 1))
 #ifndef __ASSEMBLY__
diff --git a/arch/arc/include/asm/perf_event.h b/arch/arc/include/asm/perf_event.h
index 6958545390f0..9cd7ee4fad39 100644
--- a/arch/arc/include/asm/perf_event.h
+++ b/arch/arc/include/asm/perf_event.h
@@ -105,10 +105,10 @@ static const char * const arc_pmu_ev_hw_map[] = {
        [PERF_COUNT_HW_INSTRUCTIONS] = "iall",
        /* All jump instructions that are taken */
        [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = "ijmptak",
-        [PERF_COUNT_ARC_BPOK]         = "bpok",   /* NP-NT, PT-T, PNT-NT */
 #ifdef CONFIG_ISA_ARCV2
        [PERF_COUNT_HW_BRANCH_MISSES] = "bpmp",
 #else
+        [PERF_COUNT_ARC_BPOK]         = "bpok",   /* NP-NT, PT-T, PNT-NT */
        [PERF_COUNT_HW_BRANCH_MISSES] = "bpfail", /* NP-T, PT-NT, PNT-T */
 #endif
        [PERF_COUNT_ARC_LDC] = "imemrdc",       /* Instr: mem read cached */
diff --git a/arch/arc/include/asm/spinlock.h b/arch/arc/include/asm/spinlock.h
index 2ba04a7db621..daa914da7968 100644
--- a/arch/arc/include/asm/spinlock.h
+++ b/arch/arc/include/asm/spinlock.h
@@ -21,8 +21,6 @@ static inline void arch_spin_lock(arch_spinlock_t *lock)
 {
        unsigned int val;
-        smp_mb();
        __asm__ __volatile__(
        "1:     llock   %[val], [%[slock]]      \n"
        "       breq    %[val], %[LOCKED], 1b   \n"     /* spin while LOCKED */
@@ -34,6 +32,14 @@ static inline void arch_spin_lock(arch_spinlock_t *lock)
          [LOCKED]      "r"     (__ARCH_SPIN_LOCK_LOCKED__)
        : "memory", "cc");
+        /*
+         * ACQUIRE barrier to ensure load/store after taking the lock
+         * don't "bleed-up" out of the critical section (leak-in is allowed)
+         * http://www.spinics.net/lists/kernel/msg2010409.html
+         *
+         * ARCv2 only has load-load, store-store and all-all barrier
+         * thus need the full all-all barrier
+         */
        smp_mb();
 }
@@ -42,8 +48,6 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)
 {
        unsigned int val, got_it = 0;
-        smp_mb();
        __asm__ __volatile__(
        "1:     llock   %[val], [%[slock]]      \n"
        "       breq    %[val], %[LOCKED], 4f   \n"     /* already LOCKED, just bail */
@@ -67,9 +71,7 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)
 {
        smp_mb();
-        lock->slock = __ARCH_SPIN_LOCK_UNLOCKED__;
+        WRITE_ONCE(lock->slock, __ARCH_SPIN_LOCK_UNLOCKED__);
-        smp_mb();
 }
 /*
@@ -81,8 +83,6 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
 {
        unsigned int val;
-        smp_mb();
        /*
         * zero means writer holds the lock exclusively, deny Reader.
         * Otherwise grant lock to first/subseq reader
@@ -113,8 +113,6 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)
 {
        unsigned int val, got_it = 0;
-        smp_mb();
        __asm__ __volatile__(
        "1:     llock   %[val], [%[rwlock]]     \n"
        "       brls    %[val], %[WR_LOCKED], 4f\n"     /* <= 0: already write locked, bail */
@@ -140,8 +138,6 @@ static inline void arch_write_lock(arch_rwlock_t *rw)
 {
        unsigned int val;
-        smp_mb();
        /*
         * If reader(s) hold lock (lock < __ARCH_RW_LOCK_UNLOCKED__),
         * deny writer. Otherwise if unlocked grant to writer
@@ -175,8 +171,6 @@ static inline int arch_write_trylock(arch_rwlock_t *rw)
 {
        unsigned int val, got_it = 0;
-        smp_mb();
        __asm__ __volatile__(
        "1:     llock   %[val], [%[rwlock]]     \n"
        "       brne    %[val], %[UNLOCKED], 4f \n"     /* !UNLOCKED, bail */
@@ -217,17 +211,13 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
        : [val]         "=&r"   (val)
        : [rwlock]      "r"     (&(rw->counter))
        : "memory", "cc");
-        smp_mb();
 }
 static inline void arch_write_unlock(arch_rwlock_t *rw)
 {
        smp_mb();
-        rw->counter = __ARCH_RW_LOCK_UNLOCKED__;
+        WRITE_ONCE(rw->counter, __ARCH_RW_LOCK_UNLOCKED__);
-        smp_mb();
 }
 #else   /* !CONFIG_ARC_HAS_LLSC */
@@ -237,10 +227,9 @@ static inline void arch_spin_lock(arch_spinlock_t *lock)
        unsigned int val = __ARCH_SPIN_LOCK_LOCKED__;
        /*
-         * This smp_mb() is technically superfluous, we only need the one
+         * Per lkmm, smp_mb() is only required after _lock (and before_unlock)
-         * after the lock for providing the ACQUIRE semantics.
+         * for ACQ and REL semantics respectively. However EX based spinlocks
-         * However doing the "right" thing was regressing hackbench
+         * need the extra smp_mb to workaround a hardware quirk.
-         * so keeping this, pending further investigation
         */
        smp_mb();
@@ -257,14 +246,6 @@ static inline void arch_spin_lock(arch_spinlock_t *lock)
 #endif
        : "memory");
-        /*
-         * ACQUIRE barrier to ensure load/store after taking the lock
-         * don't "bleed-up" out of the critical section (leak-in is allowed)
-         * http://www.spinics.net/lists/kernel/msg2010409.html
-         *
-         * ARCv2 only has load-load, store-store and all-all barrier
-         * thus need the full all-all barrier
-         */
        smp_mb();
 }
@@ -309,8 +290,7 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)
        : "memory");
        /*
-         * superfluous, but keeping for now - see pairing version in
+         * see pairing version/comment in arch_spin_lock above
-         * arch_spin_lock above
         */
        smp_mb();
 }
@@ -344,7 +324,6 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)
        arch_spin_unlock(&(rw->lock_mutex));
        local_irq_restore(flags);
-        smp_mb();
        return ret;
 }
diff --git a/arch/arc/kernel/head.S b/arch/arc/kernel/head.S
index 30e090625916..8f6e0447dd17 100644
--- a/arch/arc/kernel/head.S
+++ b/arch/arc/kernel/head.S
@@ -54,7 +54,12 @@
        ; gcc 7.3.1 (ARC GNU 2018.03) onwards generates unaligned access
        ; by default
        lr      r5, [status32]
+#ifdef CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS
        bset    r5, r5, STATUS_AD_BIT
+#else
+        ; Although disabled at reset, bootloader might have enabled it
+        bclr    r5, r5, STATUS_AD_BIT
+#endif
        kflag   r5
 #endif
 .endm
@@ -106,6 +111,7 @@ ENTRY(stext)
        ;    r2 = pointer to uboot provided cmdline or external DTB in mem
        ; These are handled later in handle_uboot_args()
        st      r0, [@uboot_tag]
+        st      r1, [@uboot_magic]
        st      r2, [@uboot_arg]
        ; setup "current" tsk and optionally cache it in dedicated r25
diff --git a/arch/arc/kernel/intc-arcv2.c b/arch/arc/kernel/intc-arcv2.c
index cf18b3e5a934..c0d0124de089 100644
--- a/arch/arc/kernel/intc-arcv2.c
+++ b/arch/arc/kernel/intc-arcv2.c
@@ -95,7 +95,7 @@ void arc_init_IRQ(void)
        /* setup status32, don't enable intr yet as kernel doesn't want */
        tmp = read_aux_reg(ARC_REG_STATUS32);
-        tmp |= STATUS_AD_MASK | (ARCV2_IRQ_DEF_PRIO << 1);
+        tmp |= ARCV2_IRQ_DEF_PRIO << 1;
        tmp &= ~STATUS_IE_MASK;
        asm volatile("kflag %0  \n"::"r"(tmp));
 }
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index 7b2340996cf8..a9c88b7e9182 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -36,6 +36,7 @@ unsigned int intr_to_DE_cnt;
 /* Part of U-boot ABI: see head.S */
 int __initdata uboot_tag;
+int __initdata uboot_magic;
 char __initdata *uboot_arg;
 const struct machine_desc *machine_desc;
@@ -44,29 +45,24 @@ struct task_struct *_current_task[NR_CPUS];	/* For stack switching */
 struct cpuinfo_arc cpuinfo_arc700[NR_CPUS];
-static const struct id_to_str arc_cpu_rel[] = {
+static const struct id_to_str arc_legacy_rel[] = {
+        /* ID.ARCVER,   Release */
 #ifdef CONFIG_ISA_ARCOMPACT
-        { 0x34, "R4.10"},
+        { 0x34,         "R4.10"},
-        { 0x35, "R4.11"},
+        { 0x35,         "R4.11"},
 #else
-        { 0x51, "R2.0" },
+        { 0x51,         "R2.0" },
-        { 0x52, "R2.1" },
+        { 0x52,         "R2.1" },
-        { 0x53, "R3.0" },
+        { 0x53,         "R3.0" },
-        { 0x54, "R3.10a" },
 #endif
-        { 0x00, NULL   }
+        { 0x00,         NULL   }
 };
-static const struct id_to_str arc_cpu_nm[] = {
+static const struct id_to_str arc_cpu_rel[] = {
-#ifdef CONFIG_ISA_ARCOMPACT
+        /* UARCH.MAJOR, Release */
-        { 0x20, "ARC 600"   },
+        {  0,           "R3.10a"},
-        { 0x30, "ARC 770"   },  /* 750 identified seperately */
+        {  1,           "R3.50a"},
-#else
+        {  0xFF,        NULL   }
-        { 0x40, "ARC EM"  },
-        { 0x50, "ARC HS38"  },
-        { 0x54, "ARC HS48"  },
-#endif
-        { 0x00, "Unknown"   }
 };
 static void read_decode_ccm_bcr(struct cpuinfo_arc *cpu)
@@ -116,31 +112,72 @@ static void read_decode_ccm_bcr(struct cpuinfo_arc *cpu)
        }
 }
+static void decode_arc_core(struct cpuinfo_arc *cpu)
+{
+        struct bcr_uarch_build_arcv2 uarch;
+        const struct id_to_str *tbl;
+        /*
+         * Up until (including) the first core4 release (0x54) things were
+         * simple: AUX IDENTITY.ARCVER was sufficient to identify arc family
+         * and release: 0x50 to 0x53 was HS38, 0x54 was HS48 (dual issue)
+         */
+        if (cpu->core.family < 0x54) { /* includes arc700 */
+                for (tbl = &arc_legacy_rel[0]; tbl->id != 0; tbl++) {
+                        if (cpu->core.family == tbl->id) {
+                                cpu->release = tbl->str;
+                                break;
+                        }
+                }
+                if (is_isa_arcompact())
+                        cpu->name = "ARC700";
+                else if (tbl->str)
+                        cpu->name = "HS38";
+                else
+                        cpu->name = cpu->release = "Unknown";
+                return;
+        }
+        /*
+         * However the subsequent HS release (same 0x54) allow HS38 or HS48
+         * configurations and encode this info in a different BCR.
+         * The BCR was introduced in 0x54 so can't be read unconditionally.
+         */
+        READ_BCR(ARC_REG_MICRO_ARCH_BCR, uarch);
+        if (uarch.prod == 4) {
+                cpu->name = "HS48";
+                cpu->extn.dual = 1;
+        } else {
+                cpu->name = "HS38";
+        }
+        for (tbl = &arc_cpu_rel[0]; tbl->id != 0xFF; tbl++) {
+                if (uarch.maj == tbl->id) {
+                        cpu->release = tbl->str;
+                        break;
+                }
+        }
+}
 static void read_arc_build_cfg_regs(void)
 {
        struct bcr_timer timer;
        struct bcr_generic bcr;
        struct cpuinfo_arc *cpu = &cpuinfo_arc700[smp_processor_id()];
-        const struct id_to_str *tbl;
        struct bcr_isa_arcv2 isa;
        struct bcr_actionpoint ap;
        FIX_PTR(cpu);
        READ_BCR(AUX_IDENTITY, cpu->core);
+        decode_arc_core(cpu);
-        for (tbl = &arc_cpu_rel[0]; tbl->id != 0; tbl++) {
-                if (cpu->core.family == tbl->id) {
-                        cpu->details = tbl->str;
-                        break;
-                }
-        }
-        for (tbl = &arc_cpu_nm[0]; tbl->id != 0; tbl++) {
-                if ((cpu->core.family & 0xF4) == tbl->id)
-                        break;
-        }
-        cpu->name = tbl->str;
        READ_BCR(ARC_REG_TIMERS_BCR, timer);
        cpu->extn.timer0 = timer.t0;
@@ -151,16 +188,6 @@ static void read_arc_build_cfg_regs(void)
        READ_BCR(ARC_REG_MUL_BCR, cpu->extn_mpy);
-        cpu->extn.norm = read_aux_reg(ARC_REG_NORM_BCR) > 1 ? 1 : 0; /* 2,3 */
-        cpu->extn.barrel = read_aux_reg(ARC_REG_BARREL_BCR) > 1 ? 1 : 0; /* 2,3 */
-        cpu->extn.swap = read_aux_reg(ARC_REG_SWAP_BCR) ? 1 : 0;        /* 1,3 */
-        cpu->extn.crc = read_aux_reg(ARC_REG_CRC_BCR) ? 1 : 0;
-        cpu->extn.minmax = read_aux_reg(ARC_REG_MIXMAX_BCR) > 1 ? 1 : 0; /* 2 */
-        cpu->extn.swape = (cpu->core.family >= 0x34) ? 1 :
-                                IS_ENABLED(CONFIG_ARC_HAS_SWAPE);
-        READ_BCR(ARC_REG_XY_MEM_BCR, cpu->extn_xymem);
        /* Read CCM BCRs for boot reporting even if not enabled in Kconfig */
        read_decode_ccm_bcr(cpu);
@@ -198,30 +225,12 @@ static void read_arc_build_cfg_regs(void)
                cpu->bpu.num_pred = 2048 << bpu.pte;
                cpu->bpu.ret_stk = 4 << bpu.rse;
-                if (cpu->core.family >= 0x54) {
+                /* if dual issue hardware, is it enabled ? */
+                if (cpu->extn.dual) {
-                        struct bcr_uarch_build_arcv2 uarch;
+                        unsigned int exec_ctrl;
-                        /*
-                         * The first 0x54 core (uarch maj:min 0:1 or 0:2) was
-                         * dual issue only (HS4x). But next uarch rev (1:0)
-                         * allows it be configured for single issue (HS3x)
-                         * Ensure we fiddle with dual issue only on HS4x
-                         */
-                        READ_BCR(ARC_REG_MICRO_ARCH_BCR, uarch);
-                        if (uarch.prod == 4) {
-                                unsigned int exec_ctrl;
-                                /* dual issue hardware always present */
-                                cpu->extn.dual = 1;
-                                READ_BCR(AUX_EXEC_CTRL, exec_ctrl);
-                                /* dual issue hardware enabled ? */
+                        READ_BCR(AUX_EXEC_CTRL, exec_ctrl);
-                                cpu->extn.dual_enb = !(exec_ctrl & 1);
+                        cpu->extn.dual_enb = !(exec_ctrl & 1);
-                        }
                }
        }
@@ -263,7 +272,8 @@ static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len)
 {
        struct cpuinfo_arc *cpu = &cpuinfo_arc700[cpu_id];
        struct bcr_identity *core = &cpu->core;
-        int i, n = 0, ua = 0;
+        char mpy_opt[16];
+        int n = 0;
        FIX_PTR(cpu);
@@ -272,7 +282,7 @@ static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len)
                       core->family, core->cpu_id, core->chip_id);
        n += scnprintf(buf + n, len - n, "processor [%d]\t: %s %s (%s ISA) %s%s%s\n",
-                       cpu_id, cpu->name, cpu->details,
+                       cpu_id, cpu->name, cpu->release,
                       is_isa_arcompact() ? "ARCompact" : "ARCv2",
                       IS_AVAIL1(cpu->isa.be, "[Big-Endian]"),
                       IS_AVAIL3(cpu->extn.dual, cpu->extn.dual_enb, " Dual-Issue "));
@@ -283,61 +293,50 @@ static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len)
                       IS_AVAIL2(cpu->extn.rtc, "RTC [UP 64-bit] ", CONFIG_ARC_TIMERS_64BIT),
                       IS_AVAIL2(cpu->extn.gfrc, "GFRC [SMP 64-bit] ", CONFIG_ARC_TIMERS_64BIT));
-#ifdef __ARC_UNALIGNED__
-        ua = 1;
-#endif
-        n += i = scnprintf(buf + n, len - n, "%s%s%s%s%s%s",
-                           IS_AVAIL2(cpu->isa.atomic, "atomic ", CONFIG_ARC_HAS_LLSC),
-                           IS_AVAIL2(cpu->isa.ldd, "ll64 ", CONFIG_ARC_HAS_LL64),
-                           IS_AVAIL1(cpu->isa.unalign, "unalign "), IS_USED_RUN(ua));
-        if (i)
-                n += scnprintf(buf + n, len - n, "\n\t\t: ");
        if (cpu->extn_mpy.ver) {
-                if (cpu->extn_mpy.ver <= 0x2) { /* ARCompact */
+                if (is_isa_arcompact()) {
-                        n += scnprintf(buf + n, len - n, "mpy ");
+                        scnprintf(mpy_opt, 16, "mpy");
                } else {
                        int opt = 2;    /* stock MPY/MPYH */
                        if (cpu->extn_mpy.dsp)  /* OPT 7-9 */
                                opt = cpu->extn_mpy.dsp + 6;
-                        n += scnprintf(buf + n, len - n, "mpy[opt %d] ", opt);
+                        scnprintf(mpy_opt, 16, "mpy[opt %d] ", opt);
                }
        }
        n += scnprintf(buf + n, len - n, "%s%s%s%s%s%s%s%s\n",
-                       IS_AVAIL1(cpu->isa.div_rem, "div_rem "),
+                       IS_AVAIL2(cpu->isa.atomic, "atomic ", CONFIG_ARC_HAS_LLSC),
-                       IS_AVAIL1(cpu->extn.norm, "norm "),
+                       IS_AVAIL2(cpu->isa.ldd, "ll64 ", CONFIG_ARC_HAS_LL64),
-                       IS_AVAIL1(cpu->extn.barrel, "barrel-shift "),
+                       IS_AVAIL2(cpu->isa.unalign, "unalign ", CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS),
-                       IS_AVAIL1(cpu->extn.swap, "swap "),
+                       IS_AVAIL1(cpu->extn_mpy.ver, mpy_opt),
-                       IS_AVAIL1(cpu->extn.minmax, "minmax "),
+                       IS_AVAIL1(cpu->isa.div_rem, "div_rem "));
-                       IS_AVAIL1(cpu->extn.crc, "crc "),
-                       IS_AVAIL2(cpu->extn.swape, "swape", CONFIG_ARC_HAS_SWAPE));
+        if (cpu->bpu.ver) {
-        if (cpu->bpu.ver)
                n += scnprintf(buf + n, len - n,
                              "BPU\t\t: %s%s match, cache:%d, Predict Table:%d Return stk: %d",
                              IS_AVAIL1(cpu->bpu.full, "full"),
                              IS_AVAIL1(!cpu->bpu.full, "partial"),
                              cpu->bpu.num_cache, cpu->bpu.num_pred, cpu->bpu.ret_stk);
-        if (is_isa_arcv2()) {
+                if (is_isa_arcv2()) {
-                struct bcr_lpb lpb;
+                        struct bcr_lpb lpb;
-                READ_BCR(ARC_REG_LPB_BUILD, lpb);
+                        READ_BCR(ARC_REG_LPB_BUILD, lpb);
-                if (lpb.ver) {
+                        if (lpb.ver) {
-                        unsigned int ctl;
+                                unsigned int ctl;
-                        ctl = read_aux_reg(ARC_REG_LPB_CTRL);
+                                ctl = read_aux_reg(ARC_REG_LPB_CTRL);
-                        n += scnprintf(buf + n, len - n, " Loop Buffer:%d %s",
+                                n += scnprintf(buf + n, len - n, " Loop Buffer:%d %s",
-                                lpb.entries,
+                                               lpb.entries,
-                                IS_DISABLED_RUN(!ctl));
+                                               IS_DISABLED_RUN(!ctl));
+                        }
                }
+                n += scnprintf(buf + n, len - n, "\n");
        }
-        n += scnprintf(buf + n, len - n, "\n");
        return buf;
 }
@@ -390,11 +389,6 @@ static char *arc_extn_mumbojumbo(int cpu_id, char *buf, int len)
                }
        }
-        n += scnprintf(buf + n, len - n, "OS ABI [v%d]\t: %s\n",
-                        EF_ARC_OSABI_CURRENT >> 8,
-                        EF_ARC_OSABI_CURRENT == EF_ARC_OSABI_V3 ?
-                        "no-legacy-syscalls" : "64-bit data any register aligned");
        return buf;
 }
@@ -497,6 +491,8 @@ static inline bool uboot_arg_invalid(unsigned long addr)
 #define UBOOT_TAG_NONE          0
 #define UBOOT_TAG_CMDLINE       1
 #define UBOOT_TAG_DTB           2
+/* We always pass 0 as magic from U-boot */
+#define UBOOT_MAGIC_VALUE       0
 void __init handle_uboot_args(void)
 {
@@ -511,6 +507,11 @@ void __init handle_uboot_args(void)
                goto ignore_uboot_args;
        }
+        if (uboot_magic != UBOOT_MAGIC_VALUE) {
+                pr_warn(IGNORE_ARGS "non zero uboot magic\n");
+                goto ignore_uboot_args;
+        }
        if (uboot_tag != UBOOT_TAG_NONE &&
            uboot_arg_invalid((unsigned long)uboot_arg)) {
                pr_warn(IGNORE_ARGS "invalid uboot arg: '%px'\n", uboot_arg);
diff --git a/arch/arc/kernel/troubleshoot.c b/arch/arc/kernel/troubleshoot.c
index 215f515442e0..b0aa8c028331 100644
--- a/arch/arc/kernel/troubleshoot.c
+++ b/arch/arc/kernel/troubleshoot.c
@@ -145,7 +145,8 @@ static void show_ecr_verbose(struct pt_regs *regs)
        } else if (vec == ECR_V_PROTV) {
                if (cause_code == ECR_C_PROTV_INST_FETCH)
                        pr_cont("Execute from Non-exec Page\n");
-                else if (cause_code == ECR_C_PROTV_MISALIG_DATA)
+                else if (cause_code == ECR_C_PROTV_MISALIG_DATA &&
+                         IS_ENABLED(CONFIG_ISA_ARCOMPACT))
                        pr_cont("Misaligned r/w from 0x%08lx\n", address);
                else
                        pr_cont("%s access not allowed on page\n",
@@ -161,6 +162,8 @@ static void show_ecr_verbose(struct pt_regs *regs)
                        pr_cont("Bus Error from Data Mem\n");
                else
                        pr_cont("Bus Error, check PRM\n");
+        } else if (vec == ECR_V_MISALIGN) {
+                pr_cont("Misaligned r/w from 0x%08lx\n", address);
 #endif
        } else if (vec == ECR_V_TRAP) {
                if (regs->ecr_param == 5)
diff --git a/arch/arc/lib/Makefile b/arch/arc/lib/Makefile
index b1656d156097..f7537b466b23 100644
--- a/arch/arc/lib/Makefile
+++ b/arch/arc/lib/Makefile
@@ -8,4 +8,10 @@
 lib-y   := strchr-700.o strcpy-700.o strlen.o memcmp.o
 lib-$(CONFIG_ISA_ARCOMPACT)     += memcpy-700.o memset.o strcmp.o
-lib-$(CONFIG_ISA_ARCV2)         += memcpy-archs.o memset-archs.o strcmp-archs.o
+lib-$(CONFIG_ISA_ARCV2)         += memset-archs.o strcmp-archs.o
+ifdef CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS
+lib-$(CONFIG_ISA_ARCV2)         +=memcpy-archs-unaligned.o
+else
+lib-$(CONFIG_ISA_ARCV2)         +=memcpy-archs.o
+endif
diff --git a/arch/arc/lib/memcpy-archs-unaligned.S b/arch/arc/lib/memcpy-archs-unaligned.S
new file mode 100644
index 000000000000..28993a73fdde
--- /dev/null
+++ b/arch/arc/lib/memcpy-archs-unaligned.S
@@ -0,0 +1,47 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * ARCv2 memcpy implementation optimized for unaligned memory access using.
+ *
+ * Copyright (C) 2019 Synopsys
+ * Author: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
+ */
+#include <linux/linkage.h>
+#ifdef CONFIG_ARC_HAS_LL64
+# define LOADX(DST,RX)          ldd.ab  DST, [RX, 8]
+# define STOREX(SRC,RX)         std.ab  SRC, [RX, 8]
+# define ZOLSHFT                5
+# define ZOLAND                 0x1F
+#else
+# define LOADX(DST,RX)          ld.ab   DST, [RX, 4]
+# define STOREX(SRC,RX)         st.ab   SRC, [RX, 4]
+# define ZOLSHFT                4
+# define ZOLAND                 0xF
+#endif
+ENTRY_CFI(memcpy)
+        mov     r3, r0          ; don;t clobber ret val
+        lsr.f   lp_count, r2, ZOLSHFT
+        lpnz    @.Lcopy32_64bytes
+        ;; LOOP START
+        LOADX   (r6, r1)
+        LOADX   (r8, r1)
+        LOADX   (r10, r1)
+        LOADX   (r4, r1)
+        STOREX  (r6, r3)
+        STOREX  (r8, r3)
+        STOREX  (r10, r3)
+        STOREX  (r4, r3)
+.Lcopy32_64bytes:
+        and.f   lp_count, r2, ZOLAND ;Last remaining 31 bytes
+        lpnz    @.Lcopyremainingbytes
+        ;; LOOP START
+        ldb.ab  r5, [r1, 1]
+        stb.ab  r5, [r3, 1]
+.Lcopyremainingbytes:
+        j       [blink]
+END_CFI(memcpy)
diff --git a/arch/arc/plat-eznps/Kconfig b/arch/arc/plat-eznps/Kconfig
index 8eff057efcae..2eaecfb063a7 100644
--- a/arch/arc/plat-eznps/Kconfig
+++ b/arch/arc/plat-eznps/Kconfig
@@ -26,8 +26,8 @@ config EZNPS_MTM_EXT
        help
          Here we add new hierarchy for CPUs topology.
          We got:
-                Core
+            Core
-                Thread
+            Thread
          At the new thread level each CPU represent one HW thread.
          At highest hierarchy each core contain 16 threads,
          any of them seem like CPU from Linux point of view.
@@ -35,10 +35,10 @@ config EZNPS_MTM_EXT
          core and HW scheduler round robin between them.
 config EZNPS_MEM_ERROR_ALIGN
-       bool "ARC-EZchip Memory error as an exception"
+        bool "ARC-EZchip Memory error as an exception"
-       depends on EZNPS_MTM_EXT
+        depends on EZNPS_MTM_EXT
-       default n
+        default n
-       help
+        help
          On the real chip of the NPS, user memory errors are handled
          as a machine check exception, which is fatal, whereas on
          simulator platform for NPS, is handled as a Level 2 interrupt
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 117b2541ef3d..7e34b9eba5de 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -159,7 +159,6 @@ config ARM64
        select IRQ_DOMAIN
        select IRQ_FORCED_THREADING
        select MODULES_USE_ELF_RELA
-        select MULTI_IRQ_HANDLER
        select NEED_DMA_MAP_STATE
        select NEED_SG_DMA_LENGTH
        select OF
diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h
index 2afb1338b48a..5f1437099b99 100644
--- a/arch/arm64/include/asm/cputype.h
+++ b/arch/arm64/include/asm/cputype.h
@@ -77,6 +77,7 @@
 #define ARM_CPU_IMP_QCOM                0x51
 #define ARM_CPU_IMP_NVIDIA              0x4E
 #define ARM_CPU_IMP_FUJITSU             0x46
+#define ARM_CPU_IMP_HISI                0x48
 #define ARM_CPU_PART_AEM_V8             0xD0F
 #define ARM_CPU_PART_FOUNDATION         0xD00
@@ -107,6 +108,8 @@
 #define FUJITSU_CPU_PART_A64FX          0x001
+#define HISI_CPU_PART_TSV110            0xD01
 #define MIDR_CORTEX_A53 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53)
 #define MIDR_CORTEX_A57 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57)
 #define MIDR_CORTEX_A72 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A72)
@@ -126,10 +129,11 @@
 #define MIDR_NVIDIA_DENVER MIDR_CPU_MODEL(ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_DENVER)
 #define MIDR_NVIDIA_CARMEL MIDR_CPU_MODEL(ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_CARMEL)
 #define MIDR_FUJITSU_A64FX MIDR_CPU_MODEL(ARM_CPU_IMP_FUJITSU, FUJITSU_CPU_PART_A64FX)
+#define MIDR_HISI_TSV110 MIDR_CPU_MODEL(ARM_CPU_IMP_HISI, HISI_CPU_PART_TSV110)
 /* Fujitsu Erratum 010001 affects A64FX 1.0 and 1.1, (v0r0 and v1r0) */
 #define MIDR_FUJITSU_ERRATUM_010001             MIDR_FUJITSU_A64FX
-#define MIDR_FUJITSU_ERRATUM_010001_MASK        (~MIDR_VARIANT(1))
+#define MIDR_FUJITSU_ERRATUM_010001_MASK        (~MIDR_CPU_VAR_REV(1, 0))
 #define TCR_CLEAR_FUJITSU_ERRATUM_010001        (TCR_NFD1 | TCR_NFD0)
 #ifndef __ASSEMBLY__
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index e24e94d28767..4061de10cea6 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -963,6 +963,7 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,
                MIDR_ALL_VERSIONS(MIDR_CORTEX_A57),
                MIDR_ALL_VERSIONS(MIDR_CORTEX_A72),
                MIDR_ALL_VERSIONS(MIDR_CORTEX_A73),
+                MIDR_ALL_VERSIONS(MIDR_HISI_TSV110),
                { /* sentinel */ }
        };
        char const *str = "command line option";
diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c
index 7fb6f3aa5ceb..7a679caf4585 100644
--- a/arch/arm64/kernel/probes/kprobes.c
+++ b/arch/arm64/kernel/probes/kprobes.c
@@ -91,8 +91,6 @@ static void __kprobes arch_simulate_insn(struct kprobe *p, struct pt_regs *regs)
 int __kprobes arch_prepare_kprobe(struct kprobe *p)
 {
        unsigned long probe_addr = (unsigned long)p->addr;
-        extern char __start_rodata[];
-        extern char __end_rodata[];
        if (probe_addr & 0x3)
                return -EINVAL;
@@ -100,10 +98,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
        /* copy instruction */
        p->opcode = le32_to_cpu(*p->addr);
-        if (in_exception_text(probe_addr))
+        if (search_exception_tables(probe_addr))
-                return -EINVAL;
-        if (probe_addr >= (unsigned long) __start_rodata &&
-            probe_addr <= (unsigned long) __end_rodata)
                return -EINVAL;
        /* decode instruction */
@@ -476,26 +471,37 @@ kprobe_breakpoint_handler(struct pt_regs *regs, unsigned int esr)
        return DBG_HOOK_HANDLED;
 }
-bool arch_within_kprobe_blacklist(unsigned long addr)
+/*
+ * Provide a blacklist of symbols identifying ranges which cannot be kprobed.
+ * This blacklist is exposed to userspace via debugfs (kprobes/blacklist).
+ */
+int __init arch_populate_kprobe_blacklist(void)
 {
-        if ((addr >= (unsigned long)__kprobes_text_start &&
+        int ret;
-            addr < (unsigned long)__kprobes_text_end) ||
-            (addr >= (unsigned long)__entry_text_start &&
+        ret = kprobe_add_area_blacklist((unsigned long)__entry_text_start,
-            addr < (unsigned long)__entry_text_end) ||
+                                        (unsigned long)__entry_text_end);
-            (addr >= (unsigned long)__idmap_text_start &&
+        if (ret)
-            addr < (unsigned long)__idmap_text_end) ||
+                return ret;
-            (addr >= (unsigned long)__hyp_text_start &&
+        ret = kprobe_add_area_blacklist((unsigned long)__irqentry_text_start,
-            addr < (unsigned long)__hyp_text_end) ||
+                                        (unsigned long)__irqentry_text_end);
-            !!search_exception_tables(addr))
+        if (ret)
-                return true;
+                return ret;
+        ret = kprobe_add_area_blacklist((unsigned long)__exception_text_start,
-        if (!is_kernel_in_hyp_mode()) {
+                                        (unsigned long)__exception_text_end);
-                if ((addr >= (unsigned long)__hyp_idmap_text_start &&
+        if (ret)
-                    addr < (unsigned long)__hyp_idmap_text_end))
+                return ret;
-                        return true;
+        ret = kprobe_add_area_blacklist((unsigned long)__idmap_text_start,
-        }
+                                        (unsigned long)__idmap_text_end);
+        if (ret)
-        return false;
+                return ret;
+        ret = kprobe_add_area_blacklist((unsigned long)__hyp_text_start,
+                                        (unsigned long)__hyp_text_end);
+        if (ret || is_kernel_in_hyp_mode())
+                return ret;
+        ret = kprobe_add_area_blacklist((unsigned long)__hyp_idmap_text_start,
+                                        (unsigned long)__hyp_idmap_text_end);
+        return ret;
 }
 void __kprobes __used *trampoline_probe_handler(struct pt_regs *regs)
diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c
index 1a29f2695ff2..d908b5e9e949 100644
--- a/arch/arm64/kernel/stacktrace.c
+++ b/arch/arm64/kernel/stacktrace.c
@@ -143,6 +143,7 @@ void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace)
        if (trace->nr_entries < trace->max_entries)
                trace->entries[trace->nr_entries++] = ULONG_MAX;
 }
+EXPORT_SYMBOL_GPL(save_stack_trace_regs);
 static noinline void __save_stack_trace(struct task_struct *tsk,
        struct stack_trace *trace, unsigned int nosched)
diff --git a/arch/mips/bcm47xx/workarounds.c b/arch/mips/bcm47xx/workarounds.c
index 46eddbec8d9f..0ab95dd431b3 100644
--- a/arch/mips/bcm47xx/workarounds.c
+++ b/arch/mips/bcm47xx/workarounds.c
@@ -24,6 +24,7 @@ void __init bcm47xx_workarounds(void)
        case BCM47XX_BOARD_NETGEAR_WNR3500L:
                bcm47xx_workarounds_enable_usb_power(12);
                break;
+        case BCM47XX_BOARD_NETGEAR_WNDR3400V2:
        case BCM47XX_BOARD_NETGEAR_WNDR3400_V3:
                bcm47xx_workarounds_enable_usb_power(21);
                break;
diff --git a/arch/mips/include/asm/jump_label.h b/arch/mips/include/asm/jump_label.h
index e77672539e8e..e4456e450f94 100644
--- a/arch/mips/include/asm/jump_label.h
+++ b/arch/mips/include/asm/jump_label.h
@@ -21,15 +21,15 @@
 #endif
 #ifdef CONFIG_CPU_MICROMIPS
-#define NOP_INSN "nop32"
+#define B_INSN "b32"
 #else
-#define NOP_INSN "nop"
+#define B_INSN "b"
 #endif
 static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
 {
-        asm_volatile_goto("1:\t" NOP_INSN "\n\t"
+        asm_volatile_goto("1:\t" B_INSN " 2f\n\t"
-                "nop\n\t"
+                "2:\tnop\n\t"
                ".pushsection __jump_table,  \"aw\"\n\t"
                WORD_INSN " 1b, %l[l_yes], %0\n\t"
                ".popsection\n\t"
diff --git a/arch/mips/include/uapi/asm/posix_types.h b/arch/mips/include/uapi/asm/posix_types.h
index 6aa49c10f88f..f0ccb5b90ce9 100644
--- a/arch/mips/include/uapi/asm/posix_types.h
+++ b/arch/mips/include/uapi/asm/posix_types.h
@@ -21,13 +21,6 @@
 typedef long            __kernel_daddr_t;
 #define __kernel_daddr_t __kernel_daddr_t
-#if (_MIPS_SZLONG == 32)
-typedef struct {
-        long    val[2];
-} __kernel_fsid_t;
-#define __kernel_fsid_t __kernel_fsid_t
-#endif
 #include <asm-generic/posix_types.h>
 #endif /* _ASM_POSIX_TYPES_H */
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index cb7e9ed7a453..33ee0d18fb0a 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -140,6 +140,13 @@ SECTIONS
        PERCPU_SECTION(1 << CONFIG_MIPS_L1_CACHE_SHIFT)
 #endif
+#ifdef CONFIG_MIPS_ELF_APPENDED_DTB
+        .appended_dtb : AT(ADDR(.appended_dtb) - LOAD_OFFSET) {
+                *(.appended_dtb)
+                KEEP(*(.appended_dtb))
+        }
+#endif
 #ifdef CONFIG_RELOCATABLE
        . = ALIGN(4);
@@ -164,11 +171,6 @@ SECTIONS
        __appended_dtb = .;
        /* leave space for appended DTB */
        . += 0x100000;
-#elif defined(CONFIG_MIPS_ELF_APPENDED_DTB)
-        .appended_dtb : AT(ADDR(.appended_dtb) - LOAD_OFFSET) {
-                *(.appended_dtb)
-                KEEP(*(.appended_dtb))
-        }
 #endif
        /*
         * Align to 64K in attempt to eliminate holes before the
diff --git a/arch/mips/loongson64/lemote-2f/irq.c b/arch/mips/loongson64/lemote-2f/irq.c
index 9e33e45aa17c..b213cecb8e3a 100644
--- a/arch/mips/loongson64/lemote-2f/irq.c
+++ b/arch/mips/loongson64/lemote-2f/irq.c
@@ -103,7 +103,7 @@ static struct irqaction ip6_irqaction = {
 static struct irqaction cascade_irqaction = {
        .handler = no_action,
        .name = "cascade",
-        .flags = IRQF_NO_THREAD,
+        .flags = IRQF_NO_THREAD | IRQF_NO_SUSPEND,
 };
 void __init mach_init_irq(void)
diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index d34ad1657d7b..598cdcdd1355 100644
--- a/arch/powerpc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@ -352,7 +352,7 @@ static inline bool strict_kernel_rwx_enabled(void)
 #if defined(CONFIG_SPARSEMEM_VMEMMAP) && defined(CONFIG_SPARSEMEM_EXTREME) &&   \
        defined (CONFIG_PPC_64K_PAGES)
 #define MAX_PHYSMEM_BITS        51
-#else
+#elif defined(CONFIG_SPARSEMEM)
 #define MAX_PHYSMEM_BITS        46
 #endif
diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h
index 1afe90ade595..bbc06bd72b1f 100644
--- a/arch/powerpc/include/asm/vdso_datapage.h
+++ b/arch/powerpc/include/asm/vdso_datapage.h
@@ -82,10 +82,10 @@ struct vdso_data {
        __u32 icache_block_size;                /* L1 i-cache block size     */
        __u32 dcache_log_block_size;            /* L1 d-cache log block size */
        __u32 icache_log_block_size;            /* L1 i-cache log block size */
-        __s32 wtom_clock_sec;                   /* Wall to monotonic clock */
+        __u32 stamp_sec_fraction;               /* fractional seconds of stamp_xtime */
-        __s32 wtom_clock_nsec;
+        __s32 wtom_clock_nsec;                  /* Wall to monotonic clock nsec */
-        struct timespec stamp_xtime;    /* xtime as at tb_orig_stamp */
+        __s64 wtom_clock_sec;                   /* Wall to monotonic clock sec */
-        __u32 stamp_sec_fraction;       /* fractional seconds of stamp_xtime */
+        struct timespec stamp_xtime;            /* xtime as at tb_orig_stamp */
        __u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of syscalls  */
        __u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */
 };
diff --git a/arch/powerpc/kernel/cpu_setup_6xx.S b/arch/powerpc/kernel/cpu_setup_6xx.S
index 6f1c11e0691f..7534ecff5e92 100644
--- a/arch/powerpc/kernel/cpu_setup_6xx.S
+++ b/arch/powerpc/kernel/cpu_setup_6xx.S
@@ -24,9 +24,6 @@ BEGIN_MMU_FTR_SECTION
        li      r10,0
        mtspr   SPRN_SPRG_603_LRU,r10           /* init SW LRU tracking */
 END_MMU_FTR_SECTION_IFSET(MMU_FTR_NEED_DTLB_SW_LRU)
-        lis     r10, (swapper_pg_dir - PAGE_OFFSET)@h
-        ori     r10, r10, (swapper_pg_dir - PAGE_OFFSET)@l
-        mtspr   SPRN_SPRG_PGDIR, r10
 BEGIN_FTR_SECTION
        bl      __init_fpu_registers
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index ce6a972f2584..48051c8977c5 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -855,6 +855,9 @@ __secondary_start:
        li      r3,0
        stw     r3, RTAS_SP(r4)         /* 0 => not in RTAS */
 #endif
+        lis     r4, (swapper_pg_dir - PAGE_OFFSET)@h
+        ori     r4, r4, (swapper_pg_dir - PAGE_OFFSET)@l
+        mtspr   SPRN_SPRG_PGDIR, r4
        /* enable MMU and jump to start_secondary */
        li      r4,MSR_KERNEL
@@ -942,6 +945,9 @@ start_here:
        li      r3,0
        stw     r3, RTAS_SP(r4)         /* 0 => not in RTAS */
 #endif
+        lis     r4, (swapper_pg_dir - PAGE_OFFSET)@h
+        ori     r4, r4, (swapper_pg_dir - PAGE_OFFSET)@l
+        mtspr   SPRN_SPRG_PGDIR, r4
        /* stack */
        lis     r1,init_thread_union@ha
diff --git a/arch/powerpc/kernel/security.c b/arch/powerpc/kernel/security.c
index 9b8631533e02..b33bafb8fcea 100644
--- a/arch/powerpc/kernel/security.c
+++ b/arch/powerpc/kernel/security.c
@@ -190,29 +190,22 @@ ssize_t cpu_show_spectre_v2(struct device *dev, struct device_attribute *attr, c
        bcs = security_ftr_enabled(SEC_FTR_BCCTRL_SERIALISED);
        ccd = security_ftr_enabled(SEC_FTR_COUNT_CACHE_DISABLED);
-        if (bcs || ccd || count_cache_flush_type != COUNT_CACHE_FLUSH_NONE) {
+        if (bcs || ccd) {
-                bool comma = false;
                seq_buf_printf(&s, "Mitigation: ");
-                if (bcs) {
+                if (bcs)
                        seq_buf_printf(&s, "Indirect branch serialisation (kernel only)");
-                        comma = true;
-                }
-                if (ccd) {
+                if (bcs && ccd)
-                        if (comma)
-                                seq_buf_printf(&s, ", ");
-                        seq_buf_printf(&s, "Indirect branch cache disabled");
-                        comma = true;
-                }
-                if (comma)
                        seq_buf_printf(&s, ", ");
-                seq_buf_printf(&s, "Software count cache flush");
+                if (ccd)
+                        seq_buf_printf(&s, "Indirect branch cache disabled");
+        } else if (count_cache_flush_type != COUNT_CACHE_FLUSH_NONE) {
+                seq_buf_printf(&s, "Mitigation: Software count cache flush");
                if (count_cache_flush_type == COUNT_CACHE_FLUSH_HW)
-                        seq_buf_printf(&s, "(hardware accelerated)");
+                        seq_buf_printf(&s, " (hardware accelerated)");
        } else if (btb_flush_enabled) {
                seq_buf_printf(&s, "Mitigation: Branch predictor state flush");
        } else {
diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S
index a4ed9edfd5f0..1f324c28705b 100644
--- a/arch/powerpc/kernel/vdso64/gettimeofday.S
+++ b/arch/powerpc/kernel/vdso64/gettimeofday.S
@@ -92,7 +92,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)
         * At this point, r4,r5 contain our sec/nsec values.
         */
-        lwa     r6,WTOM_CLOCK_SEC(r3)
+        ld      r6,WTOM_CLOCK_SEC(r3)
        lwa     r9,WTOM_CLOCK_NSEC(r3)
        /* We now have our result in r6,r9. We create a fake dependency
@@ -125,7 +125,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)
        bne     cr6,75f
        /* CLOCK_MONOTONIC_COARSE */
-        lwa     r6,WTOM_CLOCK_SEC(r3)
+        ld      r6,WTOM_CLOCK_SEC(r3)
        lwa     r9,WTOM_CLOCK_NSEC(r3)
        /* check if counter has updated */
diff --git a/arch/powerpc/mm/hash_low_32.S b/arch/powerpc/mm/hash_low_32.S
index 1f13494efb2b..a6c491f18a04 100644
--- a/arch/powerpc/mm/hash_low_32.S
+++ b/arch/powerpc/mm/hash_low_32.S
@@ -70,12 +70,12 @@ _GLOBAL(hash_page)
        lis     r0,KERNELBASE@h         /* check if kernel address */
        cmplw   0,r4,r0
        ori     r3,r3,_PAGE_USER|_PAGE_PRESENT /* test low addresses as user */
-        mfspr   r5, SPRN_SPRG_PGDIR     /* virt page-table root */
+        mfspr   r5, SPRN_SPRG_PGDIR     /* phys page-table root */
        blt+    112f                    /* assume user more likely */
-        lis     r5,swapper_pg_dir@ha    /* if kernel address, use */
+        lis     r5, (swapper_pg_dir - PAGE_OFFSET)@ha   /* if kernel address, use */
-        addi    r5,r5,swapper_pg_dir@l  /* kernel page table */
+        addi    r5 ,r5 ,(swapper_pg_dir - PAGE_OFFSET)@l        /* kernel page table */
        rlwimi  r3,r9,32-12,29,29       /* MSR_PR -> _PAGE_USER */
-112:    tophys(r5, r5)
+112:
 #ifndef CONFIG_PTE_64BIT
        rlwimi  r5,r4,12,20,29          /* insert top 10 bits of address */
        lwz     r8,0(r5)                /* get pmd entry */
diff --git a/block/bio.c b/block/bio.c
index 71a78d9fb8b7..b64cedc7f87c 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -849,20 +849,14 @@ static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter)
        size = bio_add_page(bio, bv->bv_page, len,
                                bv->bv_offset + iter->iov_offset);
        if (size == len) {
-                struct page *page;
+                if (!bio_flagged(bio, BIO_NO_PAGE_REF)) {
-                int i;
+                        struct page *page;
+                        int i;
+                        mp_bvec_for_each_page(page, bv, i)
+                                get_page(page);
+                }
-                /*
-                 * For the normal O_DIRECT case, we could skip grabbing this
-                 * reference and then not have to put them again when IO
-                 * completes. But this breaks some in-kernel users, like
-                 * splicing to/from a loop device, where we release the pipe
-                 * pages unconditionally. If we can fix that case, we can
-                 * get rid of the get here and the need to call
-                 * bio_release_pages() at IO completion time.
-                 */
-                mp_bvec_for_each_page(page, bv, i)
-                        get_page(page);
                iov_iter_advance(iter, size);
                return 0;
        }
@@ -925,10 +919,12 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
 * This takes either an iterator pointing to user memory, or one pointing to
 * kernel pages (BVEC iterator). If we're adding user pages, we pin them and
 * map them into the kernel. On IO completion, the caller should put those
- * pages. For now, when adding kernel pages, we still grab a reference to the
+ * pages. If we're adding kernel pages, and the caller told us it's safe to
- * page. This isn't strictly needed for the common case, but some call paths
+ * do so, we just have to add the pages to the bio directly. We don't grab an
- * end up releasing pages from eg a pipe and we can't easily control these.
+ * extra reference to those pages (the user should already have that), and we
- * See comment in __bio_iov_bvec_add_pages().
+ * don't put the page on IO completion. The caller needs to check if the bio is
+ * flagged BIO_NO_PAGE_REF on IO completion. If it isn't, then pages should be
+ * released.
 *
 * The function tries, but does not guarantee, to pin as many pages as
 * fit into the bio, or are requested in *iter, whatever is smaller. If
@@ -940,6 +936,13 @@ int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
        const bool is_bvec = iov_iter_is_bvec(iter);
        unsigned short orig_vcnt = bio->bi_vcnt;
+        /*
+         * If this is a BVEC iter, then the pages are kernel pages. Don't
+         * release them on IO completion, if the caller asked us to.
+         */
+        if (is_bvec && iov_iter_bvec_no_ref(iter))
+                bio_set_flag(bio, BIO_NO_PAGE_REF);
        do {
                int ret;
@@ -1696,7 +1699,8 @@ static void bio_dirty_fn(struct work_struct *work)
                next = bio->bi_private;
                bio_set_pages_dirty(bio);
-                bio_release_pages(bio);
+                if (!bio_flagged(bio, BIO_NO_PAGE_REF))
+                        bio_release_pages(bio);
                bio_put(bio);
        }
 }
@@ -1713,7 +1717,8 @@ void bio_check_pages_dirty(struct bio *bio)
                        goto defer;
        }
-        bio_release_pages(bio);
+        if (!bio_flagged(bio, BIO_NO_PAGE_REF))
+                bio_release_pages(bio);
        bio_put(bio);
        return;
 defer:
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 77f37ef8ef06..617a2b3f7582 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1736,8 +1736,8 @@ out:
 /**
 * blkcg_schedule_throttle - this task needs to check for throttling
- * @q - the request queue IO was submitted on
+ * @q: the request queue IO was submitted on
- * @use_memdelay - do we charge this to memory delay for PSI
+ * @use_memdelay: do we charge this to memory delay for PSI
 *
 * This is called by the IO controller when we know there's delay accumulated
 * for the blkg for this task.  We do not pass the blkg because there are places
@@ -1769,8 +1769,9 @@ void blkcg_schedule_throttle(struct request_queue *q, bool use_memdelay)
 /**
 * blkcg_add_delay - add delay to this blkg
- * @now - the current time in nanoseconds
+ * @blkg: blkg of interest
- * @delta - how many nanoseconds of delay to add
+ * @now: the current time in nanoseconds
+ * @delta: how many nanoseconds of delay to add
 *
 * Charge @delta to the blkg's current delay accumulation.  This is used to
 * throttle tasks if an IO controller thinks we need more throttling.
diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
index 2620baa1f699..507212d75ee2 100644
--- a/block/blk-iolatency.c
+++ b/block/blk-iolatency.c
@@ -75,6 +75,7 @@
 #include <linux/blk-mq.h>
 #include "blk-rq-qos.h"
 #include "blk-stat.h"
+#include "blk.h"
 #define DEFAULT_SCALE_COOKIE 1000000U
diff --git a/block/blk-mq.c b/block/blk-mq.c
index a9c181603cbd..70b210a308c4 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -782,7 +782,6 @@ void blk_mq_add_to_requeue_list(struct request *rq, bool at_head,
        if (kick_requeue_list)
                blk_mq_kick_requeue_list(q);
 }
-EXPORT_SYMBOL(blk_mq_add_to_requeue_list);
 void blk_mq_kick_requeue_list(struct request_queue *q)
 {
@@ -1093,8 +1092,7 @@ static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx *hctx,
        bool ret;
        if (!(hctx->flags & BLK_MQ_F_TAG_SHARED)) {
-                if (!test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state))
+                blk_mq_sched_mark_restart_hctx(hctx);
-                        set_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state);
                /*
                 * It's possible that a tag was freed in the window between the
@@ -2857,7 +2855,7 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
        /*
         * Default to classic polling
         */
-        q->poll_nsec = -1;
+        q->poll_nsec = BLK_MQ_POLL_CLASSIC;
        blk_mq_init_cpu_queues(q, set->nr_hw_queues);
        blk_mq_add_queue_tag_set(set, q);
@@ -3392,7 +3390,7 @@ static bool blk_mq_poll_hybrid(struct request_queue *q,
 {
        struct request *rq;
-        if (q->poll_nsec == -1)
+        if (q->poll_nsec == BLK_MQ_POLL_CLASSIC)
                return false;
        if (!blk_qc_t_is_internal(cookie))
diff --git a/block/blk-mq.h b/block/blk-mq.h
index c11353a3749d..0ed8e5a8729f 100644
--- a/block/blk-mq.h
+++ b/block/blk-mq.h
@@ -41,6 +41,8 @@ void blk_mq_free_queue(struct request_queue *q);
 int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr);
 void blk_mq_wake_waiters(struct request_queue *q);
 bool blk_mq_dispatch_rq_list(struct request_queue *, struct list_head *, bool);
+void blk_mq_add_to_requeue_list(struct request *rq, bool at_head,
+                                bool kick_requeue_list);
 void blk_mq_flush_busy_ctxs(struct blk_mq_hw_ctx *hctx, struct list_head *list);
 bool blk_mq_get_driver_tag(struct request *rq);
 struct request *blk_mq_dequeue_from_ctx(struct blk_mq_hw_ctx *hctx,
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 59685918167e..422327089e0f 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -360,8 +360,8 @@ static ssize_t queue_poll_delay_show(struct request_queue *q, char *page)
 {
        int val;
-        if (q->poll_nsec == -1)
+        if (q->poll_nsec == BLK_MQ_POLL_CLASSIC)
-                val = -1;
+                val = BLK_MQ_POLL_CLASSIC;
        else
                val = q->poll_nsec / 1000;
@@ -380,10 +380,12 @@ static ssize_t queue_poll_delay_store(struct request_queue *q, const char *page,
        if (err < 0)
                return err;
-        if (val == -1)
+        if (val == BLK_MQ_POLL_CLASSIC)
-                q->poll_nsec = -1;
+                q->poll_nsec = BLK_MQ_POLL_CLASSIC;
-        else
+        else if (val >= 0)
                q->poll_nsec = val * 1000;
+        else
+                return -EINVAL;
        return count;
 }
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 78db97687f26..c4b06cc075f9 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -800,6 +800,7 @@ bool acpi_dev_present(const char *hid, const char *uid, s64 hrv)
        match.hrv = hrv;
        dev = bus_find_device(&acpi_bus_type, NULL, &match, acpi_dev_match_cb);
+        put_device(dev);
        return !!dev;
 }
 EXPORT_SYMBOL(acpi_dev_present);
diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig
index 57410f9c5d44..c52c738e554a 100644
--- a/drivers/auxdisplay/Kconfig
+++ b/drivers/auxdisplay/Kconfig
@@ -164,9 +164,7 @@ config ARM_CHARLCD
          line and the Linux version on the second line, but that's
          still useful.
-endif # AUXDISPLAY
+menuconfig PARPORT_PANEL
-menuconfig PANEL
        tristate "Parallel port LCD/Keypad Panel support"
        depends on PARPORT
        select CHARLCD
@@ -178,7 +176,7 @@ menuconfig PANEL
          compiled as a module, or linked into the kernel and started at boot.
          If you don't understand what all this is about, say N.
-if PANEL
+if PARPORT_PANEL
 config PANEL_PARPORT
        int "Default parallel port number (0=LPT1)"
@@ -419,8 +417,11 @@ config PANEL_LCD_PIN_BL
          Default for the 'BL' pin in custom profile is '0' (uncontrolled).
+endif # PARPORT_PANEL
 config PANEL_CHANGE_MESSAGE
        bool "Change LCD initialization message ?"
+        depends on CHARLCD
        default "n"
        ---help---
          This allows you to replace the boot message indicating the kernel version
@@ -444,7 +445,34 @@ config PANEL_BOOT_MESSAGE
          An empty message will only clear the display at driver init time. Any other
          printf()-formatted message is valid with newline and escape codes.
-endif # PANEL
+choice
+        prompt "Backlight initial state"
+        default CHARLCD_BL_FLASH
+        config CHARLCD_BL_OFF
+                bool "Off"
+                help
+                  Backlight is initially turned off
+        config CHARLCD_BL_ON
+                bool "On"
+                help
+                  Backlight is initially turned on
+        config CHARLCD_BL_FLASH
+                bool "Flash"
+                help
+                  Backlight is flashed briefly on init
+endchoice
+endif # AUXDISPLAY
+config PANEL
+        tristate "Parallel port LCD/Keypad Panel support (OLD OPTION)"
+        depends on PARPORT
+        select AUXDISPLAY
+        select PARPORT_PANEL
 config CHARLCD
        tristate "Character LCD core support" if COMPILE_TEST
diff --git a/drivers/auxdisplay/Makefile b/drivers/auxdisplay/Makefile
index 7ac6776ca3f6..cf54b5efb07e 100644
--- a/drivers/auxdisplay/Makefile
+++ b/drivers/auxdisplay/Makefile
@@ -10,4 +10,4 @@ obj-$(CONFIG_CFAG12864B)	+= cfag12864b.o cfag12864bfb.o
 obj-$(CONFIG_IMG_ASCII_LCD)     += img-ascii-lcd.o
 obj-$(CONFIG_HD44780)           += hd44780.o
 obj-$(CONFIG_HT16K33)           += ht16k33.o
-obj-$(CONFIG_PANEL)             += panel.o
+obj-$(CONFIG_PARPORT_PANEL)     += panel.o
diff --git a/drivers/auxdisplay/charlcd.c b/drivers/auxdisplay/charlcd.c
index 60e0b772673f..92745efefb54 100644
--- a/drivers/auxdisplay/charlcd.c
+++ b/drivers/auxdisplay/charlcd.c
@@ -91,7 +91,7 @@ struct charlcd_priv {
        unsigned long long drvdata[0];
 };
-#define to_priv(p)      container_of(p, struct charlcd_priv, lcd)
+#define charlcd_to_priv(p)      container_of(p, struct charlcd_priv, lcd)
 /* Device single-open policy control */
 static atomic_t charlcd_available = ATOMIC_INIT(1);
@@ -105,7 +105,7 @@ static void long_sleep(int ms)
 /* turn the backlight on or off */
 static void charlcd_backlight(struct charlcd *lcd, int on)
 {
-        struct charlcd_priv *priv = to_priv(lcd);
+        struct charlcd_priv *priv = charlcd_to_priv(lcd);
        if (!lcd->ops->backlight)
                return;
@@ -134,7 +134,7 @@ static void charlcd_bl_off(struct work_struct *work)
 /* turn the backlight on for a little while */
 void charlcd_poke(struct charlcd *lcd)
 {
-        struct charlcd_priv *priv = to_priv(lcd);
+        struct charlcd_priv *priv = charlcd_to_priv(lcd);
        if (!lcd->ops->backlight)
                return;
@@ -152,7 +152,7 @@ EXPORT_SYMBOL_GPL(charlcd_poke);
 static void charlcd_gotoxy(struct charlcd *lcd)
 {
-        struct charlcd_priv *priv = to_priv(lcd);
+        struct charlcd_priv *priv = charlcd_to_priv(lcd);
        unsigned int addr;
        /*
@@ -170,7 +170,7 @@ static void charlcd_gotoxy(struct charlcd *lcd)
 static void charlcd_home(struct charlcd *lcd)
 {
-        struct charlcd_priv *priv = to_priv(lcd);
+        struct charlcd_priv *priv = charlcd_to_priv(lcd);
        priv->addr.x = 0;
        priv->addr.y = 0;
@@ -179,7 +179,7 @@ static void charlcd_home(struct charlcd *lcd)
 static void charlcd_print(struct charlcd *lcd, char c)
 {
-        struct charlcd_priv *priv = to_priv(lcd);
+        struct charlcd_priv *priv = charlcd_to_priv(lcd);
        if (priv->addr.x < lcd->bwidth) {
                if (lcd->char_conv)
@@ -211,7 +211,7 @@ static void charlcd_clear_fast(struct charlcd *lcd)
 /* clears the display and resets X/Y */
 static void charlcd_clear_display(struct charlcd *lcd)
 {
-        struct charlcd_priv *priv = to_priv(lcd);
+        struct charlcd_priv *priv = charlcd_to_priv(lcd);
        lcd->ops->write_cmd(lcd, LCD_CMD_DISPLAY_CLEAR);
        priv->addr.x = 0;
@@ -223,7 +223,7 @@ static void charlcd_clear_display(struct charlcd *lcd)
 static int charlcd_init_display(struct charlcd *lcd)
 {
        void (*write_cmd_raw)(struct charlcd *lcd, int cmd);
-        struct charlcd_priv *priv = to_priv(lcd);
+        struct charlcd_priv *priv = charlcd_to_priv(lcd);
        u8 init;
        if (lcd->ifwidth != 4 && lcd->ifwidth != 8)
@@ -369,7 +369,7 @@ static bool parse_xy(const char *s, unsigned long *x, unsigned long *y)
 static inline int handle_lcd_special_code(struct charlcd *lcd)
 {
-        struct charlcd_priv *priv = to_priv(lcd);
+        struct charlcd_priv *priv = charlcd_to_priv(lcd);
        /* LCD special codes */
@@ -580,7 +580,7 @@ static inline int handle_lcd_special_code(struct charlcd *lcd)
 static void charlcd_write_char(struct charlcd *lcd, char c)
 {
-        struct charlcd_priv *priv = to_priv(lcd);
+        struct charlcd_priv *priv = charlcd_to_priv(lcd);
        /* first, we'll test if we're in escape mode */
        if ((c != '\n') && priv->esc_seq.len >= 0) {
@@ -705,7 +705,7 @@ static ssize_t charlcd_write(struct file *file, const char __user *buf,
 static int charlcd_open(struct inode *inode, struct file *file)
 {
-        struct charlcd_priv *priv = to_priv(the_charlcd);
+        struct charlcd_priv *priv = charlcd_to_priv(the_charlcd);
        int ret;
        ret = -EBUSY;
@@ -763,10 +763,24 @@ static void charlcd_puts(struct charlcd *lcd, const char *s)
        }
 }
+#ifdef CONFIG_PANEL_BOOT_MESSAGE
+#define LCD_INIT_TEXT CONFIG_PANEL_BOOT_MESSAGE
+#else
+#define LCD_INIT_TEXT "Linux-" UTS_RELEASE "\n"
+#endif
+#ifdef CONFIG_CHARLCD_BL_ON
+#define LCD_INIT_BL "\x1b[L+"
+#elif defined(CONFIG_CHARLCD_BL_FLASH)
+#define LCD_INIT_BL "\x1b[L*"
+#else
+#define LCD_INIT_BL "\x1b[L-"
+#endif
 /* initialize the LCD driver */
 static int charlcd_init(struct charlcd *lcd)
 {
-        struct charlcd_priv *priv = to_priv(lcd);
+        struct charlcd_priv *priv = charlcd_to_priv(lcd);
        int ret;
        if (lcd->ops->backlight) {
@@ -784,13 +798,8 @@ static int charlcd_init(struct charlcd *lcd)
                return ret;
        /* display a short message */
-#ifdef CONFIG_PANEL_CHANGE_MESSAGE
+        charlcd_puts(lcd, "\x1b[Lc\x1b[Lb" LCD_INIT_BL LCD_INIT_TEXT);
-#ifdef CONFIG_PANEL_BOOT_MESSAGE
-        charlcd_puts(lcd, "\x1b[Lc\x1b[Lb\x1b[L*" CONFIG_PANEL_BOOT_MESSAGE);
-#endif
-#else
-        charlcd_puts(lcd, "\x1b[Lc\x1b[Lb\x1b[L*Linux-" UTS_RELEASE "\n");
-#endif
        /* clear the display on the next device opening */
        priv->must_clear = true;
        charlcd_home(lcd);
@@ -818,6 +827,12 @@ struct charlcd *charlcd_alloc(unsigned int drvdata_size)
 }
 EXPORT_SYMBOL_GPL(charlcd_alloc);
+void charlcd_free(struct charlcd *lcd)
+{
+        kfree(charlcd_to_priv(lcd));
+}
+EXPORT_SYMBOL_GPL(charlcd_free);
 static int panel_notify_sys(struct notifier_block *this, unsigned long code,
                            void *unused)
 {
@@ -866,7 +881,7 @@ EXPORT_SYMBOL_GPL(charlcd_register);
 int charlcd_unregister(struct charlcd *lcd)
 {
-        struct charlcd_priv *priv = to_priv(lcd);
+        struct charlcd_priv *priv = charlcd_to_priv(lcd);
        unregister_reboot_notifier(&panel_notifier);
        charlcd_puts(lcd, "\x0cLCD driver unloaded.\x1b[Lc\x1b[Lb\x1b[L-");
diff --git a/drivers/auxdisplay/hd44780.c b/drivers/auxdisplay/hd44780.c
index 9ad93ea42fdc..ab15b64707ad 100644
--- a/drivers/auxdisplay/hd44780.c
+++ b/drivers/auxdisplay/hd44780.c
@@ -271,7 +271,7 @@ static int hd44780_probe(struct platform_device *pdev)
        return 0;
 fail:
-        kfree(lcd);
+        charlcd_free(lcd);
        return ret;
 }
@@ -280,6 +280,8 @@ static int hd44780_remove(struct platform_device *pdev)
        struct charlcd *lcd = platform_get_drvdata(pdev);
        charlcd_unregister(lcd);
+        charlcd_free(lcd);
        return 0;
 }
diff --git a/drivers/auxdisplay/panel.c b/drivers/auxdisplay/panel.c
index 21b9b2f2470a..e06de63497cf 100644
--- a/drivers/auxdisplay/panel.c
+++ b/drivers/auxdisplay/panel.c
@@ -1620,7 +1620,7 @@ err_lcd_unreg:
        if (lcd.enabled)
                charlcd_unregister(lcd.charlcd);
 err_unreg_device:
-        kfree(lcd.charlcd);
+        charlcd_free(lcd.charlcd);
        lcd.charlcd = NULL;
        parport_unregister_device(pprt);
        pprt = NULL;
@@ -1647,7 +1647,7 @@ static void panel_detach(struct parport *port)
        if (lcd.enabled) {
                charlcd_unregister(lcd.charlcd);
                lcd.initialized = false;
-                kfree(lcd.charlcd);
+                charlcd_free(lcd.charlcd);
                lcd.charlcd = NULL;
        }
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 76c9969b7124..96a6dc9d305c 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1469,12 +1469,12 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
        if (IS_ERR(gpd_data))
                return PTR_ERR(gpd_data);
-        genpd_lock(genpd);
        ret = genpd->attach_dev ? genpd->attach_dev(genpd, dev) : 0;
        if (ret)
                goto out;
+        genpd_lock(genpd);
        dev_pm_domain_set(dev, &genpd->domain);
        genpd->device_count++;
@@ -1482,9 +1482,8 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
        list_add_tail(&gpd_data->base.list_node, &genpd->dev_list);
- out:
        genpd_unlock(genpd);
+ out:
        if (ret)
                genpd_free_dev_data(dev, gpd_data);
        else
@@ -1533,15 +1532,15 @@ static int genpd_remove_device(struct generic_pm_domain *genpd,
        genpd->device_count--;
        genpd->max_off_time_changed = true;
-        if (genpd->detach_dev)
-                genpd->detach_dev(genpd, dev);
        dev_pm_domain_set(dev, NULL);
        list_del_init(&pdd->list_node);
        genpd_unlock(genpd);
+        if (genpd->detach_dev)
+                genpd->detach_dev(genpd, dev);
        genpd_free_dev_data(dev, gpd_data);
        return 0;
diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
index 1fad9291f6aa..7fc5a18e02ad 100644
--- a/drivers/base/swnode.c
+++ b/drivers/base/swnode.c
@@ -472,7 +472,7 @@ static int software_node_read_string_array(const struct fwnode_handle *fwnode,
                                                val, nval);
 }
-struct fwnode_handle *
+static struct fwnode_handle *
 software_node_get_parent(const struct fwnode_handle *fwnode)
 {
        struct software_node *swnode = to_software_node(fwnode);
@@ -481,7 +481,7 @@ software_node_get_parent(const struct fwnode_handle *fwnode)
                        NULL;
 }
-struct fwnode_handle *
+static struct fwnode_handle *
 software_node_get_next_child(const struct fwnode_handle *fwnode,
                             struct fwnode_handle *child)
 {
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 1e6edd568214..bf1c61cab8eb 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -656,7 +656,7 @@ static int loop_validate_file(struct file *file, struct block_device *bdev)
                        return -EBADF;
                l = f->f_mapping->host->i_bdev->bd_disk->private_data;
-                if (l->lo_state == Lo_unbound) {
+                if (l->lo_state != Lo_bound) {
                        return -EINVAL;
                }
                f = l->lo_backing_file;
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index 96670eefaeb2..377a694dc228 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -749,8 +749,12 @@ static int pcd_detect(void)
                return 0;
        printk("%s: No CD-ROM drive found\n", name);
-        for (unit = 0, cd = pcd; unit < PCD_UNITS; unit++, cd++)
+        for (unit = 0, cd = pcd; unit < PCD_UNITS; unit++, cd++) {
+                blk_cleanup_queue(cd->disk->queue);
+                cd->disk->queue = NULL;
+                blk_mq_free_tag_set(&cd->tag_set);
                put_disk(cd->disk);
+        }
        pi_unregister_driver(par_drv);
        return -1;
 }
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index e92e7a8eeeb2..103b617cdc31 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -761,8 +761,12 @@ static int pf_detect(void)
                return 0;
        printk("%s: No ATAPI disk detected\n", name);
-        for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++)
+        for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) {
+                blk_cleanup_queue(pf->disk->queue);
+                pf->disk->queue = NULL;
+                blk_mq_free_tag_set(&pf->tag_set);
                put_disk(pf->disk);
+        }
        pi_unregister_driver(par_drv);
        return -1;
 }
@@ -1047,13 +1051,15 @@ static void __exit pf_exit(void)
        int unit;
        unregister_blkdev(major, name);
        for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) {
-                if (!pf->present)
+                if (pf->present)
-                        continue;
+                        del_gendisk(pf->disk);
-                del_gendisk(pf->disk);
                blk_cleanup_queue(pf->disk->queue);
                blk_mq_free_tag_set(&pf->tag_set);
                put_disk(pf->disk);
-                pi_release(pf->pi);
+                if (pf->present)
+                        pi_release(pf->pi);
        }
 }
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 4ba967d65cf9..2210c1b9491b 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -833,7 +833,7 @@ static int parse_rbd_opts_token(char *c, void *private)
                pctx->opts->queue_depth = intval;
                break;
        case Opt_alloc_size:
-                if (intval < 1) {
+                if (intval < SECTOR_SIZE) {
                        pr_err("alloc_size out of range\n");
                        return -EINVAL;
                }
@@ -924,23 +924,6 @@ static void rbd_put_client(struct rbd_client *rbdc)
                kref_put(&rbdc->kref, rbd_client_release);
 }
-static int wait_for_latest_osdmap(struct ceph_client *client)
-{
-        u64 newest_epoch;
-        int ret;
-        ret = ceph_monc_get_version(&client->monc, "osdmap", &newest_epoch);
-        if (ret)
-                return ret;
-        if (client->osdc.osdmap->epoch >= newest_epoch)
-                return 0;
-        ceph_osdc_maybe_request_map(&client->osdc);
-        return ceph_monc_wait_osdmap(&client->monc, newest_epoch,
-                                     client->options->mount_timeout);
-}
 /*
 * Get a ceph client with specific addr and configuration, if one does
 * not exist create it.  Either way, ceph_opts is consumed by this
@@ -960,7 +943,8 @@ static struct rbd_client *rbd_get_client(struct ceph_options *ceph_opts)
                 * Using an existing client.  Make sure ->pg_pools is up to
                 * date before we look up the pool id in do_rbd_add().
                 */
-                ret = wait_for_latest_osdmap(rbdc->client);
+                ret = ceph_wait_for_latest_osdmap(rbdc->client,
+                                        rbdc->client->options->mount_timeout);
                if (ret) {
                        rbd_warn(NULL, "failed to get latest osdmap: %d", ret);
                        rbd_put_client(rbdc);
@@ -4203,12 +4187,12 @@ static int rbd_init_disk(struct rbd_device *rbd_dev)
        q->limits.max_sectors = queue_max_hw_sectors(q);
        blk_queue_max_segments(q, USHRT_MAX);
        blk_queue_max_segment_size(q, UINT_MAX);
-        blk_queue_io_min(q, objset_bytes);
+        blk_queue_io_min(q, rbd_dev->opts->alloc_size);
-        blk_queue_io_opt(q, objset_bytes);
+        blk_queue_io_opt(q, rbd_dev->opts->alloc_size);
        if (rbd_dev->opts->trim) {
                blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);
-                q->limits.discard_granularity = objset_bytes;
+                q->limits.discard_granularity = rbd_dev->opts->alloc_size;
                blk_queue_max_discard_sectors(q, objset_bytes >> SECTOR_SHIFT);
                blk_queue_max_write_zeroes_sectors(q, objset_bytes >> SECTOR_SHIFT);
        }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index bfa9062ce6b9..16fcb56c232b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -700,6 +700,8 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,
        struct amdgpu_vm_bo_base *bo_base, *tmp;
        int r = 0;
+        vm->bulk_moveable &= list_empty(&vm->evicted);
        list_for_each_entry_safe(bo_base, tmp, &vm->evicted, vm_status) {
                struct amdgpu_bo *bo = bo_base->bo;
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 600259b4e291..2fe8397241ea 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -742,7 +742,7 @@ static int gmc_v9_0_allocate_vm_inv_eng(struct amdgpu_device *adev)
                }
                ring->vm_inv_eng = inv_eng - 1;
-                change_bit(inv_eng - 1, (unsigned long *)(&vm_inv_engs[vmhub]));
+                vm_inv_engs[vmhub] &= ~(1 << ring->vm_inv_eng);
                dev_info(adev->dev, "ring %s uses VM inv eng %u on hub %u\n",
                         ring->name, ring->vm_inv_eng, ring->funcs->vmhub);
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 0573eab0e190..f35e4ab55b27 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -20,6 +20,7 @@
 #include "regs-vp.h"
 #include <linux/kernel.h>
+#include <linux/ktime.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/i2c.h>
@@ -352,15 +353,62 @@ static void mixer_cfg_vp_blend(struct mixer_context *ctx, unsigned int alpha)
        mixer_reg_write(ctx, MXR_VIDEO_CFG, val);
 }
-static void mixer_vsync_set_update(struct mixer_context *ctx, bool enable)
+static bool mixer_is_synced(struct mixer_context *ctx)
 {
-        /* block update on vsync */
+        u32 base, shadow;
-        mixer_reg_writemask(ctx, MXR_STATUS, enable ?
-                        MXR_STATUS_SYNC_ENABLE : 0, MXR_STATUS_SYNC_ENABLE);
+        if (ctx->mxr_ver == MXR_VER_16_0_33_0 ||
+            ctx->mxr_ver == MXR_VER_128_0_0_184)
+                return !(mixer_reg_read(ctx, MXR_CFG) &
+                         MXR_CFG_LAYER_UPDATE_COUNT_MASK);
+        if (test_bit(MXR_BIT_VP_ENABLED, &ctx->flags) &&
+            vp_reg_read(ctx, VP_SHADOW_UPDATE))
+                return false;
+        base = mixer_reg_read(ctx, MXR_CFG);
+        shadow = mixer_reg_read(ctx, MXR_CFG_S);
+        if (base != shadow)
+                return false;
+        base = mixer_reg_read(ctx, MXR_GRAPHIC_BASE(0));
+        shadow = mixer_reg_read(ctx, MXR_GRAPHIC_BASE_S(0));
+        if (base != shadow)
+                return false;
+        base = mixer_reg_read(ctx, MXR_GRAPHIC_BASE(1));
+        shadow = mixer_reg_read(ctx, MXR_GRAPHIC_BASE_S(1));
+        if (base != shadow)
+                return false;
+        return true;
+}
+static int mixer_wait_for_sync(struct mixer_context *ctx)
+{
+        ktime_t timeout = ktime_add_us(ktime_get(), 100000);
+        while (!mixer_is_synced(ctx)) {
+                usleep_range(1000, 2000);
+                if (ktime_compare(ktime_get(), timeout) > 0)
+                        return -ETIMEDOUT;
+        }
+        return 0;
+}
+static void mixer_disable_sync(struct mixer_context *ctx)
+{
+        mixer_reg_writemask(ctx, MXR_STATUS, 0, MXR_STATUS_SYNC_ENABLE);
+}
+static void mixer_enable_sync(struct mixer_context *ctx)
+{
+        if (ctx->mxr_ver == MXR_VER_16_0_33_0 ||
+            ctx->mxr_ver == MXR_VER_128_0_0_184)
+                mixer_reg_writemask(ctx, MXR_CFG, ~0, MXR_CFG_LAYER_UPDATE);
+        mixer_reg_writemask(ctx, MXR_STATUS, ~0, MXR_STATUS_SYNC_ENABLE);
        if (test_bit(MXR_BIT_VP_ENABLED, &ctx->flags))
-                vp_reg_write(ctx, VP_SHADOW_UPDATE, enable ?
+                vp_reg_write(ctx, VP_SHADOW_UPDATE, VP_SHADOW_UPDATE_ENABLE);
-                        VP_SHADOW_UPDATE_ENABLE : 0);
 }
 static void mixer_cfg_scan(struct mixer_context *ctx, int width, int height)
@@ -498,7 +546,6 @@ static void vp_video_buffer(struct mixer_context *ctx,
        spin_lock_irqsave(&ctx->reg_slock, flags);
-        vp_reg_write(ctx, VP_SHADOW_UPDATE, 1);
        /* interlace or progressive scan mode */
        val = (test_bit(MXR_BIT_INTERLACE, &ctx->flags) ? ~0 : 0);
        vp_reg_writemask(ctx, VP_MODE, val, VP_MODE_LINE_SKIP);
@@ -553,11 +600,6 @@ static void vp_video_buffer(struct mixer_context *ctx,
        vp_regs_dump(ctx);
 }
-static void mixer_layer_update(struct mixer_context *ctx)
-{
-        mixer_reg_writemask(ctx, MXR_CFG, ~0, MXR_CFG_LAYER_UPDATE);
-}
 static void mixer_graph_buffer(struct mixer_context *ctx,
                               struct exynos_drm_plane *plane)
 {
@@ -640,11 +682,6 @@ static void mixer_graph_buffer(struct mixer_context *ctx,
        mixer_cfg_layer(ctx, win, priority, true);
        mixer_cfg_gfx_blend(ctx, win, pixel_alpha, state->base.alpha);
-        /* layer update mandatory for mixer 16.0.33.0 */
-        if (ctx->mxr_ver == MXR_VER_16_0_33_0 ||
-                ctx->mxr_ver == MXR_VER_128_0_0_184)
-                mixer_layer_update(ctx);
        spin_unlock_irqrestore(&ctx->reg_slock, flags);
        mixer_regs_dump(ctx);
@@ -709,7 +746,7 @@ static void mixer_win_reset(struct mixer_context *ctx)
 static irqreturn_t mixer_irq_handler(int irq, void *arg)
 {
        struct mixer_context *ctx = arg;
-        u32 val, base, shadow;
+        u32 val;
        spin_lock(&ctx->reg_slock);
@@ -723,26 +760,9 @@ static irqreturn_t mixer_irq_handler(int irq, void *arg)
                val &= ~MXR_INT_STATUS_VSYNC;
                /* interlace scan need to check shadow register */
-                if (test_bit(MXR_BIT_INTERLACE, &ctx->flags)) {
+                if (test_bit(MXR_BIT_INTERLACE, &ctx->flags)
-                        if (test_bit(MXR_BIT_VP_ENABLED, &ctx->flags) &&
+                    && !mixer_is_synced(ctx))
-                            vp_reg_read(ctx, VP_SHADOW_UPDATE))
+                        goto out;
-                                goto out;
-                        base = mixer_reg_read(ctx, MXR_CFG);
-                        shadow = mixer_reg_read(ctx, MXR_CFG_S);
-                        if (base != shadow)
-                                goto out;
-                        base = mixer_reg_read(ctx, MXR_GRAPHIC_BASE(0));
-                        shadow = mixer_reg_read(ctx, MXR_GRAPHIC_BASE_S(0));
-                        if (base != shadow)
-                                goto out;
-                        base = mixer_reg_read(ctx, MXR_GRAPHIC_BASE(1));
-                        shadow = mixer_reg_read(ctx, MXR_GRAPHIC_BASE_S(1));
-                        if (base != shadow)
-                                goto out;
-                }
                drm_crtc_handle_vblank(&ctx->crtc->base);
        }
@@ -917,12 +937,14 @@ static void mixer_disable_vblank(struct exynos_drm_crtc *crtc)
 static void mixer_atomic_begin(struct exynos_drm_crtc *crtc)
 {
-        struct mixer_context *mixer_ctx = crtc->ctx;
+        struct mixer_context *ctx = crtc->ctx;
-        if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags))
+        if (!test_bit(MXR_BIT_POWERED, &ctx->flags))
                return;
-        mixer_vsync_set_update(mixer_ctx, false);
+        if (mixer_wait_for_sync(ctx))
+                dev_err(ctx->dev, "timeout waiting for VSYNC\n");
+        mixer_disable_sync(ctx);
 }
 static void mixer_update_plane(struct exynos_drm_crtc *crtc,
@@ -964,7 +986,7 @@ static void mixer_atomic_flush(struct exynos_drm_crtc *crtc)
        if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags))
                return;
-        mixer_vsync_set_update(mixer_ctx, true);
+        mixer_enable_sync(mixer_ctx);
        exynos_crtc_handle_event(crtc);
 }
@@ -979,7 +1001,7 @@ static void mixer_enable(struct exynos_drm_crtc *crtc)
        exynos_drm_pipe_clk_enable(crtc, true);
-        mixer_vsync_set_update(ctx, false);
+        mixer_disable_sync(ctx);
        mixer_reg_writemask(ctx, MXR_STATUS, ~0, MXR_STATUS_SOFT_RESET);
@@ -992,7 +1014,7 @@ static void mixer_enable(struct exynos_drm_crtc *crtc)
        mixer_commit(ctx);
-        mixer_vsync_set_update(ctx, true);
+        mixer_enable_sync(ctx);
        set_bit(MXR_BIT_POWERED, &ctx->flags);
 }
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 30d516e975c6..8558e81fdc2a 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1734,8 +1734,13 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
         * pages from.
         */
        if (!obj->base.filp) {
-                i915_gem_object_put(obj);
+                addr = -ENXIO;
-                return -ENXIO;
+                goto err;
+        }
+        if (range_overflows(args->offset, args->size, (u64)obj->base.size)) {
+                addr = -EINVAL;
+                goto err;
        }
        addr = vm_mmap(obj->base.filp, 0, args->size,
@@ -1749,8 +1754,8 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
                struct vm_area_struct *vma;
                if (down_write_killable(&mm->mmap_sem)) {
-                        i915_gem_object_put(obj);
+                        addr = -EINTR;
-                        return -EINTR;
+                        goto err;
                }
                vma = find_vma(mm, addr);
                if (vma && __vma_matches(vma, obj->base.filp, addr, args->size))
@@ -1768,12 +1773,10 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
        i915_gem_object_put(obj);
        args->addr_ptr = (u64)addr;
        return 0;
 err:
        i915_gem_object_put(obj);
        return addr;
 }
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 9a65341fec09..aa6791255252 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1721,7 +1721,7 @@ error_msg(struct i915_gpu_state *error, unsigned long engines, const char *msg)
                        i915_error_generate_code(error, engines));
        if (engines) {
                /* Just show the first executing process, more is confusing */
-                i = ffs(engines);
+                i = __ffs(engines);
                len += scnprintf(error->error_msg + len,
                                 sizeof(error->error_msg) - len,
                                 ", in %s [%d]",
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index b508d8a735e0..4364f42cac6b 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -1673,6 +1673,7 @@ init_vbt_missing_defaults(struct drm_i915_private *dev_priv)
                info->supports_dvi = (port != PORT_A && port != PORT_E);
                info->supports_hdmi = info->supports_dvi;
                info->supports_dp = (port != PORT_E);
+                info->supports_edp = (port == PORT_A);
        }
 }
diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
index 88a52f6b39fe..7dfbbbc1beea 100644
--- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c
+++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
@@ -181,7 +181,7 @@ nouveau_debugfs_pstate_set(struct file *file, const char __user *ubuf,
        }
        ret = pm_runtime_get_sync(drm->dev);
-        if (IS_ERR_VALUE(ret) && ret != -EACCES)
+        if (ret < 0 && ret != -EACCES)
                return ret;
        ret = nvif_mthd(ctrl, NVIF_CONTROL_PSTATE_USER, &args, sizeof(args));
        pm_runtime_put_autosuspend(drm->dev);
diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c
index aa9fec80492d..40c47d6a7d78 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dmem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c
@@ -100,12 +100,10 @@ static void
 nouveau_dmem_free(struct hmm_devmem *devmem, struct page *page)
 {
        struct nouveau_dmem_chunk *chunk;
-        struct nouveau_drm *drm;
        unsigned long idx;
        chunk = (void *)hmm_devmem_page_get_drvdata(page);
        idx = page_to_pfn(page) - chunk->pfn_first;
-        drm = chunk->drm;
        /*
         * FIXME:
@@ -456,11 +454,6 @@ nouveau_dmem_resume(struct nouveau_drm *drm)
                /* FIXME handle pin failure */
                WARN_ON(ret);
        }
-        list_for_each_entry (chunk, &drm->dmem->chunk_empty, list) {
-                ret = nouveau_bo_pin(chunk->bo, TTM_PL_FLAG_VRAM, false);
-                /* FIXME handle pin failure */
-                WARN_ON(ret);
-        }
        mutex_unlock(&drm->dmem->mutex);
 }
@@ -479,9 +472,6 @@ nouveau_dmem_suspend(struct nouveau_drm *drm)
        list_for_each_entry (chunk, &drm->dmem->chunk_full, list) {
                nouveau_bo_unpin(chunk->bo);
        }
-        list_for_each_entry (chunk, &drm->dmem->chunk_empty, list) {
-                nouveau_bo_unpin(chunk->bo);
-        }
        mutex_unlock(&drm->dmem->mutex);
 }
@@ -623,7 +613,7 @@ nouveau_dmem_init(struct nouveau_drm *drm)
         */
        drm->dmem->devmem = hmm_devmem_add(&nouveau_dmem_devmem_ops,
                                           device, size);
-        if (drm->dmem->devmem == NULL) {
+        if (IS_ERR(drm->dmem->devmem)) {
                kfree(drm->dmem);
                drm->dmem = NULL;
                return;
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
index d5a23295dd80..bb7b58407039 100644
--- a/drivers/gpu/drm/udl/udl_gem.c
+++ b/drivers/gpu/drm/udl/udl_gem.c
@@ -224,7 +224,7 @@ int udl_gem_mmap(struct drm_file *file, struct drm_device *dev,
        *offset = drm_vma_node_offset_addr(&gobj->base.vma_node);
 out:
-        drm_gem_object_put(&gobj->base);
+        drm_gem_object_put_unlocked(&gobj->base);
 unlock:
        mutex_unlock(&udl->gem_lock);
        return ret;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index b913a56f3426..2a9112515f46 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -564,11 +564,9 @@ static int vmw_fb_set_par(struct fb_info *info)
                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC)
        };
-        struct drm_display_mode *old_mode;
        struct drm_display_mode *mode;
        int ret;
-        old_mode = par->set_mode;
        mode = drm_mode_duplicate(vmw_priv->dev, &new_mode);
        if (!mode) {
                DRM_ERROR("Could not create new fb mode.\n");
@@ -579,11 +577,7 @@ static int vmw_fb_set_par(struct fb_info *info)
        mode->vdisplay = var->yres;
        vmw_guess_mode_timing(mode);
-        if (old_mode && drm_mode_equal(old_mode, mode)) {
+        if (!vmw_kms_validate_mode_vram(vmw_priv,
-                drm_mode_destroy(vmw_priv->dev, mode);
-                mode = old_mode;
-                old_mode = NULL;
-        } else if (!vmw_kms_validate_mode_vram(vmw_priv,
                                        mode->hdisplay *
                                        DIV_ROUND_UP(var->bits_per_pixel, 8),
                                        mode->vdisplay)) {
@@ -620,8 +614,8 @@ static int vmw_fb_set_par(struct fb_info *info)
        schedule_delayed_work(&par->local_work, 0);
 out_unlock:
-        if (old_mode)
+        if (par->set_mode)
-                drm_mode_destroy(vmw_priv->dev, old_mode);
+                drm_mode_destroy(vmw_priv->dev, par->set_mode);
        par->set_mode = mode;
        mutex_unlock(&par->bo_mutex);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
index b93c558dd86e..7da752ca1c34 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
@@ -57,7 +57,7 @@ static int vmw_gmrid_man_get_node(struct ttm_mem_type_manager *man,
        id = ida_alloc_max(&gman->gmr_ida, gman->max_gmr_ids - 1, GFP_KERNEL);
        if (id < 0)
-                return id;
+                return (id != -ENOMEM ? 0 : id);
        spin_lock(&gman->lock);
diff --git a/drivers/infiniband/hw/i40iw/i40iw_utils.c b/drivers/infiniband/hw/i40iw/i40iw_utils.c
index c5a881172524..337410f40860 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_utils.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_utils.c
@@ -173,7 +173,12 @@ int i40iw_inetaddr_event(struct notifier_block *notifier,
                rcu_read_lock();
                in = __in_dev_get_rcu(upper_dev);
-                local_ipaddr = ntohl(in->ifa_list->ifa_address);
+                if (!in->ifa_list)
+                        local_ipaddr = 0;
+                else
+                        local_ipaddr = ntohl(in->ifa_list->ifa_address);
                rcu_read_unlock();
        } else {
                local_ipaddr = ntohl(ifa->ifa_address);
@@ -185,6 +190,11 @@ int i40iw_inetaddr_event(struct notifier_block *notifier,
        case NETDEV_UP:
                /* Fall through */
        case NETDEV_CHANGEADDR:
+                /* Just skip if no need to handle ARP cache */
+                if (!local_ipaddr)
+                        break;
                i40iw_manage_arp_cache(iwdev,
                                       netdev->dev_addr,
                                       &local_ipaddr,
diff --git a/drivers/infiniband/hw/mlx4/alias_GUID.c b/drivers/infiniband/hw/mlx4/alias_GUID.c
index 782499abcd98..2a0b59a4b6eb 100644
--- a/drivers/infiniband/hw/mlx4/alias_GUID.c
+++ b/drivers/infiniband/hw/mlx4/alias_GUID.c
@@ -804,8 +804,8 @@ void mlx4_ib_destroy_alias_guid_service(struct mlx4_ib_dev *dev)
        unsigned long flags;
        for (i = 0 ; i < dev->num_ports; i++) {
-                cancel_delayed_work(&dev->sriov.alias_guid.ports_guid[i].alias_guid_work);
                det = &sriov->alias_guid.ports_guid[i];
+                cancel_delayed_work_sync(&det->alias_guid_work);
                spin_lock_irqsave(&sriov->alias_guid.ag_work_lock, flags);
                while (!list_empty(&det->cb_list)) {
                        cb_ctx = list_entry(det->cb_list.next,
diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
index eaa055007f28..9e08df7914aa 100644
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -20,6 +20,7 @@
 enum devx_obj_flags {
        DEVX_OBJ_FLAGS_INDIRECT_MKEY = 1 << 0,
+        DEVX_OBJ_FLAGS_DCT = 1 << 1,
 };
 struct devx_async_data {
@@ -39,7 +40,10 @@ struct devx_obj {
        u32                     dinlen; /* destroy inbox length */
        u32                     dinbox[MLX5_MAX_DESTROY_INBOX_SIZE_DW];
        u32                     flags;
-        struct mlx5_ib_devx_mr  devx_mr;
+        union {
+                struct mlx5_ib_devx_mr  devx_mr;
+                struct mlx5_core_dct    core_dct;
+        };
 };
 struct devx_umem {
@@ -347,7 +351,6 @@ static u64 devx_get_obj_id(const void *in)
                obj_id = get_enc_obj_id(MLX5_CMD_OP_CREATE_RQ,
                                        MLX5_GET(arm_rq_in, in, srq_number));
                break;
-        case MLX5_CMD_OP_DRAIN_DCT:
        case MLX5_CMD_OP_ARM_DCT_FOR_KEY_VIOLATION:
                obj_id = get_enc_obj_id(MLX5_CMD_OP_CREATE_DCT,
                                        MLX5_GET(drain_dct_in, in, dctn));
@@ -618,7 +621,6 @@ static bool devx_is_obj_modify_cmd(const void *in)
        case MLX5_CMD_OP_2RST_QP:
        case MLX5_CMD_OP_ARM_XRC_SRQ:
        case MLX5_CMD_OP_ARM_RQ:
-        case MLX5_CMD_OP_DRAIN_DCT:
        case MLX5_CMD_OP_ARM_DCT_FOR_KEY_VIOLATION:
        case MLX5_CMD_OP_ARM_XRQ:
        case MLX5_CMD_OP_SET_XRQ_DC_PARAMS_ENTRY:
@@ -1124,7 +1126,11 @@ static int devx_obj_cleanup(struct ib_uobject *uobject,
        if (obj->flags & DEVX_OBJ_FLAGS_INDIRECT_MKEY)
                devx_cleanup_mkey(obj);
-        ret = mlx5_cmd_exec(obj->mdev, obj->dinbox, obj->dinlen, out, sizeof(out));
+        if (obj->flags & DEVX_OBJ_FLAGS_DCT)
+                ret = mlx5_core_destroy_dct(obj->mdev, &obj->core_dct);
+        else
+                ret = mlx5_cmd_exec(obj->mdev, obj->dinbox, obj->dinlen, out,
+                                    sizeof(out));
        if (ib_is_destroy_retryable(ret, why, uobject))
                return ret;
@@ -1185,9 +1191,17 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)(
                devx_set_umem_valid(cmd_in);
        }
-        err = mlx5_cmd_exec(dev->mdev, cmd_in,
+        if (opcode == MLX5_CMD_OP_CREATE_DCT) {
-                            cmd_in_len,
+                obj->flags |= DEVX_OBJ_FLAGS_DCT;
-                            cmd_out, cmd_out_len);
+                err = mlx5_core_create_dct(dev->mdev, &obj->core_dct,
+                                           cmd_in, cmd_in_len,
+                                           cmd_out, cmd_out_len);
+        } else {
+                err = mlx5_cmd_exec(dev->mdev, cmd_in,
+                                    cmd_in_len,
+                                    cmd_out, cmd_out_len);
+        }
        if (err)
                goto obj_free;
@@ -1214,7 +1228,11 @@ err_copy:
        if (obj->flags & DEVX_OBJ_FLAGS_INDIRECT_MKEY)
                devx_cleanup_mkey(obj);
 obj_destroy:
-        mlx5_cmd_exec(obj->mdev, obj->dinbox, obj->dinlen, out, sizeof(out));
+        if (obj->flags & DEVX_OBJ_FLAGS_DCT)
+                mlx5_core_destroy_dct(obj->mdev, &obj->core_dct);
+        else
+                mlx5_cmd_exec(obj->mdev, obj->dinbox, obj->dinlen, out,
+                              sizeof(out));
 obj_free:
        kfree(obj);
        return err;
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 994c19d01211..531ff20b32ad 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -415,10 +415,17 @@ static int translate_eth_ext_proto_oper(u32 eth_proto_oper, u8 *active_speed,
                *active_speed = IB_SPEED_EDR;
                break;
        case MLX5E_PROT_MASK(MLX5E_50GAUI_2_LAUI_2_50GBASE_CR2_KR2):
+                *active_width = IB_WIDTH_2X;
+                *active_speed = IB_SPEED_EDR;
+                break;
        case MLX5E_PROT_MASK(MLX5E_50GAUI_1_LAUI_1_50GBASE_CR_KR):
                *active_width = IB_WIDTH_1X;
                *active_speed = IB_SPEED_HDR;
                break;
+        case MLX5E_PROT_MASK(MLX5E_CAUI_4_100GBASE_CR4_KR4):
+                *active_width = IB_WIDTH_4X;
+                *active_speed = IB_SPEED_EDR;
+                break;
        case MLX5E_PROT_MASK(MLX5E_100GAUI_2_100GBASE_CR2_KR2):
                *active_width = IB_WIDTH_2X;
                *active_speed = IB_SPEED_HDR;
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 6b1f0e76900b..7cd006da1dae 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -3729,6 +3729,7 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,
        } else if (cur_state == IB_QPS_INIT && new_state == IB_QPS_RTR) {
                struct mlx5_ib_modify_qp_resp resp = {};
+                u32 out[MLX5_ST_SZ_DW(create_dct_out)] = {0};
                u32 min_resp_len = offsetof(typeof(resp), dctn) +
                                   sizeof(resp.dctn);
@@ -3747,7 +3748,8 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                MLX5_SET(dctc, dctc, hop_limit, attr->ah_attr.grh.hop_limit);
                err = mlx5_core_create_dct(dev->mdev, &qp->dct.mdct, qp->dct.in,
-                                           MLX5_ST_SZ_BYTES(create_dct_in));
+                                           MLX5_ST_SZ_BYTES(create_dct_in), out,
+                                           sizeof(out));
                if (err)
                        return err;
                resp.dctn = qp->dct.mdct.mqp.qpn;
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index b319e51c379b..21cb088d6687 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2608,7 +2608,12 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
        /* Everything is mapped - write the right values into s->dma_address */
        for_each_sg(sglist, s, nelems, i) {
-                s->dma_address += address + s->offset;
+                /*
+                 * Add in the remaining piece of the scatter-gather offset that
+                 * was masked out when we were determining the physical address
+                 * via (sg_phys(s) & PAGE_MASK) earlier.
+                 */
+                s->dma_address += address + (s->offset & ~PAGE_MASK);
                s->dma_length   = s->length;
        }
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 87274b54febd..28cb713d728c 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -1538,6 +1538,9 @@ static void iommu_disable_protect_mem_regions(struct intel_iommu *iommu)
        u32 pmen;
        unsigned long flags;
+        if (!cap_plmr(iommu->cap) && !cap_phmr(iommu->cap))
+                return;
        raw_spin_lock_irqsave(&iommu->register_lock, flags);
        pmen = readl(iommu->reg + DMAR_PMEN_REG);
        pmen &= ~DMA_PMEN_EPM;
@@ -5332,7 +5335,7 @@ int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct intel_svm_dev *sd
        ctx_lo = context[0].lo;
-        sdev->did = domain->iommu_did[iommu->seq_id];
+        sdev->did = FLPT_DEFAULT_DID;
        sdev->sid = PCI_DEVID(info->bus, info->devfn);
        if (!(ctx_lo & CONTEXT_PASIDE)) {
diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c
index f8d3ba247523..2de8122e218f 100644
--- a/drivers/iommu/iova.c
+++ b/drivers/iommu/iova.c
@@ -207,8 +207,10 @@ static int __alloc_and_insert_iova_range(struct iova_domain *iovad,
                curr_iova = rb_entry(curr, struct iova, node);
        } while (curr && new_pfn <= curr_iova->pfn_hi);
-        if (limit_pfn < size || new_pfn < iovad->start_pfn)
+        if (limit_pfn < size || new_pfn < iovad->start_pfn) {
+                iovad->max32_alloc_size = size;
                goto iova32_full;
+        }
        /* pfn_lo will point to size aligned address if size_aligned is set */
        new->pfn_lo = new_pfn;
@@ -222,7 +224,6 @@ static int __alloc_and_insert_iova_range(struct iova_domain *iovad,
        return 0;
 iova32_full:
-        iovad->max32_alloc_size = size;
        spin_unlock_irqrestore(&iovad->iova_rbtree_lock, flags);
        return -ENOMEM;
 }
diff --git a/drivers/mmc/host/alcor.c b/drivers/mmc/host/alcor.c
index c712b7deb3a9..82a97866e0cf 100644
--- a/drivers/mmc/host/alcor.c
+++ b/drivers/mmc/host/alcor.c
@@ -1044,14 +1044,27 @@ static void alcor_init_mmc(struct alcor_sdmmc_host *host)
        mmc->caps2 = MMC_CAP2_NO_SDIO;
        mmc->ops = &alcor_sdc_ops;
-        /* Hardware cannot do scatter lists */
+        /* The hardware does DMA data transfer of 4096 bytes to/from a single
+         * buffer address. Scatterlists are not supported, but upon DMA
+         * completion (signalled via IRQ), the original vendor driver does
+         * then immediately set up another DMA transfer of the next 4096
+         * bytes.
+         *
+         * This means that we need to handle the I/O in 4096 byte chunks.
+         * Lacking a way to limit the sglist entries to 4096 bytes, we instead
+         * impose that only one segment is provided, with maximum size 4096,
+         * which also happens to be the minimum size. This means that the
+         * single-entry sglist handled by this driver can be handed directly
+         * to the hardware, nice and simple.
+         *
+         * Unfortunately though, that means we only do 4096 bytes I/O per
+         * MMC command. A future improvement would be to make the driver
+         * accept sg lists and entries of any size, and simply iterate
+         * through them 4096 bytes at a time.
+         */
        mmc->max_segs = AU6601_MAX_DMA_SEGMENTS;
        mmc->max_seg_size = AU6601_MAX_DMA_BLOCK_SIZE;
+        mmc->max_req_size = mmc->max_seg_size;
-        mmc->max_blk_size = mmc->max_seg_size;
-        mmc->max_blk_count = mmc->max_segs;
-        mmc->max_req_size = mmc->max_seg_size * mmc->max_segs;
 }
 static int alcor_pci_sdmmc_drv_probe(struct platform_device *pdev)
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index 49e0daf2ef5e..f37003df1e01 100644
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -1117,7 +1117,7 @@ static inline void mmc_davinci_cpufreq_deregister(struct mmc_davinci_host *host)
 {
 }
 #endif
-static void __init init_mmcsd_host(struct mmc_davinci_host *host)
+static void init_mmcsd_host(struct mmc_davinci_host *host)
 {
        mmc_davinci_reset_ctrl(host, 1);
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index d54612257b06..45f7b9b53d48 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -290,11 +290,8 @@ static void mxcmci_swap_buffers(struct mmc_data *data)
        struct scatterlist *sg;
        int i;
-        for_each_sg(data->sg, sg, data->sg_len, i) {
+        for_each_sg(data->sg, sg, data->sg_len, i)
-                void *buf = kmap_atomic(sg_page(sg) + sg->offset);
+                buffer_swap32(sg_virt(sg), sg->length);
-                buffer_swap32(buf, sg->length);
-                kunmap_atomic(buf);
-        }
 }
 #else
 static inline void mxcmci_swap_buffers(struct mmc_data *data) {}
@@ -611,7 +608,6 @@ static int mxcmci_transfer_data(struct mxcmci_host *host)
 {
        struct mmc_data *data = host->req->data;
        struct scatterlist *sg;
-        void *buf;
        int stat, i;
        host->data = data;
@@ -619,18 +615,14 @@ static int mxcmci_transfer_data(struct mxcmci_host *host)
        if (data->flags & MMC_DATA_READ) {
                for_each_sg(data->sg, sg, data->sg_len, i) {
-                        buf = kmap_atomic(sg_page(sg) + sg->offset);
+                        stat = mxcmci_pull(host, sg_virt(sg), sg->length);
-                        stat = mxcmci_pull(host, buf, sg->length);
-                        kunmap(buf);
                        if (stat)
                                return stat;
                        host->datasize += sg->length;
                }
        } else {
                for_each_sg(data->sg, sg, data->sg_len, i) {
-                        buf = kmap_atomic(sg_page(sg) + sg->offset);
+                        stat = mxcmci_push(host, sg_virt(sg), sg->length);
-                        stat = mxcmci_push(host, buf, sg->length);
-                        kunmap(buf);
                        if (stat)
                                return stat;
                        host->datasize += sg->length;
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index c907bf502a12..c1d3f0e38921 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -162,7 +162,7 @@ static void pxamci_dma_irq(void *param);
 static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data)
 {
        struct dma_async_tx_descriptor *tx;
-        enum dma_data_direction direction;
+        enum dma_transfer_direction direction;
        struct dma_slave_config config;
        struct dma_chan *chan;
        unsigned int nob = data->blocks;
diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c
index 71e13844df6c..8742e27e4e8b 100644
--- a/drivers/mmc/host/renesas_sdhi_core.c
+++ b/drivers/mmc/host/renesas_sdhi_core.c
@@ -641,6 +641,7 @@ int renesas_sdhi_probe(struct platform_device *pdev,
        struct renesas_sdhi *priv;
        struct resource *res;
        int irq, ret, i;
+        u16 ver;
        of_data = of_device_get_match_data(&pdev->dev);
@@ -773,12 +774,17 @@ int renesas_sdhi_probe(struct platform_device *pdev,
        if (ret)
                goto efree;
+        ver = sd_ctrl_read16(host, CTL_VERSION);
+        /* GEN2_SDR104 is first known SDHI to use 32bit block count */
+        if (ver < SDHI_VER_GEN2_SDR104 && mmc_data->max_blk_count > U16_MAX)
+                mmc_data->max_blk_count = U16_MAX;
        ret = tmio_mmc_host_probe(host);
        if (ret < 0)
                goto edisclk;
        /* One Gen2 SDHI incarnation does NOT have a CBSY bit */
-        if (sd_ctrl_read16(host, CTL_VERSION) == SDHI_VER_GEN2_SDR50)
+        if (ver == SDHI_VER_GEN2_SDR50)
                mmc_data->flags &= ~TMIO_MMC_HAVE_CBSY;
        /* Enable tuning iff we have an SCC and a supported mode */
diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c
index b1a66ca3821a..5bbed477c9b1 100644
--- a/drivers/mmc/host/sdhci-omap.c
+++ b/drivers/mmc/host/sdhci-omap.c
@@ -1056,6 +1056,9 @@ static int sdhci_omap_probe(struct platform_device *pdev)
                        mmc->f_max = 48000000;
        }
+        if (!mmc_can_gpio_ro(mmc))
+                mmc->caps2 |= MMC_CAP2_NO_WRITE_PROTECT;
        pltfm_host->clk = devm_clk_get(dev, "fck");
        if (IS_ERR(pltfm_host->clk)) {
                ret = PTR_ERR(pltfm_host->clk);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/qp.c b/drivers/net/ethernet/mellanox/mlx5/core/qp.c
index 370ca94b6775..b8ba74de9555 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/qp.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/qp.c
@@ -40,6 +40,9 @@
 #include "mlx5_core.h"
 #include "lib/eq.h"
+static int mlx5_core_drain_dct(struct mlx5_core_dev *dev,
+                               struct mlx5_core_dct *dct);
 static struct mlx5_core_rsc_common *
 mlx5_get_rsc(struct mlx5_qp_table *table, u32 rsn)
 {
@@ -227,20 +230,49 @@ static void destroy_resource_common(struct mlx5_core_dev *dev,
        wait_for_completion(&qp->common.free);
 }
+static int _mlx5_core_destroy_dct(struct mlx5_core_dev *dev,
+                                  struct mlx5_core_dct *dct, bool need_cleanup)
+{
+        u32 out[MLX5_ST_SZ_DW(destroy_dct_out)] = {0};
+        u32 in[MLX5_ST_SZ_DW(destroy_dct_in)]   = {0};
+        struct mlx5_core_qp *qp = &dct->mqp;
+        int err;
+        err = mlx5_core_drain_dct(dev, dct);
+        if (err) {
+                if (dev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR) {
+                        goto destroy;
+                } else {
+                        mlx5_core_warn(
+                                dev, "failed drain DCT 0x%x with error 0x%x\n",
+                                qp->qpn, err);
+                        return err;
+                }
+        }
+        wait_for_completion(&dct->drained);
+destroy:
+        if (need_cleanup)
+                destroy_resource_common(dev, &dct->mqp);
+        MLX5_SET(destroy_dct_in, in, opcode, MLX5_CMD_OP_DESTROY_DCT);
+        MLX5_SET(destroy_dct_in, in, dctn, qp->qpn);
+        MLX5_SET(destroy_dct_in, in, uid, qp->uid);
+        err = mlx5_cmd_exec(dev, (void *)&in, sizeof(in),
+                            (void *)&out, sizeof(out));
+        return err;
+}
 int mlx5_core_create_dct(struct mlx5_core_dev *dev,
                         struct mlx5_core_dct *dct,
-                         u32 *in, int inlen)
+                         u32 *in, int inlen,
+                         u32 *out, int outlen)
 {
-        u32 out[MLX5_ST_SZ_DW(create_dct_out)]   = {0};
-        u32 din[MLX5_ST_SZ_DW(destroy_dct_in)]   = {0};
-        u32 dout[MLX5_ST_SZ_DW(destroy_dct_out)] = {0};
        struct mlx5_core_qp *qp = &dct->mqp;
        int err;
        init_completion(&dct->drained);
        MLX5_SET(create_dct_in, in, opcode, MLX5_CMD_OP_CREATE_DCT);
-        err = mlx5_cmd_exec(dev, in, inlen, &out, sizeof(out));
+        err = mlx5_cmd_exec(dev, in, inlen, out, outlen);
        if (err) {
                mlx5_core_warn(dev, "create DCT failed, ret %d\n", err);
                return err;
@@ -254,11 +286,7 @@ int mlx5_core_create_dct(struct mlx5_core_dev *dev,
        return 0;
 err_cmd:
-        MLX5_SET(destroy_dct_in, din, opcode, MLX5_CMD_OP_DESTROY_DCT);
+        _mlx5_core_destroy_dct(dev, dct, false);
-        MLX5_SET(destroy_dct_in, din, dctn, qp->qpn);
-        MLX5_SET(destroy_dct_in, din, uid, qp->uid);
-        mlx5_cmd_exec(dev, (void *)&in, sizeof(din),
-                      (void *)&out, sizeof(dout));
        return err;
 }
 EXPORT_SYMBOL_GPL(mlx5_core_create_dct);
@@ -323,29 +351,7 @@ static int mlx5_core_drain_dct(struct mlx5_core_dev *dev,
 int mlx5_core_destroy_dct(struct mlx5_core_dev *dev,
                          struct mlx5_core_dct *dct)
 {
-        u32 out[MLX5_ST_SZ_DW(destroy_dct_out)] = {0};
+        return _mlx5_core_destroy_dct(dev, dct, true);
-        u32 in[MLX5_ST_SZ_DW(destroy_dct_in)]   = {0};
-        struct mlx5_core_qp *qp = &dct->mqp;
-        int err;
-        err = mlx5_core_drain_dct(dev, dct);
-        if (err) {
-                if (dev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR) {
-                        goto destroy;
-                } else {
-                        mlx5_core_warn(dev, "failed drain DCT 0x%x with error 0x%x\n", qp->qpn, err);
-                        return err;
-                }
-        }
-        wait_for_completion(&dct->drained);
-destroy:
-        destroy_resource_common(dev, &dct->mqp);
-        MLX5_SET(destroy_dct_in, in, opcode, MLX5_CMD_OP_DESTROY_DCT);
-        MLX5_SET(destroy_dct_in, in, dctn, qp->qpn);
-        MLX5_SET(destroy_dct_in, in, uid, qp->uid);
-        err = mlx5_cmd_exec(dev, (void *)&in, sizeof(in),
-                            (void *)&out, sizeof(out));
-        return err;
 }
 EXPORT_SYMBOL_GPL(mlx5_core_destroy_dct);
diff --git a/drivers/platform/chrome/cros_ec_debugfs.c b/drivers/platform/chrome/cros_ec_debugfs.c
index 900c7073c46f..71308766e891 100644
--- a/drivers/platform/chrome/cros_ec_debugfs.c
+++ b/drivers/platform/chrome/cros_ec_debugfs.c
@@ -440,7 +440,7 @@ static int cros_ec_debugfs_probe(struct platform_device *pd)
        ret = cros_ec_create_pdinfo(debug_info);
        if (ret)
-                goto remove_debugfs;
+                goto remove_log;
        ec->debug_info = debug_info;
@@ -448,6 +448,8 @@ static int cros_ec_debugfs_probe(struct platform_device *pd)
        return 0;
+remove_log:
+        cros_ec_cleanup_console_log(debug_info);
 remove_debugfs:
        debugfs_remove_recursive(debug_info->dir);
        return ret;
@@ -467,7 +469,8 @@ static int __maybe_unused cros_ec_debugfs_suspend(struct device *dev)
 {
        struct cros_ec_dev *ec = dev_get_drvdata(dev);
-        cancel_delayed_work_sync(&ec->debug_info->log_poll_work);
+        if (ec->debug_info->log_buffer.buf)
+                cancel_delayed_work_sync(&ec->debug_info->log_poll_work);
        return 0;
 }
@@ -476,7 +479,8 @@ static int __maybe_unused cros_ec_debugfs_resume(struct device *dev)
 {
        struct cros_ec_dev *ec = dev_get_drvdata(dev);
-        schedule_delayed_work(&ec->debug_info->log_poll_work, 0);
+        if (ec->debug_info->log_buffer.buf)
+                schedule_delayed_work(&ec->debug_info->log_poll_work, 0);
        return 0;
 }
diff --git a/drivers/platform/chrome/wilco_ec/mailbox.c b/drivers/platform/chrome/wilco_ec/mailbox.c
index f6ff29a11f1a..14355668ddfa 100644
--- a/drivers/platform/chrome/wilco_ec/mailbox.c
+++ b/drivers/platform/chrome/wilco_ec/mailbox.c
@@ -223,11 +223,11 @@ int wilco_ec_mailbox(struct wilco_ec_device *ec, struct wilco_ec_message *msg)
                msg->command, msg->type, msg->flags, msg->response_size,
                msg->request_size);
+        mutex_lock(&ec->mailbox_lock);
        /* Prepare request packet */
        rq = ec->data_buffer;
        wilco_ec_prepare(msg, rq);
-        mutex_lock(&ec->mailbox_lock);
        ret = wilco_ec_transfer(ec, msg, rq);
        mutex_unlock(&ec->mailbox_lock);
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 3c3cf89f713f..14bac4966c87 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -1801,6 +1801,12 @@ static int hisi_sas_I_T_nexus_reset(struct domain_device *device)
        }
        hisi_sas_dereg_device(hisi_hba, device);
+        if (dev_is_sata(device)) {
+                rc = hisi_sas_softreset_ata_disk(device);
+                if (rc)
+                        return TMF_RESP_FUNC_FAILED;
+        }
        rc = hisi_sas_debug_I_T_nexus_reset(device);
        if ((rc == TMF_RESP_FUNC_COMPLETE) || (rc == -ENODEV))
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 1135e74646e2..8cec5230fe31 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -96,6 +96,7 @@ static int client_reserve = 1;
 static char partition_name[96] = "UNKNOWN";
 static unsigned int partition_number = -1;
 static LIST_HEAD(ibmvscsi_head);
+static DEFINE_SPINLOCK(ibmvscsi_driver_lock);
 static struct scsi_transport_template *ibmvscsi_transport_template;
@@ -2270,7 +2271,9 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id)
        }
        dev_set_drvdata(&vdev->dev, hostdata);
+        spin_lock(&ibmvscsi_driver_lock);
        list_add_tail(&hostdata->host_list, &ibmvscsi_head);
+        spin_unlock(&ibmvscsi_driver_lock);
        return 0;
      add_srp_port_failed:
@@ -2292,15 +2295,27 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id)
 static int ibmvscsi_remove(struct vio_dev *vdev)
 {
        struct ibmvscsi_host_data *hostdata = dev_get_drvdata(&vdev->dev);
-        list_del(&hostdata->host_list);
+        unsigned long flags;
-        unmap_persist_bufs(hostdata);
+        srp_remove_host(hostdata->host);
+        scsi_remove_host(hostdata->host);
+        purge_requests(hostdata, DID_ERROR);
+        spin_lock_irqsave(hostdata->host->host_lock, flags);
        release_event_pool(&hostdata->pool, hostdata);
+        spin_unlock_irqrestore(hostdata->host->host_lock, flags);
        ibmvscsi_release_crq_queue(&hostdata->queue, hostdata,
                                        max_events);
        kthread_stop(hostdata->work_thread);
-        srp_remove_host(hostdata->host);
+        unmap_persist_bufs(hostdata);
-        scsi_remove_host(hostdata->host);
+        spin_lock(&ibmvscsi_driver_lock);
+        list_del(&hostdata->host_list);
+        spin_unlock(&ibmvscsi_driver_lock);
        scsi_host_put(hostdata->host);
        return 0;
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 420045155ba0..0c700b140ce7 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -4991,6 +4991,13 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
                if ((domain & 0xf0) == 0xf0)
                        continue;
+                /* Bypass if not same domain and area of adapter. */
+                if (area && domain && ((area != vha->d_id.b.area) ||
+                    (domain != vha->d_id.b.domain)) &&
+                    (ha->current_topology == ISP_CFG_NL))
+                        continue;
                /* Bypass invalid local loop ID. */
                if (loop_id > LAST_LOCAL_LOOP_ID)
                        continue;
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 677f82fdf56f..91f576d743fe 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1517,7 +1517,7 @@ __qla2xxx_eh_generic_reset(char *name, enum nexus_wait_type type,
                goto eh_reset_failed;
        }
        err = 2;
-        if (do_reset(fcport, cmd->device->lun, blk_mq_rq_cpu(cmd->request) + 1)
+        if (do_reset(fcport, cmd->device->lun, 1)
                != QLA_SUCCESS) {
                ql_log(ql_log_warn, vha, 0x800c,
                    "do_reset failed for cmd=%p.\n", cmd);
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 20189675677a..601b9f1de267 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -585,10 +585,17 @@ static bool scsi_end_request(struct request *req, blk_status_t error,
        if (!blk_rq_is_scsi(req)) {
                WARN_ON_ONCE(!(cmd->flags & SCMD_INITIALIZED));
                cmd->flags &= ~SCMD_INITIALIZED;
-                destroy_rcu_head(&cmd->rcu);
        }
        /*
+         * Calling rcu_barrier() is not necessary here because the
+         * SCSI error handler guarantees that the function called by
+         * call_rcu() has been called before scsi_end_request() is
+         * called.
+         */
+        destroy_rcu_head(&cmd->rcu);
+        /*
         * In the MQ case the command gets freed by __blk_mq_end_request,
         * so we have to do all cleanup that depends on it earlier.
         *
@@ -2541,8 +2548,10 @@ void scsi_device_resume(struct scsi_device *sdev)
         * device deleted during suspend)
         */
        mutex_lock(&sdev->state_mutex);
-        sdev->quiesced_by = NULL;
+        if (sdev->quiesced_by) {
-        blk_clear_pm_only(sdev->request_queue);
+                sdev->quiesced_by = NULL;
+                blk_clear_pm_only(sdev->request_queue);
+        }
        if (sdev->sdev_state == SDEV_QUIESCE)
                scsi_device_set_state(sdev, SDEV_RUNNING);
        mutex_unlock(&sdev->state_mutex);
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 0508831d6fb9..0a82e93566dc 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -2200,6 +2200,8 @@ void iscsi_remove_session(struct iscsi_cls_session *session)
        scsi_target_unblock(&session->dev, SDEV_TRANSPORT_OFFLINE);
        /* flush running scans then delete devices */
        flush_work(&session->scan_work);
+        /* flush running unbind operations */
+        flush_work(&session->unbind_work);
        __iscsi_unbind_session(&session->unbind_work);
        /* hw iscsi may not have removed all connections from session */
diff --git a/drivers/thermal/broadcom/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c
index 720760cd493f..ba39647a690c 100644
--- a/drivers/thermal/broadcom/bcm2835_thermal.c
+++ b/drivers/thermal/broadcom/bcm2835_thermal.c
@@ -119,8 +119,7 @@ static const struct debugfs_reg32 bcm2835_thermal_regs[] = {
 static void bcm2835_thermal_debugfs(struct platform_device *pdev)
 {
-        struct thermal_zone_device *tz = platform_get_drvdata(pdev);
+        struct bcm2835_thermal_data *data = platform_get_drvdata(pdev);
-        struct bcm2835_thermal_data *data = tz->devdata;
        struct debugfs_regset32 *regset;
        data->debugfsdir = debugfs_create_dir("bcm2835_thermal", NULL);
@@ -266,7 +265,7 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
        data->tz = tz;
-        platform_set_drvdata(pdev, tz);
+        platform_set_drvdata(pdev, data);
        /*
         * Thermal_zone doesn't enable hwmon as default,
@@ -290,8 +289,8 @@ err_clk:
 static int bcm2835_thermal_remove(struct platform_device *pdev)
 {
-        struct thermal_zone_device *tz = platform_get_drvdata(pdev);
+        struct bcm2835_thermal_data *data = platform_get_drvdata(pdev);
-        struct bcm2835_thermal_data *data = tz->devdata;
+        struct thermal_zone_device *tz = data->tz;
        debugfs_remove_recursive(data->debugfsdir);
        thermal_zone_of_sensor_unregister(&pdev->dev, tz);
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index 6fff16113628..f7c1f49ec87f 100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -536,12 +536,11 @@ static int cpufreq_power2state(struct thermal_cooling_device *cdev,
                               struct thermal_zone_device *tz, u32 power,
                               unsigned long *state)
 {
-        unsigned int cur_freq, target_freq;
+        unsigned int target_freq;
        u32 last_load, normalised_power;
        struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata;
        struct cpufreq_policy *policy = cpufreq_cdev->policy;
-        cur_freq = cpufreq_quick_get(policy->cpu);
        power = power > 0 ? power : 0;
        last_load = cpufreq_cdev->last_load ?: 1;
        normalised_power = (power * 100) / last_load;
diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
index 61ca7ce3624e..5f3ed24e26ec 100644
--- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
@@ -22,6 +22,13 @@ enum int3400_thermal_uuid {
        INT3400_THERMAL_PASSIVE_1,
        INT3400_THERMAL_ACTIVE,
        INT3400_THERMAL_CRITICAL,
+        INT3400_THERMAL_ADAPTIVE_PERFORMANCE,
+        INT3400_THERMAL_EMERGENCY_CALL_MODE,
+        INT3400_THERMAL_PASSIVE_2,
+        INT3400_THERMAL_POWER_BOSS,
+        INT3400_THERMAL_VIRTUAL_SENSOR,
+        INT3400_THERMAL_COOLING_MODE,
+        INT3400_THERMAL_HARDWARE_DUTY_CYCLING,
        INT3400_THERMAL_MAXIMUM_UUID,
 };
@@ -29,6 +36,13 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = {
        "42A441D6-AE6A-462b-A84B-4A8CE79027D3",
        "3A95C389-E4B8-4629-A526-C52C88626BAE",
        "97C68AE7-15FA-499c-B8C9-5DA81D606E0A",
+        "63BE270F-1C11-48FD-A6F7-3AF253FF3E2D",
+        "5349962F-71E6-431D-9AE8-0A635B710AEE",
+        "9E04115A-AE87-4D1C-9500-0F3E340BFE75",
+        "F5A35014-C209-46A4-993A-EB56DE7530A1",
+        "6ED722A7-9240-48A5-B479-31EEF723D7CF",
+        "16CAF1B7-DD38-40ED-B1C1-1B8A1913D531",
+        "BE84BABF-C4D4-403D-B495-3128FD44dAC1",
 };
 struct int3400_thermal_priv {
@@ -299,10 +313,9 @@ static int int3400_thermal_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, priv);
-        if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
+        int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
-                int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
+        int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
-                int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
-        }
        priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
                                                priv, &int3400_thermal_ops,
                                                &int3400_thermal_params, 0, 0);
diff --git a/drivers/thermal/intel/intel_powerclamp.c b/drivers/thermal/intel/intel_powerclamp.c
index 7571f7c2e7c9..ac7256b5f020 100644
--- a/drivers/thermal/intel/intel_powerclamp.c
+++ b/drivers/thermal/intel/intel_powerclamp.c
@@ -101,7 +101,7 @@ struct powerclamp_worker_data {
        bool clamping;
 };
-static struct powerclamp_worker_data * __percpu worker_data;
+static struct powerclamp_worker_data __percpu *worker_data;
 static struct thermal_cooling_device *cooling_dev;
 static unsigned long *cpu_clamping_mask;  /* bit map for tracking per cpu
                                           * clamping kthread worker
@@ -494,7 +494,7 @@ static void start_power_clamp_worker(unsigned long cpu)
        struct powerclamp_worker_data *w_data = per_cpu_ptr(worker_data, cpu);
        struct kthread_worker *worker;
-        worker = kthread_create_worker_on_cpu(cpu, 0, "kidle_inject/%ld", cpu);
+        worker = kthread_create_worker_on_cpu(cpu, 0, "kidle_inj/%ld", cpu);
        if (IS_ERR(worker))
                return;
diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
index 5c07a61447d3..e4ea7f6aef20 100644
--- a/drivers/thermal/mtk_thermal.c
+++ b/drivers/thermal/mtk_thermal.c
@@ -199,6 +199,9 @@ enum {
 #define MT7622_TS1      0
 #define MT7622_NUM_CONTROLLER           1
+/* The maximum number of banks */
+#define MAX_NUM_ZONES           8
 /* The calibration coefficient of sensor  */
 #define MT7622_CALIBRATION      165
@@ -249,7 +252,7 @@ struct mtk_thermal_data {
        const int num_controller;
        const int *controller_offset;
        bool need_switch_bank;
-        struct thermal_bank_cfg bank_data[];
+        struct thermal_bank_cfg bank_data[MAX_NUM_ZONES];
 };
 struct mtk_thermal {
@@ -268,7 +271,7 @@ struct mtk_thermal {
        s32 vts[MAX_NUM_VTS];
        const struct mtk_thermal_data *conf;
-        struct mtk_thermal_bank banks[];
+        struct mtk_thermal_bank banks[MAX_NUM_ZONES];
 };
 /* MT8183 thermal sensor data */
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 48eef552cba4..fc9399d9c082 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -666,7 +666,7 @@ static int exynos_get_temp(void *p, int *temp)
        struct exynos_tmu_data *data = p;
        int value, ret = 0;
-        if (!data || !data->tmu_read || !data->enabled)
+        if (!data || !data->tmu_read)
                return -EINVAL;
        else if (!data->enabled)
                /*
diff --git a/fs/block_dev.c b/fs/block_dev.c
index e9faa52bb489..78d3257435c0 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -336,12 +336,14 @@ static void blkdev_bio_end_io(struct bio *bio)
        if (should_dirty) {
                bio_check_pages_dirty(bio);
        } else {
-                struct bio_vec *bvec;
+                if (!bio_flagged(bio, BIO_NO_PAGE_REF)) {
-                int i;
+                        struct bvec_iter_all iter_all;
-                struct bvec_iter_all iter_all;
+                        struct bio_vec *bvec;
+                        int i;
-                bio_for_each_segment_all(bvec, bio, i, iter_all)
+                        bio_for_each_segment_all(bvec, bio, i, iter_all)
-                        put_page(bvec->bv_page);
+                                put_page(bvec->bv_page);
+                }
                bio_put(bio);
        }
 }
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 217276b8b942..f9b71c12cc9f 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -1008,7 +1008,7 @@ static loff_t cifs_remap_file_range(struct file *src_file, loff_t off,
        unsigned int xid;
        int rc;
-        if (remap_flags & ~REMAP_FILE_ADVISORY)
+        if (remap_flags & ~(REMAP_FILE_DEDUP | REMAP_FILE_ADVISORY))
                return -EINVAL;
        cifs_dbg(FYI, "clone range\n");
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index 142164ef1f05..5c0298b9998f 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -150,5 +150,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);
 extern const struct export_operations cifs_export_ops;
 #endif /* CONFIG_CIFS_NFSD_EXPORT */
-#define CIFS_VERSION   "2.18"
+#define CIFS_VERSION   "2.19"
 #endif                          /* _CIFSFS_H */
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 2a6d20c0ce02..89006e044973 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2632,43 +2632,56 @@ cifs_resend_wdata(struct cifs_writedata *wdata, struct list_head *wdata_list,
        struct TCP_Server_Info *server =
                tlink_tcon(wdata->cfile->tlink)->ses->server;
-        /*
-         * Wait for credits to resend this wdata.
-         * Note: we are attempting to resend the whole wdata not in segments
-         */
        do {
-                rc = server->ops->wait_mtu_credits(server, wdata->bytes, &wsize,
+                if (wdata->cfile->invalidHandle) {
-                                                   &credits);
+                        rc = cifs_reopen_file(wdata->cfile, false);
+                        if (rc == -EAGAIN)
+                                continue;
+                        else if (rc)
+                                break;
+                }
-                if (rc)
-                        goto out;
-                if (wsize < wdata->bytes) {
+                /*
-                        add_credits_and_wake_if(server, &credits, 0);
+                 * Wait for credits to resend this wdata.
-                        msleep(1000);
+                 * Note: we are attempting to resend the whole wdata not in
-                }
+                 * segments
-        } while (wsize < wdata->bytes);
+                 */
+                do {
+                        rc = server->ops->wait_mtu_credits(server, wdata->bytes,
+                                                &wsize, &credits);
+                        if (rc)
+                                goto fail;
+                        if (wsize < wdata->bytes) {
+                                add_credits_and_wake_if(server, &credits, 0);
+                                msleep(1000);
+                        }
+                } while (wsize < wdata->bytes);
+                wdata->credits = credits;
-        wdata->credits = credits;
+                rc = adjust_credits(server, &wdata->credits, wdata->bytes);
-        rc = -EAGAIN;
-        while (rc == -EAGAIN) {
+                if (!rc) {
-                rc = 0;
+                        if (wdata->cfile->invalidHandle)
-                if (wdata->cfile->invalidHandle)
+                                rc = -EAGAIN;
-                        rc = cifs_reopen_file(wdata->cfile, false);
+                        else
-                if (!rc)
+                                rc = server->ops->async_writev(wdata,
-                        rc = server->ops->async_writev(wdata,
                                        cifs_uncached_writedata_release);
-        }
+                }
-        if (!rc) {
+                /* If the write was successfully sent, we are done */
-                list_add_tail(&wdata->list, wdata_list);
+                if (!rc) {
-                return 0;
+                        list_add_tail(&wdata->list, wdata_list);
-        }
+                        return 0;
+                }
-        add_credits_and_wake_if(server, &wdata->credits, 0);
+                /* Roll back credits and retry if needed */
-out:
+                add_credits_and_wake_if(server, &wdata->credits, 0);
-        kref_put(&wdata->refcount, cifs_uncached_writedata_release);
+        } while (rc == -EAGAIN);
+fail:
+        kref_put(&wdata->refcount, cifs_uncached_writedata_release);
        return rc;
 }
@@ -2896,12 +2909,12 @@ restart_loop:
                                                wdata->bytes, &tmp_from,
                                                ctx->cfile, cifs_sb, &tmp_list,
                                                ctx);
+                                        kref_put(&wdata->refcount,
+                                                cifs_uncached_writedata_release);
                                }
                                list_splice(&tmp_list, &ctx->list);
-                                kref_put(&wdata->refcount,
-                                         cifs_uncached_writedata_release);
                                goto restart_loop;
                        }
                }
@@ -3348,44 +3361,55 @@ static int cifs_resend_rdata(struct cifs_readdata *rdata,
        struct TCP_Server_Info *server =
                tlink_tcon(rdata->cfile->tlink)->ses->server;
-        /*
-         * Wait for credits to resend this rdata.
-         * Note: we are attempting to resend the whole rdata not in segments
-         */
        do {
-                rc = server->ops->wait_mtu_credits(server, rdata->bytes,
+                if (rdata->cfile->invalidHandle) {
+                        rc = cifs_reopen_file(rdata->cfile, true);
+                        if (rc == -EAGAIN)
+                                continue;
+                        else if (rc)
+                                break;
+                }
+                /*
+                 * Wait for credits to resend this rdata.
+                 * Note: we are attempting to resend the whole rdata not in
+                 * segments
+                 */
+                do {
+                        rc = server->ops->wait_mtu_credits(server, rdata->bytes,
                                                &rsize, &credits);
-                if (rc)
+                        if (rc)
-                        goto out;
+                                goto fail;
-                if (rsize < rdata->bytes) {
+                        if (rsize < rdata->bytes) {
-                        add_credits_and_wake_if(server, &credits, 0);
+                                add_credits_and_wake_if(server, &credits, 0);
-                        msleep(1000);
+                                msleep(1000);
-                }
+                        }
-        } while (rsize < rdata->bytes);
+                } while (rsize < rdata->bytes);
+                rdata->credits = credits;
-        rdata->credits = credits;
+                rc = adjust_credits(server, &rdata->credits, rdata->bytes);
-        rc = -EAGAIN;
+                if (!rc) {
-        while (rc == -EAGAIN) {
+                        if (rdata->cfile->invalidHandle)
-                rc = 0;
+                                rc = -EAGAIN;
-                if (rdata->cfile->invalidHandle)
+                        else
-                        rc = cifs_reopen_file(rdata->cfile, true);
+                                rc = server->ops->async_readv(rdata);
-                if (!rc)
+                }
-                        rc = server->ops->async_readv(rdata);
-        }
-        if (!rc) {
+                /* If the read was successfully sent, we are done */
-                /* Add to aio pending list */
+                if (!rc) {
-                list_add_tail(&rdata->list, rdata_list);
+                        /* Add to aio pending list */
-                return 0;
+                        list_add_tail(&rdata->list, rdata_list);
-        }
+                        return 0;
+                }
-        add_credits_and_wake_if(server, &rdata->credits, 0);
+                /* Roll back credits and retry if needed */
-out:
+                add_credits_and_wake_if(server, &rdata->credits, 0);
-        kref_put(&rdata->refcount,
+        } while (rc == -EAGAIN);
-                cifs_uncached_readdata_release);
+fail:
+        kref_put(&rdata->refcount, cifs_uncached_readdata_release);
        return rc;
 }
diff --git a/fs/cifs/smb2maperror.c b/fs/cifs/smb2maperror.c
index 924269cec135..e32c264e3adb 100644
--- a/fs/cifs/smb2maperror.c
+++ b/fs/cifs/smb2maperror.c
@@ -1036,7 +1036,8 @@ static const struct status_to_posix_error smb2_error_map_table[] = {
        {STATUS_UNFINISHED_CONTEXT_DELETED, -EIO,
        "STATUS_UNFINISHED_CONTEXT_DELETED"},
        {STATUS_NO_TGT_REPLY, -EIO, "STATUS_NO_TGT_REPLY"},
-        {STATUS_OBJECTID_NOT_FOUND, -EIO, "STATUS_OBJECTID_NOT_FOUND"},
+        /* Note that ENOATTTR and ENODATA are the same errno */
+        {STATUS_OBJECTID_NOT_FOUND, -ENODATA, "STATUS_OBJECTID_NOT_FOUND"},
        {STATUS_NO_IP_ADDRESSES, -EIO, "STATUS_NO_IP_ADDRESSES"},
        {STATUS_WRONG_CREDENTIAL_HANDLE, -EIO,
        "STATUS_WRONG_CREDENTIAL_HANDLE"},
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index c399e09b76e6..21ac19ff19cb 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -1628,9 +1628,16 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree,
        iov[1].iov_base = unc_path;
        iov[1].iov_len = unc_path_len;
-        /* 3.11 tcon req must be signed if not encrypted. See MS-SMB2 3.2.4.1.1 */
+        /*
+         * 3.11 tcon req must be signed if not encrypted. See MS-SMB2 3.2.4.1.1
+         * unless it is guest or anonymous user. See MS-SMB2 3.2.5.3.1
+         * (Samba servers don't always set the flag so also check if null user)
+         */
        if ((ses->server->dialect == SMB311_PROT_ID) &&
-            !smb3_encryption_required(tcon))
+            !smb3_encryption_required(tcon) &&
+            !(ses->session_flags &
+                    (SMB2_SESSION_FLAG_IS_GUEST|SMB2_SESSION_FLAG_IS_NULL)) &&
+            ((ses->user_name != NULL) || (ses->sectype == Kerberos)))
                req->sync_hdr.Flags |= SMB2_FLAGS_SIGNED;
        memset(&rqst, 0, sizeof(struct smb_rqst));
diff --git a/fs/cifs/trace.h b/fs/cifs/trace.h
index fa226de48ef3..99c4d799c24b 100644
--- a/fs/cifs/trace.h
+++ b/fs/cifs/trace.h
@@ -549,19 +549,19 @@ DECLARE_EVENT_CLASS(smb3_tcon_class,
                __field(unsigned int, xid)
                __field(__u32, tid)
                __field(__u64, sesid)
-                __field(const char *,  unc_name)
+                __string(name, unc_name)
                __field(int, rc)
        ),
        TP_fast_assign(
                __entry->xid = xid;
                __entry->tid = tid;
                __entry->sesid = sesid;
-                __entry->unc_name = unc_name;
+                __assign_str(name, unc_name);
                __entry->rc = rc;
        ),
        TP_printk("xid=%u sid=0x%llx tid=0x%x unc_name=%s rc=%d",
                __entry->xid, __entry->sesid, __entry->tid,
-                __entry->unc_name, __entry->rc)
+                __get_str(name), __entry->rc)
 )
 #define DEFINE_SMB3_TCON_EVENT(name)          \
diff --git a/fs/io_uring.c b/fs/io_uring.c
index c88088d92613..6aaa30580a2b 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -189,17 +189,28 @@ struct sqe_submit {
        bool                            needs_fixed_file;
 };
+/*
+ * First field must be the file pointer in all the
+ * iocb unions! See also 'struct kiocb' in <linux/fs.h>
+ */
 struct io_poll_iocb {
        struct file                     *file;
        struct wait_queue_head          *head;
        __poll_t                        events;
-        bool                            woken;
+        bool                            done;
        bool                            canceled;
        struct wait_queue_entry         wait;
 };
+/*
+ * NOTE! Each of the iocb union members has the file pointer
+ * as the first entry in their struct definition. So you can
+ * access the file pointer through any of the sub-structs,
+ * or directly as just 'ki_filp' in this struct.
+ */
 struct io_kiocb {
        union {
+                struct file             *file;
                struct kiocb            rw;
                struct io_poll_iocb     poll;
        };
@@ -214,6 +225,7 @@ struct io_kiocb {
 #define REQ_F_IOPOLL_COMPLETED  2       /* polled IO has completed */
 #define REQ_F_FIXED_FILE        4       /* ctx owns file */
 #define REQ_F_SEQ_PREV          8       /* sequential with previous */
+#define REQ_F_PREPPED           16      /* prep already done */
        u64                     user_data;
        u64                     error;
@@ -355,20 +367,25 @@ static void io_cqring_fill_event(struct io_ring_ctx *ctx, u64 ki_user_data,
        }
 }
-static void io_cqring_add_event(struct io_ring_ctx *ctx, u64 ki_user_data,
+static void io_cqring_ev_posted(struct io_ring_ctx *ctx)
+{
+        if (waitqueue_active(&ctx->wait))
+                wake_up(&ctx->wait);
+        if (waitqueue_active(&ctx->sqo_wait))
+                wake_up(&ctx->sqo_wait);
+}
+static void io_cqring_add_event(struct io_ring_ctx *ctx, u64 user_data,
                                long res, unsigned ev_flags)
 {
        unsigned long flags;
        spin_lock_irqsave(&ctx->completion_lock, flags);
-        io_cqring_fill_event(ctx, ki_user_data, res, ev_flags);
+        io_cqring_fill_event(ctx, user_data, res, ev_flags);
        io_commit_cqring(ctx);
        spin_unlock_irqrestore(&ctx->completion_lock, flags);
-        if (waitqueue_active(&ctx->wait))
+        io_cqring_ev_posted(ctx);
-                wake_up(&ctx->wait);
-        if (waitqueue_active(&ctx->sqo_wait))
-                wake_up(&ctx->sqo_wait);
 }
 static void io_ring_drop_ctx_refs(struct io_ring_ctx *ctx, unsigned refs)
@@ -382,13 +399,14 @@ static void io_ring_drop_ctx_refs(struct io_ring_ctx *ctx, unsigned refs)
 static struct io_kiocb *io_get_req(struct io_ring_ctx *ctx,
                                   struct io_submit_state *state)
 {
+        gfp_t gfp = GFP_KERNEL | __GFP_NOWARN;
        struct io_kiocb *req;
        if (!percpu_ref_tryget(&ctx->refs))
                return NULL;
        if (!state) {
-                req = kmem_cache_alloc(req_cachep, __GFP_NOWARN);
+                req = kmem_cache_alloc(req_cachep, gfp);
                if (unlikely(!req))
                        goto out;
        } else if (!state->free_reqs) {
@@ -396,10 +414,18 @@ static struct io_kiocb *io_get_req(struct io_ring_ctx *ctx,
                int ret;
                sz = min_t(size_t, state->ios_left, ARRAY_SIZE(state->reqs));
-                ret = kmem_cache_alloc_bulk(req_cachep, __GFP_NOWARN, sz,
+                ret = kmem_cache_alloc_bulk(req_cachep, gfp, sz, state->reqs);
-                                                state->reqs);
-                if (unlikely(ret <= 0))
+                /*
-                        goto out;
+                 * Bulk alloc is all-or-nothing. If we fail to get a batch,
+                 * retry single alloc to be on the safe side.
+                 */
+                if (unlikely(ret <= 0)) {
+                        state->reqs[0] = kmem_cache_alloc(req_cachep, gfp);
+                        if (!state->reqs[0])
+                                goto out;
+                        ret = 1;
+                }
                state->free_reqs = ret - 1;
                state->cur_req = 1;
                req = state->reqs[0];
@@ -411,7 +437,8 @@ static struct io_kiocb *io_get_req(struct io_ring_ctx *ctx,
        req->ctx = ctx;
        req->flags = 0;
-        refcount_set(&req->refs, 0);
+        /* one is dropped after submission, the other at completion */
+        refcount_set(&req->refs, 2);
        return req;
 out:
        io_ring_drop_ctx_refs(ctx, 1);
@@ -429,10 +456,16 @@ static void io_free_req_many(struct io_ring_ctx *ctx, void **reqs, int *nr)
 static void io_free_req(struct io_kiocb *req)
 {
-        if (!refcount_read(&req->refs) || refcount_dec_and_test(&req->refs)) {
+        if (req->file && !(req->flags & REQ_F_FIXED_FILE))
-                io_ring_drop_ctx_refs(req->ctx, 1);
+                fput(req->file);
-                kmem_cache_free(req_cachep, req);
+        io_ring_drop_ctx_refs(req->ctx, 1);
-        }
+        kmem_cache_free(req_cachep, req);
+}
+static void io_put_req(struct io_kiocb *req)
+{
+        if (refcount_dec_and_test(&req->refs))
+                io_free_req(req);
 }
 /*
@@ -442,44 +475,34 @@ static void io_iopoll_complete(struct io_ring_ctx *ctx, unsigned int *nr_events,
                               struct list_head *done)
 {
        void *reqs[IO_IOPOLL_BATCH];
-        int file_count, to_free;
-        struct file *file = NULL;
        struct io_kiocb *req;
+        int to_free;
-        file_count = to_free = 0;
+        to_free = 0;
        while (!list_empty(done)) {
                req = list_first_entry(done, struct io_kiocb, list);
                list_del(&req->list);
                io_cqring_fill_event(ctx, req->user_data, req->error, 0);
-                reqs[to_free++] = req;
                (*nr_events)++;
-                /*
+                if (refcount_dec_and_test(&req->refs)) {
-                 * Batched puts of the same file, to avoid dirtying the
+                        /* If we're not using fixed files, we have to pair the
-                 * file usage count multiple times, if avoidable.
+                         * completion part with the file put. Use regular
-                 */
+                         * completions for those, only batch free for fixed
-                if (!(req->flags & REQ_F_FIXED_FILE)) {
+                         * file.
-                        if (!file) {
+                         */
-                                file = req->rw.ki_filp;
+                        if (req->flags & REQ_F_FIXED_FILE) {
-                                file_count = 1;
+                                reqs[to_free++] = req;
-                        } else if (file == req->rw.ki_filp) {
+                                if (to_free == ARRAY_SIZE(reqs))
-                                file_count++;
+                                        io_free_req_many(ctx, reqs, &to_free);
                        } else {
-                                fput_many(file, file_count);
+                                io_free_req(req);
-                                file = req->rw.ki_filp;
-                                file_count = 1;
                        }
                }
-                if (to_free == ARRAY_SIZE(reqs))
-                        io_free_req_many(ctx, reqs, &to_free);
        }
-        io_commit_cqring(ctx);
-        if (file)
+        io_commit_cqring(ctx);
-                fput_many(file, file_count);
        io_free_req_many(ctx, reqs, &to_free);
 }
@@ -602,21 +625,14 @@ static void kiocb_end_write(struct kiocb *kiocb)
        }
 }
-static void io_fput(struct io_kiocb *req)
-{
-        if (!(req->flags & REQ_F_FIXED_FILE))
-                fput(req->rw.ki_filp);
-}
 static void io_complete_rw(struct kiocb *kiocb, long res, long res2)
 {
        struct io_kiocb *req = container_of(kiocb, struct io_kiocb, rw);
        kiocb_end_write(kiocb);
-        io_fput(req);
        io_cqring_add_event(req->ctx, req->user_data, res, 0);
-        io_free_req(req);
+        io_put_req(req);
 }
 static void io_complete_rw_iopoll(struct kiocb *kiocb, long res, long res2)
@@ -731,31 +747,18 @@ static int io_prep_rw(struct io_kiocb *req, const struct sqe_submit *s,
        const struct io_uring_sqe *sqe = s->sqe;
        struct io_ring_ctx *ctx = req->ctx;
        struct kiocb *kiocb = &req->rw;
-        unsigned ioprio, flags;
+        unsigned ioprio;
-        int fd, ret;
+        int ret;
+        if (!req->file)
+                return -EBADF;
        /* For -EAGAIN retry, everything is already prepped */
-        if (kiocb->ki_filp)
+        if (req->flags & REQ_F_PREPPED)
                return 0;
-        flags = READ_ONCE(sqe->flags);
+        if (force_nonblock && !io_file_supports_async(req->file))
-        fd = READ_ONCE(sqe->fd);
+                force_nonblock = false;
-        if (flags & IOSQE_FIXED_FILE) {
-                if (unlikely(!ctx->user_files ||
-                    (unsigned) fd >= ctx->nr_user_files))
-                        return -EBADF;
-                kiocb->ki_filp = ctx->user_files[fd];
-                req->flags |= REQ_F_FIXED_FILE;
-        } else {
-                if (s->needs_fixed_file)
-                        return -EBADF;
-                kiocb->ki_filp = io_file_get(state, fd);
-                if (unlikely(!kiocb->ki_filp))
-                        return -EBADF;
-                if (force_nonblock && !io_file_supports_async(kiocb->ki_filp))
-                        force_nonblock = false;
-        }
        kiocb->ki_pos = READ_ONCE(sqe->off);
        kiocb->ki_flags = iocb_flags(kiocb->ki_filp);
        kiocb->ki_hint = ki_hint_validate(file_write_hint(kiocb->ki_filp));
@@ -764,7 +767,7 @@ static int io_prep_rw(struct io_kiocb *req, const struct sqe_submit *s,
        if (ioprio) {
                ret = ioprio_check_cap(ioprio);
                if (ret)
-                        goto out_fput;
+                        return ret;
                kiocb->ki_ioprio = ioprio;
        } else
@@ -772,38 +775,26 @@ static int io_prep_rw(struct io_kiocb *req, const struct sqe_submit *s,
        ret = kiocb_set_rw_flags(kiocb, READ_ONCE(sqe->rw_flags));
        if (unlikely(ret))
-                goto out_fput;
+                return ret;
        if (force_nonblock) {
                kiocb->ki_flags |= IOCB_NOWAIT;
                req->flags |= REQ_F_FORCE_NONBLOCK;
        }
        if (ctx->flags & IORING_SETUP_IOPOLL) {
-                ret = -EOPNOTSUPP;
                if (!(kiocb->ki_flags & IOCB_DIRECT) ||
                    !kiocb->ki_filp->f_op->iopoll)
-                        goto out_fput;
+                        return -EOPNOTSUPP;
                req->error = 0;
                kiocb->ki_flags |= IOCB_HIPRI;
                kiocb->ki_complete = io_complete_rw_iopoll;
        } else {
-                if (kiocb->ki_flags & IOCB_HIPRI) {
+                if (kiocb->ki_flags & IOCB_HIPRI)
-                        ret = -EINVAL;
+                        return -EINVAL;
-                        goto out_fput;
-                }
                kiocb->ki_complete = io_complete_rw;
        }
+        req->flags |= REQ_F_PREPPED;
        return 0;
-out_fput:
-        if (!(flags & IOSQE_FIXED_FILE)) {
-                /*
-                 * in case of error, we didn't use this file reference. drop it.
-                 */
-                if (state)
-                        state->used_refs--;
-                io_file_put(state, kiocb->ki_filp);
-        }
-        return ret;
 }
 static inline void io_rw_done(struct kiocb *kiocb, ssize_t ret)
@@ -864,6 +855,9 @@ static int io_import_fixed(struct io_ring_ctx *ctx, int rw,
        iov_iter_bvec(iter, rw, imu->bvec, imu->nr_bvecs, offset + len);
        if (offset)
                iov_iter_advance(iter, offset);
+        /* don't drop a reference to these pages */
+        iter->type |= ITER_BVEC_FLAG_NO_REF;
        return 0;
 }
@@ -887,7 +881,7 @@ static int io_import_iovec(struct io_ring_ctx *ctx, int rw,
        opcode = READ_ONCE(sqe->opcode);
        if (opcode == IORING_OP_READ_FIXED ||
            opcode == IORING_OP_WRITE_FIXED) {
-                ssize_t ret = io_import_fixed(ctx, rw, sqe, iter);
+                int ret = io_import_fixed(ctx, rw, sqe, iter);
                *iovec = NULL;
                return ret;
        }
@@ -945,31 +939,29 @@ static void io_async_list_note(int rw, struct io_kiocb *req, size_t len)
        async_list->io_end = io_end;
 }
-static ssize_t io_read(struct io_kiocb *req, const struct sqe_submit *s,
+static int io_read(struct io_kiocb *req, const struct sqe_submit *s,
-                       bool force_nonblock, struct io_submit_state *state)
+                   bool force_nonblock, struct io_submit_state *state)
 {
        struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs;
        struct kiocb *kiocb = &req->rw;
        struct iov_iter iter;
        struct file *file;
        size_t iov_count;
-        ssize_t ret;
+        int ret;
        ret = io_prep_rw(req, s, force_nonblock, state);
        if (ret)
                return ret;
        file = kiocb->ki_filp;
-        ret = -EBADF;
        if (unlikely(!(file->f_mode & FMODE_READ)))
-                goto out_fput;
+                return -EBADF;
-        ret = -EINVAL;
        if (unlikely(!file->f_op->read_iter))
-                goto out_fput;
+                return -EINVAL;
        ret = io_import_iovec(req->ctx, READ, s, &iovec, &iter);
        if (ret)
-                goto out_fput;
+                return ret;
        iov_count = iov_iter_count(&iter);
        ret = rw_verify_area(READ, file, &kiocb->ki_pos, iov_count);
@@ -991,38 +983,32 @@ static ssize_t io_read(struct io_kiocb *req, const struct sqe_submit *s,
                }
        }
        kfree(iovec);
-out_fput:
-        /* Hold on to the file for -EAGAIN */
-        if (unlikely(ret && ret != -EAGAIN))
-                io_fput(req);
        return ret;
 }
-static ssize_t io_write(struct io_kiocb *req, const struct sqe_submit *s,
+static int io_write(struct io_kiocb *req, const struct sqe_submit *s,
-                        bool force_nonblock, struct io_submit_state *state)
+                    bool force_nonblock, struct io_submit_state *state)
 {
        struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs;
        struct kiocb *kiocb = &req->rw;
        struct iov_iter iter;
        struct file *file;
        size_t iov_count;
-        ssize_t ret;
+        int ret;
        ret = io_prep_rw(req, s, force_nonblock, state);
        if (ret)
                return ret;
-        ret = -EBADF;
        file = kiocb->ki_filp;
        if (unlikely(!(file->f_mode & FMODE_WRITE)))
-                goto out_fput;
+                return -EBADF;
-        ret = -EINVAL;
        if (unlikely(!file->f_op->write_iter))
-                goto out_fput;
+                return -EINVAL;
        ret = io_import_iovec(req->ctx, WRITE, s, &iovec, &iter);
        if (ret)
-                goto out_fput;
+                return ret;
        iov_count = iov_iter_count(&iter);
@@ -1054,10 +1040,6 @@ static ssize_t io_write(struct io_kiocb *req, const struct sqe_submit *s,
        }
 out_free:
        kfree(iovec);
-out_fput:
-        /* Hold on to the file for -EAGAIN */
-        if (unlikely(ret && ret != -EAGAIN))
-                io_fput(req);
        return ret;
 }
@@ -1072,29 +1054,19 @@ static int io_nop(struct io_kiocb *req, u64 user_data)
        if (unlikely(ctx->flags & IORING_SETUP_IOPOLL))
                return -EINVAL;
-        /*
-         * Twilight zone - it's possible that someone issued an opcode that
-         * has a file attached, then got -EAGAIN on submission, and changed
-         * the sqe before we retried it from async context. Avoid dropping
-         * a file reference for this malicious case, and flag the error.
-         */
-        if (req->rw.ki_filp) {
-                err = -EBADF;
-                io_fput(req);
-        }
        io_cqring_add_event(ctx, user_data, err, 0);
-        io_free_req(req);
+        io_put_req(req);
        return 0;
 }
 static int io_prep_fsync(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 {
        struct io_ring_ctx *ctx = req->ctx;
-        unsigned flags;
-        int fd;
-        /* Prep already done */
+        if (!req->file)
-        if (req->rw.ki_filp)
+                return -EBADF;
+        /* Prep already done (EAGAIN retry) */
+        if (req->flags & REQ_F_PREPPED)
                return 0;
        if (unlikely(ctx->flags & IORING_SETUP_IOPOLL))
@@ -1102,20 +1074,7 @@ static int io_prep_fsync(struct io_kiocb *req, const struct io_uring_sqe *sqe)
        if (unlikely(sqe->addr || sqe->ioprio || sqe->buf_index))
                return -EINVAL;
-        fd = READ_ONCE(sqe->fd);
+        req->flags |= REQ_F_PREPPED;
-        flags = READ_ONCE(sqe->flags);
-        if (flags & IOSQE_FIXED_FILE) {
-                if (unlikely(!ctx->user_files || fd >= ctx->nr_user_files))
-                        return -EBADF;
-                req->rw.ki_filp = ctx->user_files[fd];
-                req->flags |= REQ_F_FIXED_FILE;
-        } else {
-                req->rw.ki_filp = fget(fd);
-                if (unlikely(!req->rw.ki_filp))
-                        return -EBADF;
-        }
        return 0;
 }
@@ -1144,9 +1103,8 @@ static int io_fsync(struct io_kiocb *req, const struct io_uring_sqe *sqe,
                                end > 0 ? end : LLONG_MAX,
                                fsync_flags & IORING_FSYNC_DATASYNC);
-        io_fput(req);
        io_cqring_add_event(req->ctx, sqe->user_data, ret, 0);
-        io_free_req(req);
+        io_put_req(req);
        return 0;
 }
@@ -1204,15 +1162,16 @@ static int io_poll_remove(struct io_kiocb *req, const struct io_uring_sqe *sqe)
        spin_unlock_irq(&ctx->completion_lock);
        io_cqring_add_event(req->ctx, sqe->user_data, ret, 0);
-        io_free_req(req);
+        io_put_req(req);
        return 0;
 }
-static void io_poll_complete(struct io_kiocb *req, __poll_t mask)
+static void io_poll_complete(struct io_ring_ctx *ctx, struct io_kiocb *req,
+                             __poll_t mask)
 {
-        io_cqring_add_event(req->ctx, req->user_data, mangle_poll(mask), 0);
+        req->poll.done = true;
-        io_fput(req);
+        io_cqring_fill_event(ctx, req->user_data, mangle_poll(mask), 0);
-        io_free_req(req);
+        io_commit_cqring(ctx);
 }
 static void io_poll_complete_work(struct work_struct *work)
@@ -1240,9 +1199,11 @@ static void io_poll_complete_work(struct work_struct *work)
                return;
        }
        list_del_init(&req->list);
+        io_poll_complete(ctx, req, mask);
        spin_unlock_irq(&ctx->completion_lock);
-        io_poll_complete(req, mask);
+        io_cqring_ev_posted(ctx);
+        io_put_req(req);
 }
 static int io_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync,
@@ -1253,29 +1214,25 @@ static int io_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync,
        struct io_kiocb *req = container_of(poll, struct io_kiocb, poll);
        struct io_ring_ctx *ctx = req->ctx;
        __poll_t mask = key_to_poll(key);
+        unsigned long flags;
-        poll->woken = true;
        /* for instances that support it check for an event match first: */
-        if (mask) {
+        if (mask && !(mask & poll->events))
-                unsigned long flags;
+                return 0;
-                if (!(mask & poll->events))
+        list_del_init(&poll->wait.entry);
-                        return 0;
-                /* try to complete the iocb inline if we can: */
+        if (mask && spin_trylock_irqsave(&ctx->completion_lock, flags)) {
-                if (spin_trylock_irqsave(&ctx->completion_lock, flags)) {
+                list_del(&req->list);
-                        list_del(&req->list);
+                io_poll_complete(ctx, req, mask);
-                        spin_unlock_irqrestore(&ctx->completion_lock, flags);
+                spin_unlock_irqrestore(&ctx->completion_lock, flags);
-                        list_del_init(&poll->wait.entry);
+                io_cqring_ev_posted(ctx);
-                        io_poll_complete(req, mask);
+                io_put_req(req);
-                        return 1;
+        } else {
-                }
+                queue_work(ctx->sqo_wq, &req->work);
        }
-        list_del_init(&poll->wait.entry);
-        queue_work(ctx->sqo_wq, &req->work);
        return 1;
 }
@@ -1305,36 +1262,23 @@ static int io_poll_add(struct io_kiocb *req, const struct io_uring_sqe *sqe)
        struct io_poll_iocb *poll = &req->poll;
        struct io_ring_ctx *ctx = req->ctx;
        struct io_poll_table ipt;
-        unsigned flags;
+        bool cancel = false;
        __poll_t mask;
        u16 events;
-        int fd;
        if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))
                return -EINVAL;
        if (sqe->addr || sqe->ioprio || sqe->off || sqe->len || sqe->buf_index)
                return -EINVAL;
+        if (!poll->file)
+                return -EBADF;
        INIT_WORK(&req->work, io_poll_complete_work);
        events = READ_ONCE(sqe->poll_events);
        poll->events = demangle_poll(events) | EPOLLERR | EPOLLHUP;
-        flags = READ_ONCE(sqe->flags);
-        fd = READ_ONCE(sqe->fd);
-        if (flags & IOSQE_FIXED_FILE) {
-                if (unlikely(!ctx->user_files || fd >= ctx->nr_user_files))
-                        return -EBADF;
-                poll->file = ctx->user_files[fd];
-                req->flags |= REQ_F_FIXED_FILE;
-        } else {
-                poll->file = fget(fd);
-        }
-        if (unlikely(!poll->file))
-                return -EBADF;
        poll->head = NULL;
-        poll->woken = false;
+        poll->done = false;
        poll->canceled = false;
        ipt.pt._qproc = io_poll_queue_proc;
@@ -1346,56 +1290,44 @@ static int io_poll_add(struct io_kiocb *req, const struct io_uring_sqe *sqe)
        INIT_LIST_HEAD(&poll->wait.entry);
        init_waitqueue_func_entry(&poll->wait, io_poll_wake);
-        /* one for removal from waitqueue, one for this function */
-        refcount_set(&req->refs, 2);
        mask = vfs_poll(poll->file, &ipt.pt) & poll->events;
-        if (unlikely(!poll->head)) {
-                /* we did not manage to set up a waitqueue, done */
-                goto out;
-        }
        spin_lock_irq(&ctx->completion_lock);
-        spin_lock(&poll->head->lock);
+        if (likely(poll->head)) {
-        if (poll->woken) {
+                spin_lock(&poll->head->lock);
-                /* wake_up context handles the rest */
+                if (unlikely(list_empty(&poll->wait.entry))) {
-                mask = 0;
+                        if (ipt.error)
+                                cancel = true;
+                        ipt.error = 0;
+                        mask = 0;
+                }
+                if (mask || ipt.error)
+                        list_del_init(&poll->wait.entry);
+                else if (cancel)
+                        WRITE_ONCE(poll->canceled, true);
+                else if (!poll->done) /* actually waiting for an event */
+                        list_add_tail(&req->list, &ctx->cancel_list);
+                spin_unlock(&poll->head->lock);
+        }
+        if (mask) { /* no async, we'd stolen it */
+                req->error = mangle_poll(mask);
                ipt.error = 0;
-        } else if (mask || ipt.error) {
+                io_poll_complete(ctx, req, mask);
-                /* if we get an error or a mask we are done */
-                WARN_ON_ONCE(list_empty(&poll->wait.entry));
-                list_del_init(&poll->wait.entry);
-        } else {
-                /* actually waiting for an event */
-                list_add_tail(&req->list, &ctx->cancel_list);
        }
-        spin_unlock(&poll->head->lock);
        spin_unlock_irq(&ctx->completion_lock);
-out:
+        if (mask) {
-        if (unlikely(ipt.error)) {
+                io_cqring_ev_posted(ctx);
-                if (!(flags & IOSQE_FIXED_FILE))
+                io_put_req(req);
-                        fput(poll->file);
-                /*
-                 * Drop one of our refs to this req, __io_submit_sqe() will
-                 * drop the other one since we're returning an error.
-                 */
-                io_free_req(req);
-                return ipt.error;
        }
+        return ipt.error;
-        if (mask)
-                io_poll_complete(req, mask);
-        io_free_req(req);
-        return 0;
 }
 static int __io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
                           const struct sqe_submit *s, bool force_nonblock,
                           struct io_submit_state *state)
 {
-        ssize_t ret;
+        int ret, opcode;
-        int opcode;
        if (unlikely(s->index >= ctx->sq_entries))
                return -EINVAL;
@@ -1524,10 +1456,13 @@ restart:
                                        break;
                                cond_resched();
                        } while (1);
+                        /* drop submission reference */
+                        io_put_req(req);
                }
                if (ret) {
                        io_cqring_add_event(ctx, sqe->user_data, ret, 0);
-                        io_free_req(req);
+                        io_put_req(req);
                }
                /* async context always use a copy of the sqe */
@@ -1614,11 +1549,55 @@ static bool io_add_to_prev_work(struct async_list *list, struct io_kiocb *req)
        return ret;
 }
+static bool io_op_needs_file(const struct io_uring_sqe *sqe)
+{
+        int op = READ_ONCE(sqe->opcode);
+        switch (op) {
+        case IORING_OP_NOP:
+        case IORING_OP_POLL_REMOVE:
+                return false;
+        default:
+                return true;
+        }
+}
+static int io_req_set_file(struct io_ring_ctx *ctx, const struct sqe_submit *s,
+                           struct io_submit_state *state, struct io_kiocb *req)
+{
+        unsigned flags;
+        int fd;
+        flags = READ_ONCE(s->sqe->flags);
+        fd = READ_ONCE(s->sqe->fd);
+        if (!io_op_needs_file(s->sqe)) {
+                req->file = NULL;
+                return 0;
+        }
+        if (flags & IOSQE_FIXED_FILE) {
+                if (unlikely(!ctx->user_files ||
+                    (unsigned) fd >= ctx->nr_user_files))
+                        return -EBADF;
+                req->file = ctx->user_files[fd];
+                req->flags |= REQ_F_FIXED_FILE;
+        } else {
+                if (s->needs_fixed_file)
+                        return -EBADF;
+                req->file = io_file_get(state, fd);
+                if (unlikely(!req->file))
+                        return -EBADF;
+        }
+        return 0;
+}
 static int io_submit_sqe(struct io_ring_ctx *ctx, struct sqe_submit *s,
                         struct io_submit_state *state)
 {
        struct io_kiocb *req;
-        ssize_t ret;
+        int ret;
        /* enforce forwards compatibility on users */
        if (unlikely(s->sqe->flags & ~IOSQE_FIXED_FILE))
@@ -1628,7 +1607,9 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct sqe_submit *s,
        if (unlikely(!req))
                return -EAGAIN;
-        req->rw.ki_filp = NULL;
+        ret = io_req_set_file(ctx, s, state, req);
+        if (unlikely(ret))
+                goto out;
        ret = __io_submit_sqe(ctx, req, s, true, state);
        if (ret == -EAGAIN) {
@@ -1649,11 +1630,23 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct sqe_submit *s,
                                INIT_WORK(&req->work, io_sq_wq_submit_work);
                                queue_work(ctx->sqo_wq, &req->work);
                        }
-                        ret = 0;
+                        /*
+                         * Queued up for async execution, worker will release
+                         * submit reference when the iocb is actually
+                         * submitted.
+                         */
+                        return 0;
                }
        }
+out:
+        /* drop submission reference */
+        io_put_req(req);
+        /* and drop final reference, if we failed */
        if (ret)
-                io_free_req(req);
+                io_put_req(req);
        return ret;
 }
diff --git a/fs/iomap.c b/fs/iomap.c
index 97cb9d486a7d..abdd18e404f8 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -1589,12 +1589,14 @@ static void iomap_dio_bio_end_io(struct bio *bio)
        if (should_dirty) {
                bio_check_pages_dirty(bio);
        } else {
-                struct bio_vec *bvec;
+                if (!bio_flagged(bio, BIO_NO_PAGE_REF)) {
-                int i;
+                        struct bvec_iter_all iter_all;
-                struct bvec_iter_all iter_all;
+                        struct bio_vec *bvec;
+                        int i;
-                bio_for_each_segment_all(bvec, bio, i, iter_all)
+                        bio_for_each_segment_all(bvec, bio, i, iter_all)
-                        put_page(bvec->bv_page);
+                                put_page(bvec->bv_page);
+                }
                bio_put(bio);
        }
 }
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 56992b32c6bb..a90bb19dcfa2 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -208,6 +208,7 @@ static int copy_fid_to_user(struct fanotify_event *event, char __user *buf)
 {
        struct fanotify_event_info_fid info = { };
        struct file_handle handle = { };
+        unsigned char bounce[FANOTIFY_INLINE_FH_LEN], *fh;
        size_t fh_len = event->fh_len;
        size_t len = fanotify_event_info_len(event);
@@ -233,7 +234,16 @@ static int copy_fid_to_user(struct fanotify_event *event, char __user *buf)
        buf += sizeof(handle);
        len -= sizeof(handle);
-        if (copy_to_user(buf, fanotify_event_fh(event), fh_len))
+        /*
+         * For an inline fh, copy through stack to exclude the copy from
+         * usercopy hardening protections.
+         */
+        fh = fanotify_event_fh(event);
+        if (fh_len <= FANOTIFY_INLINE_FH_LEN) {
+                memcpy(bounce, fh, fh_len);
+                fh = bounce;
+        }
+        if (copy_to_user(buf, fh, fh_len))
                return -EFAULT;
        /* Pad with 0's */
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index e2901fbb9f76..7b53598c8804 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -519,8 +519,10 @@ static int inotify_update_existing_watch(struct fsnotify_group *group,
        fsn_mark = fsnotify_find_mark(&inode->i_fsnotify_marks, group);
        if (!fsn_mark)
                return -ENOENT;
-        else if (create)
+        else if (create) {
-                return -EEXIST;
+                ret = -EEXIST;
+                goto out;
+        }
        i_mark = container_of(fsn_mark, struct inotify_inode_mark, fsn_mark);
@@ -548,6 +550,7 @@ static int inotify_update_existing_watch(struct fsnotify_group *group,
        /* return the wd */
        ret = i_mark->wd;
+out:
        /* match the get from fsnotify_find_mark() */
        fsnotify_put_mark(fsn_mark);
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index ae796e10f68b..e7276932e433 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -1242,8 +1242,10 @@ set_size:
                truncate_setsize(inode, newsize);
                down_write(&iinfo->i_data_sem);
                udf_clear_extent_cache(inode);
-                udf_truncate_extents(inode);
+                err = udf_truncate_extents(inode);
                up_write(&iinfo->i_data_sem);
+                if (err)
+                        return err;
        }
 update_time:
        inode->i_mtime = inode->i_ctime = current_time(inode);
diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c
index b647f0bd150c..63a47f1e1d52 100644
--- a/fs/udf/truncate.c
+++ b/fs/udf/truncate.c
@@ -199,7 +199,7 @@ static void udf_update_alloc_ext_desc(struct inode *inode,
 * for making file shorter. For making file longer, udf_extend_file() has to
 * be used.
 */
-void udf_truncate_extents(struct inode *inode)
+int udf_truncate_extents(struct inode *inode)
 {
        struct extent_position epos;
        struct kernel_lb_addr eloc, neloc = {};
@@ -224,7 +224,7 @@ void udf_truncate_extents(struct inode *inode)
        if (etype == -1) {
                /* We should extend the file? */
                WARN_ON(byte_offset);
-                return;
+                return 0;
        }
        epos.offset -= adsize;
        extent_trunc(inode, &epos, &eloc, etype, elen, byte_offset);
@@ -260,6 +260,9 @@ void udf_truncate_extents(struct inode *inode)
                        epos.block = eloc;
                        epos.bh = udf_tread(sb,
                                        udf_get_lb_pblock(sb, &eloc, 0));
+                        /* Error reading indirect block? */
+                        if (!epos.bh)
+                                return -EIO;
                        if (elen)
                                indirect_ext_len =
                                        (elen + sb->s_blocksize - 1) >>
@@ -283,4 +286,5 @@ void udf_truncate_extents(struct inode *inode)
        iinfo->i_lenExtents = inode->i_size;
        brelse(epos.bh);
+        return 0;
 }
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
index ee246769dee4..d89ef71887fc 100644
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@ -235,7 +235,7 @@ extern struct inode *udf_new_inode(struct inode *, umode_t);
 /* truncate.c */
 extern void udf_truncate_tail_extent(struct inode *);
 extern void udf_discard_prealloc(struct inode *);
-extern void udf_truncate_extents(struct inode *);
+extern int udf_truncate_extents(struct inode *);
 /* balloc.c */
 extern void udf_free_blocks(struct super_block *, struct inode *,
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index b0c814bcc7e3..cb2aa7ecafff 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -57,7 +57,6 @@ struct blk_mq_hw_ctx {
        unsigned int            queue_num;
        atomic_t                nr_active;
-        unsigned int            nr_expired;
        struct hlist_node       cpuhp_dead;
        struct kobject          kobj;
@@ -300,8 +299,6 @@ void blk_mq_end_request(struct request *rq, blk_status_t error);
 void __blk_mq_end_request(struct request *rq, blk_status_t error);
 void blk_mq_requeue_request(struct request *rq, bool kick_requeue_list);
-void blk_mq_add_to_requeue_list(struct request *rq, bool at_head,
-                                bool kick_requeue_list);
 void blk_mq_kick_requeue_list(struct request_queue *q);
 void blk_mq_delay_kick_requeue_list(struct request_queue *q, unsigned long msecs);
 bool blk_mq_complete_request(struct request *rq);
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index d66bf5f32610..791fee35df88 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -215,6 +215,7 @@ struct bio {
 /*
 * bio flags
 */
+#define BIO_NO_PAGE_REF 0       /* don't put release vec pages */
 #define BIO_SEG_VALID   1       /* bi_phys_segments valid */
 #define BIO_CLONED      2       /* doesn't own data */
 #define BIO_BOUNCED     3       /* bio is a bounce bio */
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 0de92b29f589..5c58a3b2bf00 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -50,6 +50,9 @@ struct blk_stat_callback;
 /* Must be consistent with blk_mq_poll_stats_bkt() */
 #define BLK_MQ_POLL_STATS_BKTS 16
+/* Doing classic polling */
+#define BLK_MQ_POLL_CLASSIC -1
 /*
 * Maximum number of blkcg policies allowed to be registered concurrently.
 * Defined here to simplify include dependency.
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
index a420c07904bc..337d5049ff93 100644
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
@@ -294,6 +294,8 @@ extern void ceph_destroy_client(struct ceph_client *client);
 extern int __ceph_open_session(struct ceph_client *client,
                               unsigned long started);
 extern int ceph_open_session(struct ceph_client *client);
+int ceph_wait_for_latest_osdmap(struct ceph_client *client,
+                                unsigned long timeout);
 /* pagevec.c */
 extern void ceph_release_page_vector(struct page **pages, int num_pages);
diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h
index b26ea9077384..0343c81d4c5f 100644
--- a/include/linux/mlx5/qp.h
+++ b/include/linux/mlx5/qp.h
@@ -557,7 +557,8 @@ static inline struct mlx5_core_mkey *__mlx5_mr_lookup(struct mlx5_core_dev *dev,
 int mlx5_core_create_dct(struct mlx5_core_dev *dev,
                         struct mlx5_core_dct *qp,
-                         u32 *in, int inlen);
+                         u32 *in, int inlen,
+                         u32 *out, int outlen);
 int mlx5_core_create_qp(struct mlx5_core_dev *dev,
                        struct mlx5_core_qp *qp,
                        u32 *in,
diff --git a/include/linux/sbitmap.h b/include/linux/sbitmap.h
index 14d558146aea..20f3e3f029b9 100644
--- a/include/linux/sbitmap.h
+++ b/include/linux/sbitmap.h
@@ -330,7 +330,7 @@ static inline void sbitmap_clear_bit(struct sbitmap *sb, unsigned int bitnr)
 /*
 * This one is special, since it doesn't actually clear the bit, rather it
 * sets the corresponding bit in the ->cleared mask instead. Paired with
- * the caller doing sbitmap_batch_clear() if a given index is full, which
+ * the caller doing sbitmap_deferred_clear() if a given index is full, which
 * will clear the previously freed entries in the corresponding ->word.
 */
 static inline void sbitmap_deferred_clear_bit(struct sbitmap *sb, unsigned int bitnr)
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 87477e1640f9..f184af1999a8 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -23,14 +23,23 @@ struct kvec {
 };
 enum iter_type {
-        ITER_IOVEC = 0,
+        /* set if ITER_BVEC doesn't hold a bv_page ref */
-        ITER_KVEC = 2,
+        ITER_BVEC_FLAG_NO_REF = 2,
-        ITER_BVEC = 4,
-        ITER_PIPE = 8,
+        /* iter types */
-        ITER_DISCARD = 16,
+        ITER_IOVEC = 4,
+        ITER_KVEC = 8,
+        ITER_BVEC = 16,
+        ITER_PIPE = 32,
+        ITER_DISCARD = 64,
 };
 struct iov_iter {
+        /*
+         * Bit 0 is the read/write bit, set if we're writing.
+         * Bit 1 is the BVEC_FLAG_NO_REF bit, set if type is a bvec and
+         * the caller isn't expecting to drop a page reference when done.
+         */
        unsigned int type;
        size_t iov_offset;
        size_t count;
@@ -84,6 +93,11 @@ static inline unsigned char iov_iter_rw(const struct iov_iter *i)
        return i->type & (READ | WRITE);
 }
+static inline bool iov_iter_bvec_no_ref(const struct iov_iter *i)
+{
+        return (i->type & ITER_BVEC_FLAG_NO_REF) != 0;
+}
 /*
 * Total number of bytes covered by an iovec.
 *
diff --git a/include/misc/charlcd.h b/include/misc/charlcd.h
index 23f61850f363..1832402324ce 100644
--- a/include/misc/charlcd.h
+++ b/include/misc/charlcd.h
@@ -35,6 +35,7 @@ struct charlcd_ops {
 };
 struct charlcd *charlcd_alloc(unsigned int drvdata_size);
+void charlcd_free(struct charlcd *lcd);
 int charlcd_register(struct charlcd *lcd);
 int charlcd_unregister(struct charlcd *lcd);
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 8fbfda94a67b..403c9bd90413 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -42,9 +42,9 @@ int __read_mostly watchdog_user_enabled = 1;
 int __read_mostly nmi_watchdog_user_enabled = NMI_WATCHDOG_DEFAULT;
 int __read_mostly soft_watchdog_user_enabled = 1;
 int __read_mostly watchdog_thresh = 10;
-int __read_mostly nmi_watchdog_available;
+static int __read_mostly nmi_watchdog_available;
-struct cpumask watchdog_allowed_mask __read_mostly;
+static struct cpumask watchdog_allowed_mask __read_mostly;
 struct cpumask watchdog_cpumask __read_mostly;
 unsigned long *watchdog_cpumask_bits = cpumask_bits(&watchdog_cpumask);
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 9cab80207ced..79eac465ec65 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -738,7 +738,6 @@ int __ceph_open_session(struct ceph_client *client, unsigned long started)
 }
 EXPORT_SYMBOL(__ceph_open_session);
 int ceph_open_session(struct ceph_client *client)
 {
        int ret;
@@ -754,6 +753,23 @@ int ceph_open_session(struct ceph_client *client)
 }
 EXPORT_SYMBOL(ceph_open_session);
+int ceph_wait_for_latest_osdmap(struct ceph_client *client,
+                                unsigned long timeout)
+{
+        u64 newest_epoch;
+        int ret;
+        ret = ceph_monc_get_version(&client->monc, "osdmap", &newest_epoch);
+        if (ret)
+                return ret;
+        if (client->osdc.osdmap->epoch >= newest_epoch)
+                return 0;
+        ceph_osdc_maybe_request_map(&client->osdc);
+        return ceph_monc_wait_osdmap(&client->monc, newest_epoch, timeout);
+}
+EXPORT_SYMBOL(ceph_wait_for_latest_osdmap);
 static int __init init_ceph_lib(void)
 {
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index 18deb3d889c4..a53e4fbb6319 100644
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -922,6 +922,15 @@ int ceph_monc_blacklist_add(struct ceph_mon_client *monc,
        mutex_unlock(&monc->mutex);
        ret = wait_generic_request(req);
+        if (!ret)
+                /*
+                 * Make sure we have the osdmap that includes the blacklist
+                 * entry.  This is needed to ensure that the OSDs pick up the
+                 * new blacklist before processing any future requests from
+                 * this client.
+                 */
+                ret = ceph_wait_for_latest_osdmap(monc->client, 0);
 out:
        put_generic_request(req);
        return ret;
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index 6b576e588725..daecdfb15a9c 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -828,9 +828,11 @@ void policydb_destroy(struct policydb *p)
        hashtab_map(p->range_tr, range_tr_destroy, NULL);
        hashtab_destroy(p->range_tr);
-        for (i = 0; i < p->p_types.nprim; i++)
+        if (p->type_attr_map_array) {
-                ebitmap_destroy(&p->type_attr_map_array[i]);
+                for (i = 0; i < p->p_types.nprim; i++)
-        kvfree(p->type_attr_map_array);
+                        ebitmap_destroy(&p->type_attr_map_array[i]);
+                kvfree(p->type_attr_map_array);
+        }
        ebitmap_destroy(&p->filename_trans_ttypes);
        ebitmap_destroy(&p->policycaps);
@@ -2496,10 +2498,13 @@ int policydb_read(struct policydb *p, void *fp)
        if (!p->type_attr_map_array)
                goto bad;
+        /* just in case ebitmap_init() becomes more than just a memset(0): */
+        for (i = 0; i < p->p_types.nprim; i++)
+                ebitmap_init(&p->type_attr_map_array[i]);
        for (i = 0; i < p->p_types.nprim; i++) {
                struct ebitmap *e = &p->type_attr_map_array[i];
-                ebitmap_init(e);
                if (p->policyvers >= POLICYDB_VERSION_AVTAB) {
                        rc = ebitmap_read(e, fp);
                        if (rc)
diff --git a/sound/drivers/opl3/opl3_voice.h b/sound/drivers/opl3/opl3_voice.h
index 5b02bd49fde4..4e4ecc21760b 100644
--- a/sound/drivers/opl3/opl3_voice.h
+++ b/sound/drivers/opl3/opl3_voice.h
@@ -41,7 +41,7 @@ void snd_opl3_timer_func(struct timer_list *t);
 /* Prototypes for opl3_drums.c */
 void snd_opl3_load_drums(struct snd_opl3 *opl3);
-void snd_opl3_drum_switch(struct snd_opl3 *opl3, int note, int on_off, int vel, struct snd_midi_channel *chan);
+void snd_opl3_drum_switch(struct snd_opl3 *opl3, int note, int vel, int on_off, struct snd_midi_channel *chan);
 /* Prototypes for opl3_oss.c */
 #if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)
diff --git a/sound/firewire/motu/motu.c b/sound/firewire/motu/motu.c
index 220e61926ea4..513291ba0ab0 100644
--- a/sound/firewire/motu/motu.c
+++ b/sound/firewire/motu/motu.c
@@ -36,7 +36,7 @@ static void name_card(struct snd_motu *motu)
        fw_csr_iterator_init(&it, motu->unit->directory);
        while (fw_csr_iterator_next(&it, &key, &val)) {
                switch (key) {
-                case CSR_VERSION:
+                case CSR_MODEL:
                        version = val;
                        break;
                }
@@ -46,7 +46,7 @@ static void name_card(struct snd_motu *motu)
        strcpy(motu->card->shortname, motu->spec->name);
        strcpy(motu->card->mixername, motu->spec->name);
        snprintf(motu->card->longname, sizeof(motu->card->longname),
-                 "MOTU %s (version:%d), GUID %08x%08x at %s, S%d",
+                 "MOTU %s (version:%06x), GUID %08x%08x at %s, S%d",
                 motu->spec->name, version,
                 fw_dev->config_rom[3], fw_dev->config_rom[4],
                 dev_name(&motu->unit->device), 100 << fw_dev->max_speed);
@@ -237,20 +237,20 @@ static const struct snd_motu_spec motu_audio_express = {
 #define SND_MOTU_DEV_ENTRY(model, data)                 \
 {                                                       \
        .match_flags    = IEEE1394_MATCH_VENDOR_ID |    \
-                          IEEE1394_MATCH_MODEL_ID |     \
+                          IEEE1394_MATCH_SPECIFIER_ID | \
-                          IEEE1394_MATCH_SPECIFIER_ID,  \
+                          IEEE1394_MATCH_VERSION,       \
        .vendor_id      = OUI_MOTU,                     \
-        .model_id       = model,                        \
        .specifier_id   = OUI_MOTU,                     \
+        .version        = model,                        \
        .driver_data    = (kernel_ulong_t)data,         \
 }
 static const struct ieee1394_device_id motu_id_table[] = {
-        SND_MOTU_DEV_ENTRY(0x101800, &motu_828mk2),
+        SND_MOTU_DEV_ENTRY(0x000003, &motu_828mk2),
-        SND_MOTU_DEV_ENTRY(0x107800, &snd_motu_spec_traveler),
+        SND_MOTU_DEV_ENTRY(0x000009, &snd_motu_spec_traveler),
-        SND_MOTU_DEV_ENTRY(0x106800, &motu_828mk3),     /* FireWire only. */
+        SND_MOTU_DEV_ENTRY(0x000015, &motu_828mk3),     /* FireWire only. */
-        SND_MOTU_DEV_ENTRY(0x100800, &motu_828mk3),     /* Hybrid. */
+        SND_MOTU_DEV_ENTRY(0x000035, &motu_828mk3),     /* Hybrid. */
-        SND_MOTU_DEV_ENTRY(0x104800, &motu_audio_express),
+        SND_MOTU_DEV_ENTRY(0x000033, &motu_audio_express),
        { }
 };
 MODULE_DEVICE_TABLE(ieee1394, motu_id_table);
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index aa2a83eb81a9..dc27a480c2d9 100644
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -111,6 +111,10 @@ static int snd_sb8_probe(struct device *pdev, unsigned int dev)
        /* block the 0x388 port to avoid PnP conflicts */
        acard->fm_res = request_region(0x388, 4, "SoundBlaster FM");
+        if (!acard->fm_res) {
+                err = -EBUSY;
+                goto _err;
+        }
        if (port[dev] != SNDRV_AUTO_PORT) {
                if ((err = snd_sbdsp_create(card, port[dev], irq[dev],
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index ea876b0b02b9..dc0084dc8550 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -1952,6 +1952,11 @@ static int snd_echo_create(struct snd_card *card,
        }
        chip->dsp_registers = (volatile u32 __iomem *)
                ioremap_nocache(chip->dsp_registers_phys, sz);
+        if (!chip->dsp_registers) {
+                dev_err(chip->card->dev, "ioremap failed\n");
+                snd_echo_free(chip);
+                return -ENOMEM;
+        }
        if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,
                        KBUILD_MODNAME, chip)) {
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 5f2005098a60..ec0b8595eb4d 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2939,6 +2939,20 @@ static int hda_codec_runtime_resume(struct device *dev)
 #endif /* CONFIG_PM */
 #ifdef CONFIG_PM_SLEEP
+static int hda_codec_force_resume(struct device *dev)
+{
+        int ret;
+        /* The get/put pair below enforces the runtime resume even if the
+         * device hasn't been used at suspend time.  This trick is needed to
+         * update the jack state change during the sleep.
+         */
+        pm_runtime_get_noresume(dev);
+        ret = pm_runtime_force_resume(dev);
+        pm_runtime_put(dev);
+        return ret;
+}
 static int hda_codec_pm_suspend(struct device *dev)
 {
        dev->power.power_state = PMSG_SUSPEND;
@@ -2948,7 +2962,7 @@ static int hda_codec_pm_suspend(struct device *dev)
 static int hda_codec_pm_resume(struct device *dev)
 {
        dev->power.power_state = PMSG_RESUME;
-        return pm_runtime_force_resume(dev);
+        return hda_codec_force_resume(dev);
 }
 static int hda_codec_pm_freeze(struct device *dev)
@@ -2960,13 +2974,13 @@ static int hda_codec_pm_freeze(struct device *dev)
 static int hda_codec_pm_thaw(struct device *dev)
 {
        dev->power.power_state = PMSG_THAW;
-        return pm_runtime_force_resume(dev);
+        return hda_codec_force_resume(dev);
 }
 static int hda_codec_pm_restore(struct device *dev)
 {
        dev->power.power_state = PMSG_RESTORE;
-        return pm_runtime_force_resume(dev);
+        return hda_codec_force_resume(dev);
 }
 #endif /* CONFIG_PM_SLEEP */
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index e5c49003e75f..ece256a3b48f 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -947,7 +947,7 @@ static void __azx_runtime_suspend(struct azx *chip)
        display_power(chip, false);
 }
-static void __azx_runtime_resume(struct azx *chip)
+static void __azx_runtime_resume(struct azx *chip, bool from_rt)
 {
        struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
        struct hdac_bus *bus = azx_bus(chip);
@@ -964,7 +964,7 @@ static void __azx_runtime_resume(struct azx *chip)
        azx_init_pci(chip);
        hda_intel_init_chip(chip, true);
-        if (status) {
+        if (status && from_rt) {
                list_for_each_codec(codec, &chip->bus)
                        if (status & (1 << codec->addr))
                                schedule_delayed_work(&codec->jackpoll_work,
@@ -1016,7 +1016,7 @@ static int azx_resume(struct device *dev)
                        chip->msi = 0;
        if (azx_acquire_irq(chip, 1) < 0)
                return -EIO;
-        __azx_runtime_resume(chip);
+        __azx_runtime_resume(chip, false);
        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
        trace_azx_resume(chip);
@@ -1081,7 +1081,7 @@ static int azx_runtime_resume(struct device *dev)
        chip = card->private_data;
        if (!azx_has_pm_runtime(chip))
                return 0;
-        __azx_runtime_resume(chip);
+        __azx_runtime_resume(chip, true);
        /* disable controller Wake Up event*/
        azx_writew(chip, WAKEEN, azx_readw(chip, WAKEEN) &
@@ -2144,10 +2144,12 @@ static struct snd_pci_quirk power_save_blacklist[] = {
        SND_PCI_QUIRK(0x8086, 0x2057, "Intel NUC5i7RYB", 0),
        /* https://bugzilla.redhat.com/show_bug.cgi?id=1520902 */
        SND_PCI_QUIRK(0x8086, 0x2068, "Intel NUC7i3BNB", 0),
-        /* https://bugzilla.redhat.com/show_bug.cgi?id=1572975 */
-        SND_PCI_QUIRK(0x17aa, 0x36a7, "Lenovo C50 All in one", 0),
        /* https://bugzilla.kernel.org/show_bug.cgi?id=198611 */
        SND_PCI_QUIRK(0x17aa, 0x2227, "Lenovo X1 Carbon 3rd Gen", 0),
+        /* https://bugzilla.redhat.com/show_bug.cgi?id=1689623 */
+        SND_PCI_QUIRK(0x17aa, 0x367b, "Lenovo IdeaCentre B550", 0),
+        /* https://bugzilla.redhat.com/show_bug.cgi?id=1572975 */
+        SND_PCI_QUIRK(0x17aa, 0x36a7, "Lenovo C50 All in one", 0),
        {}
 };
 #endif /* CONFIG_PM */
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 384719d5c44e..191830d4fa40 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5687,6 +5687,7 @@ enum {
        ALC225_FIXUP_DELL_WYSE_AIO_MIC_NO_PRESENCE,
        ALC225_FIXUP_WYSE_AUTO_MUTE,
        ALC225_FIXUP_WYSE_DISABLE_MIC_VREF,
+        ALC286_FIXUP_ACER_AIO_HEADSET_MIC,
 };
 static const struct hda_fixup alc269_fixups[] = {
@@ -6685,6 +6686,16 @@ static const struct hda_fixup alc269_fixups[] = {
                .chained = true,
                .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
        },
+        [ALC286_FIXUP_ACER_AIO_HEADSET_MIC] = {
+                .type = HDA_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x4f },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x5029 },
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE
+        },
 };
 static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -6701,9 +6712,9 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
        SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS),
        SND_PCI_QUIRK(0x1025, 0x102b, "Acer Aspire C24-860", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x1025, 0x106d, "Acer Cloudbook 14", ALC283_FIXUP_CHROME_BOOK),
-        SND_PCI_QUIRK(0x1025, 0x128f, "Acer Veriton Z6860G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1025, 0x128f, "Acer Veriton Z6860G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC),
-        SND_PCI_QUIRK(0x1025, 0x1290, "Acer Veriton Z4860G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1025, 0x1290, "Acer Veriton Z4860G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC),
-        SND_PCI_QUIRK(0x1025, 0x1291, "Acer Veriton Z4660G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1025, 0x1291, "Acer Veriton Z4660G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC),
        SND_PCI_QUIRK(0x1025, 0x1330, "Acer TravelMate X514-51T", ALC255_FIXUP_ACER_HEADSET_MIC),
        SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
        SND_PCI_QUIRK(0x1028, 0x054b, "Dell XPS one 2710", ALC275_FIXUP_DELL_XPS),
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 0414a0d52262..5dde107083c6 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -2184,9 +2184,10 @@ static void cleanup(struct objtool_file *file)
        elf_close(file->elf);
 }
+static struct objtool_file file;
 int check(const char *_objname, bool orc)
 {
-        struct objtool_file file;
        int ret, warnings = 0;
        objname = _objname;
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 9327c0ddc3a5..c3fad065c89c 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -5077,6 +5077,9 @@ int fork_it(char **argv)
                signal(SIGQUIT, SIG_IGN);
                if (waitpid(child_pid, &status, 0) == -1)
                        err(status, "waitpid");
+                if (WIFEXITED(status))
+                        status = WEXITSTATUS(status);
        }
        /*
         * n.b. fork_it() does not check for errors from for_all_cpus()