339 files changed, 2991 insertions, 1643 deletions

diff --git a/Documentation/device-mapper/writecache.txt b/Documentation/device-mapper/writecache.txt
index 4424fa2c67d7..01532b3008ae 100644
--- a/Documentation/device-mapper/writecache.txt
+++ b/Documentation/device-mapper/writecache.txt
@@ -15,6 +15,8 @@ Constructor parameters:
    size)
 5. the number of optional parameters (the parameters with an argument
    count as two)
+        start_sector n          (default: 0)
+                offset from the start of cache device in 512-byte sectors
         high_watermark n        (default: 50)
                 start writeback when the number of used blocks reach this
                 watermark
diff --git a/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt b/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
index bdadc3da9556..6970f30a3770 100644
--- a/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
+++ b/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
@@ -66,7 +66,7 @@ Required root node properties:
         - "insignal,arndale-octa" - for Exynos5420-based Insignal Arndale
                                     Octa board.
         - "insignal,origen"       - for Exynos4210-based Insignal Origen board.
-        - "insignal,origen4412    - for Exynos4412-based Insignal Origen board.
+        - "insignal,origen4412"   - for Exynos4412-based Insignal Origen board.
 
 
 Optional nodes:
diff --git a/Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt b/Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt
index 6fddb4f4f71a..3055d5c2c04e 100644
--- a/Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt
+++ b/Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt
@@ -36,7 +36,7 @@ Optional nodes:
 
  - port/ports: to describe a connection to an external encoder. The
    binding follows Documentation/devicetree/bindings/graph.txt and
-   suppors a single port with a single endpoint.
+   supports a single port with a single endpoint.
 
  - See also Documentation/devicetree/bindings/display/tilcdc/panel.txt and
    Documentation/devicetree/bindings/display/tilcdc/tfp410.txt for connecting
diff --git a/Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt b/Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt
index 20fc72d9e61e..45a61b462287 100644
--- a/Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt
+++ b/Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt
@@ -1,7 +1,7 @@
 Nintendo Wii (Hollywood) GPIO controller
 
 Required properties:
-- compatible: "nintendo,hollywood-gpio
+- compatible: "nintendo,hollywood-gpio"
 - reg: Physical base address and length of the controller's registers.
 - gpio-controller: Marks the device node as a GPIO controller.
 - #gpio-cells: Should be <2>. The first cell is the pin number and the
diff --git a/Documentation/devicetree/bindings/input/touchscreen/hideep.txt b/Documentation/devicetree/bindings/input/touchscreen/hideep.txt
index 121d9b7c79a2..1063c30d53f7 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/hideep.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/hideep.txt
@@ -32,7 +32,7 @@ i2c@00000000 {
                 reg = <0x6c>;
                 interrupt-parent = <&gpx1>;
                 interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
-                vdd-supply = <&ldo15_reg>";
+                vdd-supply = <&ldo15_reg>;
                 vid-supply = <&ldo18_reg>;
                 reset-gpios = <&gpx1 5 0>;
                 touchscreen-size-x = <1080>;
diff --git a/Documentation/devicetree/bindings/interrupt-controller/nvidia,tegra20-ictlr.txt b/Documentation/devicetree/bindings/interrupt-controller/nvidia,tegra20-ictlr.txt
index 1099fe0788fa..f246ccbf8838 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/nvidia,tegra20-ictlr.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/nvidia,tegra20-ictlr.txt
@@ -15,7 +15,7 @@ Required properties:
   include "nvidia,tegra30-ictlr".       
 - reg : Specifies base physical address and size of the registers.
   Each controller must be described separately (Tegra20 has 4 of them,
-  whereas Tegra30 and later have 5"  
+  whereas Tegra30 and later have 5).
 - interrupt-controller : Identifies the node as an interrupt controller.
 - #interrupt-cells : Specifies the number of cells needed to encode an
   interrupt source. The value must be 3.
diff --git a/Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.txt b/Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.txt
index 136bd612bd83..6a36bf66d932 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.txt
@@ -12,7 +12,7 @@ Required properties:
   specifier, shall be 2
 - interrupts: interrupts references to primary interrupt controller
   (only needed for exti controller with multiple exti under
-  same parent interrupt: st,stm32-exti and st,stm32h7-exti")
+  same parent interrupt: st,stm32-exti and st,stm32h7-exti)
 
 Example:
 
diff --git a/Documentation/devicetree/bindings/mips/brcm/soc.txt b/Documentation/devicetree/bindings/mips/brcm/soc.txt
index 356c29789cf5..3a66d3c483e1 100644
--- a/Documentation/devicetree/bindings/mips/brcm/soc.txt
+++ b/Documentation/devicetree/bindings/mips/brcm/soc.txt
@@ -152,7 +152,7 @@ Required properties:
 - compatible    : should contain one of:
                   "brcm,bcm7425-timers"
                   "brcm,bcm7429-timers"
-                  "brcm,bcm7435-timers and
+                  "brcm,bcm7435-timers" and
                   "brcm,brcmstb-timers"
 - reg           : the timers register range
 - interrupts    : the interrupt line for this timer block
diff --git a/Documentation/devicetree/bindings/net/fsl-fman.txt b/Documentation/devicetree/bindings/net/fsl-fman.txt
index df873d1f3b7c..f8c33890bc29 100644
--- a/Documentation/devicetree/bindings/net/fsl-fman.txt
+++ b/Documentation/devicetree/bindings/net/fsl-fman.txt
@@ -238,7 +238,7 @@ PROPERTIES
                 Must include one of the following:
                 - "fsl,fman-dtsec" for dTSEC MAC
                 - "fsl,fman-xgec" for XGEC MAC
-                - "fsl,fman-memac for mEMAC MAC
+                - "fsl,fman-memac" for mEMAC MAC
 
 - cell-index
                 Usage: required
diff --git a/Documentation/devicetree/bindings/power/power_domain.txt b/Documentation/devicetree/bindings/power/power_domain.txt
index 9b387f861aed..7dec508987c7 100644
--- a/Documentation/devicetree/bindings/power/power_domain.txt
+++ b/Documentation/devicetree/bindings/power/power_domain.txt
@@ -133,7 +133,7 @@ located inside a PM domain with index 0 of a power controller represented by a
 node with the label "power".
 In the second example the consumer device are partitioned across two PM domains,
 the first with index 0 and the second with index 1, of a power controller that
-is represented by a node with the label "power.
+is represented by a node with the label "power".
 
 Optional properties:
 - required-opps: This contains phandle to an OPP node in another device's OPP
diff --git a/Documentation/devicetree/bindings/regulator/tps65090.txt b/Documentation/devicetree/bindings/regulator/tps65090.txt
index ca69f5e3040c..ae326f263597 100644
--- a/Documentation/devicetree/bindings/regulator/tps65090.txt
+++ b/Documentation/devicetree/bindings/regulator/tps65090.txt
@@ -16,7 +16,7 @@ Required properties:
 Optional properties:
 - ti,enable-ext-control: This is applicable for DCDC1, DCDC2 and DCDC3.
   If DCDCs are externally controlled then this property should be there.
-- "dcdc-ext-control-gpios: This is applicable for DCDC1, DCDC2 and DCDC3.
+- dcdc-ext-control-gpios: This is applicable for DCDC1, DCDC2 and DCDC3.
   If DCDCs are externally controlled and if it is from GPIO then GPIO
   number should be provided. If it is externally controlled and no GPIO
   entry then driver will just configure this rails as external control
diff --git a/Documentation/devicetree/bindings/reset/st,sti-softreset.txt b/Documentation/devicetree/bindings/reset/st,sti-softreset.txt
index a21658f18fe6..3661e6153a92 100644
--- a/Documentation/devicetree/bindings/reset/st,sti-softreset.txt
+++ b/Documentation/devicetree/bindings/reset/st,sti-softreset.txt
@@ -15,7 +15,7 @@ Please refer to reset.txt in this directory for common reset
 controller binding usage.
 
 Required properties:
-- compatible: Should be st,stih407-softreset";
+- compatible: Should be "st,stih407-softreset";
 - #reset-cells: 1, see below
 
 example:
diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.txt b/Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.txt
index d330c73de9a2..68b7d6207e3d 100644
--- a/Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.txt
+++ b/Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.txt
@@ -39,7 +39,7 @@ Required properties:
 
 Optional property:
 - clock-frequency:      Desired I2C bus clock frequency in Hz.
-                        When missing default to 400000Hz.
+                        When missing default to 100000Hz.
 
 Child nodes should conform to I2C bus binding as described in i2c.txt.
 
diff --git a/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt b/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt
index 6a4aadc4ce06..84b28dbe9f15 100644
--- a/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt
+++ b/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt
@@ -30,7 +30,7 @@ Required properties:
 
                           Board connectors:
                           * Headset Mic
-                          * Secondary Mic",
+                          * Secondary Mic
                           * DMIC
                           * Ext Spk
 
diff --git a/Documentation/devicetree/bindings/sound/qcom,apq8096.txt b/Documentation/devicetree/bindings/sound/qcom,apq8096.txt
index aa54e49fc8a2..c7600a93ab39 100644
--- a/Documentation/devicetree/bindings/sound/qcom,apq8096.txt
+++ b/Documentation/devicetree/bindings/sound/qcom,apq8096.txt
@@ -35,7 +35,7 @@ This binding describes the APQ8096 sound card, which uses qdsp for audio.
                         "Digital Mic3"
 
                 Audio pins and MicBias on WCD9335 Codec:
-                        "MIC_BIAS1
+                        "MIC_BIAS1"
                         "MIC_BIAS2"
                         "MIC_BIAS3"
                         "MIC_BIAS4"
diff --git a/Documentation/devicetree/bindings/w1/w1-gpio.txt b/Documentation/devicetree/bindings/w1/w1-gpio.txt
index 6e09c35d9f1a..37091902a021 100644
--- a/Documentation/devicetree/bindings/w1/w1-gpio.txt
+++ b/Documentation/devicetree/bindings/w1/w1-gpio.txt
@@ -15,7 +15,7 @@ Optional properties:
 
 Examples:
 
-        onewire@0 {
+        onewire {
                 compatible = "w1-gpio";
                 gpios = <&gpio 126 0>, <&gpio 105 0>;
         };
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index c13214d073a4..d3e5dd26db12 100644
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
@@ -1490,7 +1490,7 @@ To remove an ARP target:
 
 To configure the interval between learning packet transmits:
 # echo 12 > /sys/class/net/bond0/bonding/lp_interval
-        NOTE: the lp_inteval is the number of seconds between instances where
+        NOTE: the lp_interval is the number of seconds between instances where
 the bonding driver sends learning packets to each slaves peer switch.  The
 default interval is 1 second.
 
diff --git a/Documentation/networking/e100.rst b/Documentation/networking/e100.rst
index 9708f5fa76de..f81111eba9c5 100644
--- a/Documentation/networking/e100.rst
+++ b/Documentation/networking/e100.rst
@@ -47,41 +47,45 @@ Driver Configuration Parameters
 The default value for each parameter is generally the recommended setting,
 unless otherwise noted.
 
-Rx Descriptors: Number of receive descriptors. A receive descriptor is a data
+Rx Descriptors:
+   Number of receive descriptors. A receive descriptor is a data
    structure that describes a receive buffer and its attributes to the network
    controller. The data in the descriptor is used by the controller to write
    data from the controller to host memory. In the 3.x.x driver the valid range
    for this parameter is 64-256. The default value is 256. This parameter can be
    changed using the command::
 
-   ethtool -G eth? rx n
+     ethtool -G eth? rx n
 
    Where n is the number of desired Rx descriptors.
 
-Tx Descriptors: Number of transmit descriptors. A transmit descriptor is a data
+Tx Descriptors:
+   Number of transmit descriptors. A transmit descriptor is a data
    structure that describes a transmit buffer and its attributes to the network
    controller. The data in the descriptor is used by the controller to read
    data from the host memory to the controller. In the 3.x.x driver the valid
    range for this parameter is 64-256. The default value is 128. This parameter
    can be changed using the command::
 
-   ethtool -G eth? tx n
+     ethtool -G eth? tx n
 
    Where n is the number of desired Tx descriptors.
 
-Speed/Duplex: The driver auto-negotiates the link speed and duplex settings by
+Speed/Duplex:
+   The driver auto-negotiates the link speed and duplex settings by
    default. The ethtool utility can be used as follows to force speed/duplex.::
 
-   ethtool -s eth?  autoneg off speed {10|100} duplex {full|half}
+     ethtool -s eth?  autoneg off speed {10|100} duplex {full|half}
 
    NOTE: setting the speed/duplex to incorrect values will cause the link to
    fail.
 
-Event Log Message Level:  The driver uses the message level flag to log events
+Event Log Message Level:
+   The driver uses the message level flag to log events
    to syslog. The message level can be set at driver load time. It can also be
    set using the command::
 
-   ethtool -s eth? msglvl n
+     ethtool -s eth? msglvl n
 
 
 Additional Configurations
@@ -92,7 +96,7 @@ Configuring the Driver on Different Distributions
 
 Configuring a network driver to load properly when the system is started
 is distribution dependent.  Typically, the configuration process involves
-adding an alias line to /etc/modprobe.d/*.conf as well as editing other
+adding an alias line to `/etc/modprobe.d/*.conf` as well as editing other
 system startup scripts and/or configuration files.  Many popular Linux
 distributions ship with tools to make these changes for you.  To learn
 the proper way to configure a network device for your system, refer to
@@ -160,7 +164,10 @@ This results in unbalanced receive traffic.
 If you have multiple interfaces in a server, either turn on ARP
 filtering by
 
-(1) entering:: echo 1 > /proc/sys/net/ipv4/conf/all/arp_filter
+(1) entering::
+
+        echo 1 > /proc/sys/net/ipv4/conf/all/arp_filter
+
     (this only works if your kernel's version is higher than 2.4.5), or
 
 (2) installing the interfaces in separate broadcast domains (either
diff --git a/Documentation/networking/e1000.rst b/Documentation/networking/e1000.rst
index 144b87eef153..f10dd4086921 100644
--- a/Documentation/networking/e1000.rst
+++ b/Documentation/networking/e1000.rst
@@ -34,7 +34,8 @@ Command Line Parameters
 The default value for each parameter is generally the recommended setting,
 unless otherwise noted.
 
-NOTES:  For more information about the AutoNeg, Duplex, and Speed
+NOTES:
+        For more information about the AutoNeg, Duplex, and Speed
         parameters, see the "Speed and Duplex Configuration" section in
         this document.
 
@@ -45,22 +46,27 @@ NOTES:  For more information about the AutoNeg, Duplex, and Speed
 
 AutoNeg
 -------
+
 (Supported only on adapters with copper connections)
-Valid Range:   0x01-0x0F, 0x20-0x2F
-Default Value: 0x2F
+
+:Valid Range:   0x01-0x0F, 0x20-0x2F
+:Default Value: 0x2F
 
 This parameter is a bit-mask that specifies the speed and duplex settings
 advertised by the adapter.  When this parameter is used, the Speed and
 Duplex parameters must not be specified.
 
-NOTE:  Refer to the Speed and Duplex section of this readme for more
+NOTE:
+       Refer to the Speed and Duplex section of this readme for more
        information on the AutoNeg parameter.
 
 Duplex
 ------
+
 (Supported only on adapters with copper connections)
-Valid Range:   0-2 (0=auto-negotiate, 1=half, 2=full)
-Default Value: 0
+
+:Valid Range:   0-2 (0=auto-negotiate, 1=half, 2=full)
+:Default Value: 0
 
 This defines the direction in which data is allowed to flow.  Can be
 either one or two-directional.  If both Duplex and the link partner are
@@ -70,18 +76,22 @@ duplex.
 
 FlowControl
 -----------
-Valid Range:   0-3 (0=none, 1=Rx only, 2=Tx only, 3=Rx&Tx)
-Default Value: Reads flow control settings from the EEPROM
+
+:Valid Range:   0-3 (0=none, 1=Rx only, 2=Tx only, 3=Rx&Tx)
+:Default Value: Reads flow control settings from the EEPROM
 
 This parameter controls the automatic generation(Tx) and response(Rx)
 to Ethernet PAUSE frames.
 
 InterruptThrottleRate
 ---------------------
+
 (not supported on Intel(R) 82542, 82543 or 82544-based adapters)
-Valid Range:   0,1,3,4,100-100000 (0=off, 1=dynamic, 3=dynamic conservative,
-                                 4=simplified balancing)
-Default Value: 3
+
+:Valid Range:
+   0,1,3,4,100-100000 (0=off, 1=dynamic, 3=dynamic conservative,
+   4=simplified balancing)
+:Default Value: 3
 
 The driver can limit the amount of interrupts per second that the adapter
 will generate for incoming packets. It does this by writing a value to the
@@ -135,13 +145,15 @@ Setting InterruptThrottleRate to 0 turns off any interrupt moderation
 and may improve small packet latency, but is generally not suitable
 for bulk throughput traffic.
 
-NOTE:  InterruptThrottleRate takes precedence over the TxAbsIntDelay and
+NOTE:
+       InterruptThrottleRate takes precedence over the TxAbsIntDelay and
        RxAbsIntDelay parameters.  In other words, minimizing the receive
        and/or transmit absolute delays does not force the controller to
        generate more interrupts than what the Interrupt Throttle Rate
        allows.
 
-CAUTION:  If you are using the Intel(R) PRO/1000 CT Network Connection
+CAUTION:
+          If you are using the Intel(R) PRO/1000 CT Network Connection
           (controller 82547), setting InterruptThrottleRate to a value
           greater than 75,000, may hang (stop transmitting) adapters
           under certain network conditions.  If this occurs a NETDEV
@@ -151,7 +163,8 @@ CAUTION:  If you are using the Intel(R) PRO/1000 CT Network Connection
           hang, ensure that InterruptThrottleRate is set no greater
           than 75,000 and is not set to 0.
 
-NOTE:  When e1000 is loaded with default settings and multiple adapters
+NOTE:
+       When e1000 is loaded with default settings and multiple adapters
        are in use simultaneously, the CPU utilization may increase non-
        linearly.  In order to limit the CPU utilization without impacting
        the overall throughput, we recommend that you load the driver as
@@ -168,9 +181,11 @@ NOTE:  When e1000 is loaded with default settings and multiple adapters
 
 RxDescriptors
 -------------
-Valid Range:   48-256 for 82542 and 82543-based adapters
-               48-4096 for all other supported adapters
-Default Value: 256
+
+:Valid Range:
+ - 48-256 for 82542 and 82543-based adapters
+ - 48-4096 for all other supported adapters
+:Default Value: 256
 
 This value specifies the number of receive buffer descriptors allocated
 by the driver.  Increasing this value allows the driver to buffer more
@@ -180,15 +195,17 @@ Each descriptor is 16 bytes.  A receive buffer is also allocated for each
 descriptor and can be either 2048, 4096, 8192, or 16384 bytes, depending
 on the MTU setting. The maximum MTU size is 16110.
 
-NOTE:  MTU designates the frame size.  It only needs to be set for Jumbo
+NOTE:
+       MTU designates the frame size.  It only needs to be set for Jumbo
        Frames.  Depending on the available system resources, the request
        for a higher number of receive descriptors may be denied.  In this
        case, use a lower number.
 
 RxIntDelay
 ----------
-Valid Range:   0-65535 (0=off)
-Default Value: 0
+
+:Valid Range:   0-65535 (0=off)
+:Default Value: 0
 
 This value delays the generation of receive interrupts in units of 1.024
 microseconds.  Receive interrupt reduction can improve CPU efficiency if
@@ -198,7 +215,8 @@ of TCP traffic.  If the system is reporting dropped receives, this value
 may be set too high, causing the driver to run out of available receive
 descriptors.
 
-CAUTION:  When setting RxIntDelay to a value other than 0, adapters may
+CAUTION:
+          When setting RxIntDelay to a value other than 0, adapters may
           hang (stop transmitting) under certain network conditions.  If
           this occurs a NETDEV WATCHDOG message is logged in the system
           event log.  In addition, the controller is automatically reset,
@@ -207,9 +225,11 @@ CAUTION:  When setting RxIntDelay to a value other than 0, adapters may
 
 RxAbsIntDelay
 -------------
+
 (This parameter is supported only on 82540, 82545 and later adapters.)
-Valid Range:   0-65535 (0=off)
-Default Value: 128
+
+:Valid Range:   0-65535 (0=off)
+:Default Value: 128
 
 This value, in units of 1.024 microseconds, limits the delay in which a
 receive interrupt is generated.  Useful only if RxIntDelay is non-zero,
@@ -220,9 +240,11 @@ conditions.
 
 Speed
 -----
+
 (This parameter is supported only on adapters with copper connections.)
-Valid Settings: 0, 10, 100, 1000
-Default Value:  0 (auto-negotiate at all supported speeds)
+
+:Valid Settings: 0, 10, 100, 1000
+:Default Value:  0 (auto-negotiate at all supported speeds)
 
 Speed forces the line speed to the specified value in megabits per second
 (Mbps).  If this parameter is not specified or is set to 0 and the link
@@ -231,22 +253,26 @@ speed.  Duplex should also be set when Speed is set to either 10 or 100.
 
 TxDescriptors
 -------------
-Valid Range:   48-256 for 82542 and 82543-based adapters
-               48-4096 for all other supported adapters
-Default Value: 256
+
+:Valid Range:
+  - 48-256 for 82542 and 82543-based adapters
+  - 48-4096 for all other supported adapters
+:Default Value: 256
 
 This value is the number of transmit descriptors allocated by the driver.
 Increasing this value allows the driver to queue more transmits.  Each
 descriptor is 16 bytes.
 
-NOTE:  Depending on the available system resources, the request for a
+NOTE:
+       Depending on the available system resources, the request for a
        higher number of transmit descriptors may be denied.  In this case,
        use a lower number.
 
 TxIntDelay
 ----------
-Valid Range:   0-65535 (0=off)
-Default Value: 8
+
+:Valid Range:   0-65535 (0=off)
+:Default Value: 8
 
 This value delays the generation of transmit interrupts in units of
 1.024 microseconds.  Transmit interrupt reduction can improve CPU
@@ -256,9 +282,11 @@ causing the driver to run out of available transmit descriptors.
 
 TxAbsIntDelay
 -------------
+
 (This parameter is supported only on 82540, 82545 and later adapters.)
-Valid Range:   0-65535 (0=off)
-Default Value: 32
+
+:Valid Range:   0-65535 (0=off)
+:Default Value: 32
 
 This value, in units of 1.024 microseconds, limits the delay in which a
 transmit interrupt is generated.  Useful only if TxIntDelay is non-zero,
@@ -269,18 +297,21 @@ network conditions.
 
 XsumRX
 ------
+
 (This parameter is NOT supported on the 82542-based adapter.)
-Valid Range:   0-1
-Default Value: 1
+
+:Valid Range:   0-1
+:Default Value: 1
 
 A value of '1' indicates that the driver should enable IP checksum
 offload for received packets (both UDP and TCP) to the adapter hardware.
 
 Copybreak
 ---------
-Valid Range:   0-xxxxxxx (0=off)
-Default Value: 256
-Usage: modprobe e1000.ko copybreak=128
+
+:Valid Range:   0-xxxxxxx (0=off)
+:Default Value: 256
+:Usage: modprobe e1000.ko copybreak=128
 
 Driver copies all packets below or equaling this size to a fresh RX
 buffer before handing it up the stack.
@@ -292,8 +323,9 @@ it is also available during runtime at
 
 SmartPowerDownEnable
 --------------------
-Valid Range: 0-1
-Default Value:  0 (disabled)
+
+:Valid Range: 0-1
+:Default Value:  0 (disabled)
 
 Allows PHY to turn off in lower power states. The user can turn off
 this parameter in supported chipsets.
@@ -309,14 +341,14 @@ fiber interface board only links at 1000 Mbps full-duplex.
 
 For copper-based boards, the keywords interact as follows:
 
-  The default operation is auto-negotiate.  The board advertises all
+- The default operation is auto-negotiate.  The board advertises all
   supported speed and duplex combinations, and it links at the highest
   common speed and duplex mode IF the link partner is set to auto-negotiate.
 
-  If Speed = 1000, limited auto-negotiation is enabled and only 1000 Mbps
+- If Speed = 1000, limited auto-negotiation is enabled and only 1000 Mbps
   is advertised (The 1000BaseT spec requires auto-negotiation.)
 
-  If Speed = 10 or 100, then both Speed and Duplex should be set.  Auto-
+- If Speed = 10 or 100, then both Speed and Duplex should be set.  Auto-
   negotiation is disabled, and the AutoNeg parameter is ignored.  Partner
   SHOULD also be forced.
 
@@ -328,13 +360,15 @@ process.
 The parameter may be specified as either a decimal or hexadecimal value as
 determined by the bitmap below.
 
+============== ====== ====== ======= ======= ====== ====== ======= ======
 Bit position   7      6      5       4       3      2      1       0
 Decimal Value  128    64     32      16      8      4      2       1
 Hex value      80     40     20      10      8      4      2       1
 Speed (Mbps)   N/A    N/A    1000    N/A     100    100    10      10
 Duplex                       Full            Full   Half   Full    Half
+============== ====== ====== ======= ======= ====== ====== ======= ======
 
-Some examples of using AutoNeg:
+Some examples of using AutoNeg::
 
   modprobe e1000 AutoNeg=0x01 (Restricts autonegotiation to 10 Half)
   modprobe e1000 AutoNeg=1 (Same as above)
@@ -357,56 +391,59 @@ Additional Configurations
 
 Jumbo Frames
 ------------
-Jumbo Frames support is enabled by changing the MTU to a value larger
-than the default of 1500.  Use the ifconfig command to increase the MTU
-size.  For example::
+
+  Jumbo Frames support is enabled by changing the MTU to a value larger than
+  the default of 1500.  Use the ifconfig command to increase the MTU size.
+  For example::
 
        ifconfig eth<x> mtu 9000 up
 
-This setting is not saved across reboots.  It can be made permanent if
-you add::
+  This setting is not saved across reboots.  It can be made permanent if
+  you add::
 
        MTU=9000
 
-to the file /etc/sysconfig/network-scripts/ifcfg-eth<x>.  This example
-applies to the Red Hat distributions; other distributions may store this
-setting in a different location.
+  to the file /etc/sysconfig/network-scripts/ifcfg-eth<x>.  This example
+  applies to the Red Hat distributions; other distributions may store this
+  setting in a different location.
+
+Notes:
+  Degradation in throughput performance may be observed in some Jumbo frames
+  environments. If this is observed, increasing the application's socket buffer
+  size and/or increasing the /proc/sys/net/ipv4/tcp_*mem entry values may help.
+  See the specific application manual and /usr/src/linux*/Documentation/
+  networking/ip-sysctl.txt for more details.
 
-Notes: Degradation in throughput performance may be observed in some
-Jumbo frames environments.  If this is observed, increasing the
-application's socket buffer size and/or increasing the
-/proc/sys/net/ipv4/tcp_*mem entry values may help.  See the specific
-application manual and /usr/src/linux*/Documentation/
-networking/ip-sysctl.txt for more details.
+  - The maximum MTU setting for Jumbo Frames is 16110.  This value coincides
+    with the maximum Jumbo Frames size of 16128.
 
-- The maximum MTU setting for Jumbo Frames is 16110.  This value
-  coincides with the maximum Jumbo Frames size of 16128.
+  - Using Jumbo frames at 10 or 100 Mbps is not supported and may result in
+    poor performance or loss of link.
 
-- Using Jumbo frames at 10 or 100 Mbps is not supported and may result
-  in poor performance or loss of link.
+  - Adapters based on the Intel(R) 82542 and 82573V/E controller do not
+    support Jumbo Frames. These correspond to the following product names::
 
-- Adapters based on the Intel(R) 82542 and 82573V/E controller do not
-  support Jumbo Frames.  These correspond to the following product names:
-  Intel(R) PRO/1000 Gigabit Server Adapter Intel(R) PRO/1000 PM Network
-  Connection
+     Intel(R) PRO/1000 Gigabit Server Adapter
+     Intel(R) PRO/1000 PM Network Connection
 
 ethtool
 -------
-The driver utilizes the ethtool interface for driver configuration and
-diagnostics, as well as displaying statistical information.  The ethtool
-version 1.6 or later is required for this functionality.
 
-The latest release of ethtool can be found from
-https://www.kernel.org/pub/software/network/ethtool/
+  The driver utilizes the ethtool interface for driver configuration and
+  diagnostics, as well as displaying statistical information.  The ethtool
+  version 1.6 or later is required for this functionality.
+
+  The latest release of ethtool can be found from
+  https://www.kernel.org/pub/software/network/ethtool/
 
 Enabling Wake on LAN* (WoL)
 ---------------------------
-WoL is configured through the ethtool* utility.
 
-WoL will be enabled on the system during the next shut down or reboot.
-For this driver version, in order to enable WoL, the e1000 driver must be
-loaded when shutting down or rebooting the system.
+  WoL is configured through the ethtool* utility.
 
+  WoL will be enabled on the system during the next shut down or reboot.
+  For this driver version, in order to enable WoL, the e1000 driver must be
+  loaded when shutting down or rebooting the system.
 
 Support
 =======
diff --git a/MAINTAINERS b/MAINTAINERS
index 192d7f73fd01..0fe4228f78cb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2523,7 +2523,7 @@ S:	Supported
 F:      drivers/scsi/esas2r
 
 ATUSB IEEE 802.15.4 RADIO DRIVER
-M:      Stefan Schmidt <stefan@osg.samsung.com>
+M:      Stefan Schmidt <stefan@datenfreihafen.org>
 L:      linux-wpan@vger.kernel.org
 S:      Maintained
 F:      drivers/net/ieee802154/atusb.c
@@ -5790,7 +5790,6 @@ F:	include/linux/fsl/
 
 FREESCALE SOC FS_ENET DRIVER
 M:      Pantelis Antoniou <pantelis.antoniou@gmail.com>
-M:      Vitaly Bordug <vbordug@ru.mvista.com>
 L:      linuxppc-dev@lists.ozlabs.org
 L:      netdev@vger.kernel.org
 S:      Maintained
@@ -6909,7 +6908,7 @@ F:	drivers/clk/clk-versaclock5.c
 
 IEEE 802.15.4 SUBSYSTEM
 M:      Alexander Aring <alex.aring@gmail.com>
-M:      Stefan Schmidt <stefan@osg.samsung.com>
+M:      Stefan Schmidt <stefan@datenfreihafen.org>
 L:      linux-wpan@vger.kernel.org
 W:      http://wpan.cakelab.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan.git
@@ -8629,7 +8628,7 @@ MARVELL MWIFIEX WIRELESS DRIVER
 M:      Amitkumar Karwar <amitkarwar@gmail.com>
 M:      Nishant Sarmukadam <nishants@marvell.com>
 M:      Ganapathi Bhat <gbhat@marvell.com>
-M:      Xinming Hu <huxm@marvell.com>
+M:      Xinming Hu <huxinming820@gmail.com>
 L:      linux-wireless@vger.kernel.org
 S:      Maintained
 F:      drivers/net/wireless/marvell/mwifiex/
@@ -9075,7 +9074,7 @@ S:	Maintained
 F:      drivers/usb/mtu3/
 
 MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
-M:      Peter Senna Tschudin <peter.senna@collabora.com>
+M:      Peter Senna Tschudin <peter.senna@gmail.com>
 M:      Martin Donnelly <martin.donnelly@ge.com>
 M:      Martyn Welch <martyn.welch@collabora.co.uk>
 S:      Maintained
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index e81bcd271be7..9cf59fc60eab 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -413,7 +413,7 @@ config ARC_HAS_DIV_REM
 
 config ARC_HAS_ACCL_REGS
         bool "Reg Pair ACCL:ACCH (FPU and/or MPY > 6)"
-        default n
+        default y
         help
           Depending on the configuration, CPU can contain accumulator reg-pair
           (also referred to as r58:r59). These can also be used by gcc as GPR so
diff --git a/arch/arc/Makefile b/arch/arc/Makefile
index d37f49d6a27f..6c1b20dd76ad 100644
--- a/arch/arc/Makefile
+++ b/arch/arc/Makefile
@@ -16,7 +16,7 @@ endif
 
 KBUILD_DEFCONFIG := nsim_700_defconfig
 
-cflags-y        += -fno-common -pipe -fno-builtin -D__linux__
+cflags-y        += -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__
 cflags-$(CONFIG_ISA_ARCOMPACT)  += -mA7
 cflags-$(CONFIG_ISA_ARCV2)      += -mcpu=archs
 
@@ -140,16 +140,3 @@ dtbs: scripts
 
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
-
-# Hacks to enable final link due to absence of link-time branch relexation
-# and gcc choosing optimal(shorter) branches at -O3
-#
-# vineetg Feb 2010: -mlong-calls switched off for overall kernel build
-# However lib/decompress_inflate.o (.init.text) calls
-# zlib_inflate_workspacesize (.text) causing relocation errors.
-# Thus forcing all exten calls in this file to be long calls
-export CFLAGS_decompress_inflate.o = -mmedium-calls
-export CFLAGS_initramfs.o = -mmedium-calls
-ifdef CONFIG_SMP
-export CFLAGS_core.o = -mmedium-calls
-endif
diff --git a/arch/arc/configs/axs101_defconfig b/arch/arc/configs/axs101_defconfig
index 09f85154c5a4..a635ea972304 100644
--- a/arch/arc/configs/axs101_defconfig
+++ b/arch/arc/configs/axs101_defconfig
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
 # CONFIG_PID_NS is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="../arc_initramfs/"
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_VM_EVENT_COUNTERS is not set
diff --git a/arch/arc/configs/axs103_defconfig b/arch/arc/configs/axs103_defconfig
index 09fed3ef22b6..aa507e423075 100644
--- a/arch/arc/configs/axs103_defconfig
+++ b/arch/arc/configs/axs103_defconfig
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
 # CONFIG_PID_NS is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_VM_EVENT_COUNTERS is not set
diff --git a/arch/arc/configs/axs103_smp_defconfig b/arch/arc/configs/axs103_smp_defconfig
index ea2f6d817d1a..eba07f468654 100644
--- a/arch/arc/configs/axs103_smp_defconfig
+++ b/arch/arc/configs/axs103_smp_defconfig
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
 # CONFIG_PID_NS is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_VM_EVENT_COUNTERS is not set
diff --git a/arch/arc/configs/haps_hs_defconfig b/arch/arc/configs/haps_hs_defconfig
index ab231c040efe..098b19fbaa51 100644
--- a/arch/arc/configs/haps_hs_defconfig
+++ b/arch/arc/configs/haps_hs_defconfig
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
 # CONFIG_PID_NS is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"
 CONFIG_EXPERT=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_COMPAT_BRK is not set
diff --git a/arch/arc/configs/haps_hs_smp_defconfig b/arch/arc/configs/haps_hs_smp_defconfig
index cf449cbf440d..0104c404d897 100644
--- a/arch/arc/configs/haps_hs_smp_defconfig
+++ b/arch/arc/configs/haps_hs_smp_defconfig
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
 # CONFIG_PID_NS is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_VM_EVENT_COUNTERS is not set
diff --git a/arch/arc/configs/hsdk_defconfig b/arch/arc/configs/hsdk_defconfig
index 1b54c72f4296..6491be0ddbc9 100644
--- a/arch/arc/configs/hsdk_defconfig
+++ b/arch/arc/configs/hsdk_defconfig
@@ -9,7 +9,6 @@ CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
 # CONFIG_PID_NS is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_VM_EVENT_COUNTERS is not set
diff --git a/arch/arc/configs/nsim_700_defconfig b/arch/arc/configs/nsim_700_defconfig
index 31c2c70b34a1..99e05cf63fca 100644
--- a/arch/arc/configs/nsim_700_defconfig
+++ b/arch/arc/configs/nsim_700_defconfig
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
 # CONFIG_PID_NS is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="../arc_initramfs/"
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
diff --git a/arch/arc/configs/nsim_hs_defconfig b/arch/arc/configs/nsim_hs_defconfig
index a578c721d50f..0dc4f9b737e7 100644
--- a/arch/arc/configs/nsim_hs_defconfig
+++ b/arch/arc/configs/nsim_hs_defconfig
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
 # CONFIG_PID_NS is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
diff --git a/arch/arc/configs/nsim_hs_smp_defconfig b/arch/arc/configs/nsim_hs_smp_defconfig
index 37d7395f3272..be3c30a15e54 100644
--- a/arch/arc/configs/nsim_hs_smp_defconfig
+++ b/arch/arc/configs/nsim_hs_smp_defconfig
@@ -9,7 +9,6 @@ CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
 # CONFIG_PID_NS is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/"
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
diff --git a/arch/arc/configs/nsimosci_defconfig b/arch/arc/configs/nsimosci_defconfig
index 1e1470e2a7f0..3a74b9b21772 100644
--- a/arch/arc/configs/nsimosci_defconfig
+++ b/arch/arc/configs/nsimosci_defconfig
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
 # CONFIG_PID_NS is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="../arc_initramfs/"
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
diff --git a/arch/arc/configs/nsimosci_hs_defconfig b/arch/arc/configs/nsimosci_hs_defconfig
index 084a6e42685b..ea2834b4dc1d 100644
--- a/arch/arc/configs/nsimosci_hs_defconfig
+++ b/arch/arc/configs/nsimosci_hs_defconfig
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
 # CONFIG_PID_NS is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/"
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
diff --git a/arch/arc/configs/nsimosci_hs_smp_defconfig b/arch/arc/configs/nsimosci_hs_smp_defconfig
index f36d47990415..80a5a1b4924b 100644
--- a/arch/arc/configs/nsimosci_hs_smp_defconfig
+++ b/arch/arc/configs/nsimosci_hs_smp_defconfig
@@ -9,7 +9,6 @@ CONFIG_IKCONFIG_PROC=y
 # CONFIG_UTS_NS is not set
 # CONFIG_PID_NS is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/"
 CONFIG_PERF_EVENTS=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_KPROBES=y
diff --git a/arch/arc/configs/tb10x_defconfig b/arch/arc/configs/tb10x_defconfig
index 1aca2e8fd1ba..2cc87f909747 100644
--- a/arch/arc/configs/tb10x_defconfig
+++ b/arch/arc/configs/tb10x_defconfig
@@ -56,7 +56,6 @@ CONFIG_STMMAC_ETH=y
 # CONFIG_INPUT is not set
 # CONFIG_SERIO is not set
 # CONFIG_VT is not set
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_DEVKMEM is not set
 CONFIG_SERIAL_8250=y
diff --git a/arch/arc/include/asm/entry-compact.h b/arch/arc/include/asm/entry-compact.h
index ec36d5b6d435..29f3988c9424 100644
--- a/arch/arc/include/asm/entry-compact.h
+++ b/arch/arc/include/asm/entry-compact.h
@@ -234,6 +234,9 @@
         POP     gp
         RESTORE_R12_TO_R0
 
+#ifdef CONFIG_ARC_CURR_IN_REG
+        ld      r25, [sp, 12]
+#endif
         ld  sp, [sp] /* restore original sp */
         /* orig_r0, ECR, user_r25 skipped automatically */
 .endm
@@ -315,6 +318,9 @@
         POP     gp
         RESTORE_R12_TO_R0
 
+#ifdef CONFIG_ARC_CURR_IN_REG
+        ld      r25, [sp, 12]
+#endif
         ld  sp, [sp] /* restore original sp */
         /* orig_r0, ECR, user_r25 skipped automatically */
 .endm
diff --git a/arch/arc/include/asm/entry.h b/arch/arc/include/asm/entry.h
index 51597f344a62..302b0db8ea2b 100644
--- a/arch/arc/include/asm/entry.h
+++ b/arch/arc/include/asm/entry.h
@@ -86,9 +86,6 @@
         POP     r1
         POP     r0
 
-#ifdef CONFIG_ARC_CURR_IN_REG
-        ld      r25, [sp, 12]
-#endif
 .endm
 
 /*--------------------------------------------------------------
diff --git a/arch/arc/include/asm/mach_desc.h b/arch/arc/include/asm/mach_desc.h
index c28e6c347b49..871f3cb16af9 100644
--- a/arch/arc/include/asm/mach_desc.h
+++ b/arch/arc/include/asm/mach_desc.h
@@ -34,9 +34,7 @@ struct machine_desc {
         const char              *name;
         const char              **dt_compat;
         void                    (*init_early)(void);
-#ifdef CONFIG_SMP
         void                    (*init_per_cpu)(unsigned int);
-#endif
         void                    (*init_machine)(void);
         void                    (*init_late)(void);
 
diff --git a/arch/arc/include/asm/page.h b/arch/arc/include/asm/page.h
index 109baa06831c..09ddddf71cc5 100644
--- a/arch/arc/include/asm/page.h
+++ b/arch/arc/include/asm/page.h
@@ -105,7 +105,7 @@ typedef pte_t * pgtable_t;
 #define virt_addr_valid(kaddr)  pfn_valid(virt_to_pfn(kaddr))
 
 /* Default Permissions for stack/heaps pages (Non Executable) */
-#define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE)
+#define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
 
 #define WANT_PAGE_VIRTUAL   1
 
diff --git a/arch/arc/include/asm/pgtable.h b/arch/arc/include/asm/pgtable.h
index 8ec5599a0957..cf4be70d5892 100644
--- a/arch/arc/include/asm/pgtable.h
+++ b/arch/arc/include/asm/pgtable.h
@@ -377,7 +377,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
 
 /* Decode a PTE containing swap "identifier "into constituents */
 #define __swp_type(pte_lookalike)       (((pte_lookalike).val) & 0x1f)
-#define __swp_offset(pte_lookalike)     ((pte_lookalike).val << 13)
+#define __swp_offset(pte_lookalike)     ((pte_lookalike).val >> 13)
 
 /* NOPs, to keep generic kernel happy */
 #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
diff --git a/arch/arc/kernel/irq.c b/arch/arc/kernel/irq.c
index 538b36afe89e..62b185057c04 100644
--- a/arch/arc/kernel/irq.c
+++ b/arch/arc/kernel/irq.c
@@ -31,10 +31,10 @@ void __init init_IRQ(void)
         /* a SMP H/w block could do IPI IRQ request here */
         if (plat_smp_ops.init_per_cpu)
                 plat_smp_ops.init_per_cpu(smp_processor_id());
+#endif
 
         if (machine_desc->init_per_cpu)
                 machine_desc->init_per_cpu(smp_processor_id());
-#endif
 }
 
 /*
diff --git a/arch/arc/kernel/process.c b/arch/arc/kernel/process.c
index 5ac3b547453f..4674541eba3f 100644
--- a/arch/arc/kernel/process.c
+++ b/arch/arc/kernel/process.c
@@ -47,7 +47,8 @@ SYSCALL_DEFINE0(arc_gettls)
 SYSCALL_DEFINE3(arc_usr_cmpxchg, int *, uaddr, int, expected, int, new)
 {
         struct pt_regs *regs = current_pt_regs();
-        int uval = -EFAULT;
+        u32 uval;
+        int ret;
 
         /*
          * This is only for old cores lacking LLOCK/SCOND, which by defintion
@@ -60,23 +61,47 @@ SYSCALL_DEFINE3(arc_usr_cmpxchg, int *, uaddr, int, expected, int, new)
         /* Z indicates to userspace if operation succeded */
         regs->status32 &= ~STATUS_Z_MASK;
 
-        if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
-                return -EFAULT;
+        ret = access_ok(VERIFY_WRITE, uaddr, sizeof(*uaddr));
+        if (!ret)
+                 goto fail;
 
+again:
         preempt_disable();
 
-        if (__get_user(uval, uaddr))
-                goto done;
+        ret = __get_user(uval, uaddr);
+        if (ret)
+                 goto fault;
 
-        if (uval == expected) {
-                if (!__put_user(new, uaddr))
-                        regs->status32 |= STATUS_Z_MASK;
-        }
+        if (uval != expected)
+                 goto out;
 
-done:
-        preempt_enable();
+        ret = __put_user(new, uaddr);
+        if (ret)
+                 goto fault;
+
+        regs->status32 |= STATUS_Z_MASK;
 
+out:
+        preempt_enable();
         return uval;
+
+fault:
+        preempt_enable();
+
+        if (unlikely(ret != -EFAULT))
+                 goto fail;
+
+        down_read(&current->mm->mmap_sem);
+        ret = fixup_user_fault(current, current->mm, (unsigned long) uaddr,
+                               FAULT_FLAG_WRITE, NULL);
+        up_read(&current->mm->mmap_sem);
+
+        if (likely(!ret))
+                 goto again;
+
+fail:
+        force_sig(SIGSEGV, current);
+        return ret;
 }
 
 #ifdef CONFIG_ISA_ARCV2
diff --git a/arch/arc/plat-hsdk/Kconfig b/arch/arc/plat-hsdk/Kconfig
index 19ab3cf98f0f..9356753c2ed8 100644
--- a/arch/arc/plat-hsdk/Kconfig
+++ b/arch/arc/plat-hsdk/Kconfig
@@ -7,5 +7,8 @@
 
 menuconfig ARC_SOC_HSDK
         bool "ARC HS Development Kit SOC"
+        depends on ISA_ARCV2
+        select ARC_HAS_ACCL_REGS
         select CLK_HSDK
         select RESET_HSDK
+        select MIGHT_HAVE_PCI
diff --git a/arch/arc/plat-hsdk/platform.c b/arch/arc/plat-hsdk/platform.c
index 2958aedb649a..2588b842407c 100644
--- a/arch/arc/plat-hsdk/platform.c
+++ b/arch/arc/plat-hsdk/platform.c
@@ -42,6 +42,66 @@ static void __init hsdk_init_per_cpu(unsigned int cpu)
 #define SDIO_UHS_REG_EXT        (SDIO_BASE + 0x108)
 #define SDIO_UHS_REG_EXT_DIV_2  (2 << 30)
 
+#define HSDK_GPIO_INTC          (ARC_PERIPHERAL_BASE + 0x3000)
+
+static void __init hsdk_enable_gpio_intc_wire(void)
+{
+        /*
+         * Peripherals on CPU Card are wired to cpu intc via intermediate
+         * DW APB GPIO blocks (mainly for debouncing)
+         *
+         *         ---------------------
+         *        |  snps,archs-intc  |
+         *        ---------------------
+         *                  |
+         *        ----------------------
+         *        | snps,archs-idu-intc |
+         *        ----------------------
+         *         |   |     |   |    |
+         *         | [eth] [USB]    [... other peripherals]
+         *         |
+         * -------------------
+         * | snps,dw-apb-intc |
+         * -------------------
+         *  |      |   |   |
+         * [Bt] [HAPS]   [... other peripherals]
+         *
+         * Current implementation of "irq-dw-apb-ictl" driver doesn't work well
+         * with stacked INTCs. In particular problem happens if its master INTC
+         * not yet instantiated. See discussion here -
+         * https://lkml.org/lkml/2015/3/4/755
+         *
+         * So setup the first gpio block as a passive pass thru and hide it from
+         * DT hardware topology - connect intc directly to cpu intc
+         * The GPIO "wire" needs to be init nevertheless (here)
+         *
+         * One side adv is that peripheral interrupt handling avoids one nested
+         * intc ISR hop
+         *
+         * According to HSDK User's Manual [1], "Table 2 Interrupt Mapping"
+         * we have the following GPIO input lines used as sources of interrupt:
+         * - GPIO[0] - Bluetooth interrupt of RS9113 module
+         * - GPIO[2] - HAPS interrupt (on HapsTrak 3 connector)
+         * - GPIO[3] - Audio codec (MAX9880A) interrupt
+         * - GPIO[8-23] - Available on Arduino and PMOD_x headers
+         * For now there's no use of Arduino and PMOD_x headers in Linux
+         * use-case so we only enable lines 0, 2 and 3.
+         *
+         * [1] https://github.com/foss-for-synopsys-dwc-arc-processors/ARC-Development-Systems-Forum/wiki/docs/ARC_HSDK_User_Guide.pdf
+         */
+#define GPIO_INTEN              (HSDK_GPIO_INTC + 0x30)
+#define GPIO_INTMASK            (HSDK_GPIO_INTC + 0x34)
+#define GPIO_INTTYPE_LEVEL      (HSDK_GPIO_INTC + 0x38)
+#define GPIO_INT_POLARITY       (HSDK_GPIO_INTC + 0x3c)
+#define GPIO_INT_CONNECTED_MASK 0x0d
+
+        iowrite32(0xffffffff, (void __iomem *) GPIO_INTMASK);
+        iowrite32(~GPIO_INT_CONNECTED_MASK, (void __iomem *) GPIO_INTMASK);
+        iowrite32(0x00000000, (void __iomem *) GPIO_INTTYPE_LEVEL);
+        iowrite32(0xffffffff, (void __iomem *) GPIO_INT_POLARITY);
+        iowrite32(GPIO_INT_CONNECTED_MASK, (void __iomem *) GPIO_INTEN);
+}
+
 static void __init hsdk_init_early(void)
 {
         /*
@@ -62,6 +122,8 @@ static void __init hsdk_init_early(void)
          * minimum possible div-by-2.
          */
         iowrite32(SDIO_UHS_REG_EXT_DIV_2, (void __iomem *) SDIO_UHS_REG_EXT);
+
+        hsdk_enable_gpio_intc_wire();
 }
 
 static const char *hsdk_compat[] __initconst = {
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 3b38c717008a..46bff1661836 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -2278,17 +2278,15 @@ pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t
         DPRINT(("smpl_buf @%p\n", smpl_buf));
 
         /* allocate vma */
-        vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
+        vma = vm_area_alloc(mm);
         if (!vma) {
                 DPRINT(("Cannot allocate vma\n"));
                 goto error_kmem;
         }
-        INIT_LIST_HEAD(&vma->anon_vma_chain);
 
         /*
          * partially initialize the vma for the sampling buffer
          */
-        vma->vm_mm           = mm;
         vma->vm_file         = get_file(filp);
         vma->vm_flags        = VM_READ|VM_MAYREAD|VM_DONTEXPAND|VM_DONTDUMP;
         vma->vm_page_prot    = PAGE_READONLY; /* XXX may need to change */
@@ -2346,7 +2344,7 @@ pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t
         return 0;
 
 error:
-        kmem_cache_free(vm_area_cachep, vma);
+        vm_area_free(vma);
 error_kmem:
         pfm_rvfree(smpl_buf, size);
 
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 18278b448530..bdb14a369137 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -114,10 +114,8 @@ ia64_init_addr_space (void)
          * the problem.  When the process attempts to write to the register backing store
          * for the first time, it will get a SEGFAULT in this case.
          */
-        vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
+        vma = vm_area_alloc(current->mm);
         if (vma) {
-                INIT_LIST_HEAD(&vma->anon_vma_chain);
-                vma->vm_mm = current->mm;
                 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
                 vma->vm_end = vma->vm_start + PAGE_SIZE;
                 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
@@ -125,7 +123,7 @@ ia64_init_addr_space (void)
                 down_write(&current->mm->mmap_sem);
                 if (insert_vm_struct(current->mm, vma)) {
                         up_write(&current->mm->mmap_sem);
-                        kmem_cache_free(vm_area_cachep, vma);
+                        vm_area_free(vma);
                         return;
                 }
                 up_write(&current->mm->mmap_sem);
@@ -133,10 +131,8 @@ ia64_init_addr_space (void)
 
         /* map NaT-page at address zero to speed up speculative dereferencing of NULL: */
         if (!(current->personality & MMAP_PAGE_ZERO)) {
-                vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
+                vma = vm_area_alloc(current->mm);
                 if (vma) {
-                        INIT_LIST_HEAD(&vma->anon_vma_chain);
-                        vma->vm_mm = current->mm;
                         vma->vm_end = PAGE_SIZE;
                         vma->vm_page_prot = __pgprot(pgprot_val(PAGE_READONLY) | _PAGE_MA_NAT);
                         vma->vm_flags = VM_READ | VM_MAYREAD | VM_IO |
@@ -144,7 +140,7 @@ ia64_init_addr_space (void)
                         down_write(&current->mm->mmap_sem);
                         if (insert_vm_struct(current->mm, vma)) {
                                 up_write(&current->mm->mmap_sem);
-                                kmem_cache_free(vm_area_cachep, vma);
+                                vm_area_free(vma);
                                 return;
                         }
                         up_write(&current->mm->mmap_sem);
diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig
index 6aed974276d8..34f7222c5efe 100644
--- a/arch/nds32/Kconfig
+++ b/arch/nds32/Kconfig
@@ -12,17 +12,17 @@ config NDS32
         select CLONE_BACKWARDS
         select COMMON_CLK
         select DMA_NONCOHERENT_OPS
-        select GENERIC_ASHLDI3
-        select GENERIC_ASHRDI3
-        select GENERIC_LSHRDI3
-        select GENERIC_CMPDI2
-        select GENERIC_MULDI3
-        select GENERIC_UCMPDI2
         select GENERIC_ATOMIC64
         select GENERIC_CPU_DEVICES
         select GENERIC_CLOCKEVENTS
         select GENERIC_IRQ_CHIP
         select GENERIC_IRQ_SHOW
+        select GENERIC_LIB_ASHLDI3
+        select GENERIC_LIB_ASHRDI3
+        select GENERIC_LIB_CMPDI2
+        select GENERIC_LIB_LSHRDI3
+        select GENERIC_LIB_MULDI3
+        select GENERIC_LIB_UCMPDI2
         select GENERIC_STRNCPY_FROM_USER
         select GENERIC_STRNLEN_USER
         select GENERIC_TIME_VSYSCALL
diff --git a/arch/nds32/Makefile b/arch/nds32/Makefile
index 513bb2e9baf9..031c676821ff 100644
--- a/arch/nds32/Makefile
+++ b/arch/nds32/Makefile
@@ -34,10 +34,12 @@ ifdef CONFIG_CPU_LITTLE_ENDIAN
 KBUILD_CFLAGS   += $(call cc-option, -EL)
 KBUILD_AFLAGS   += $(call cc-option, -EL)
 LDFLAGS         += $(call cc-option, -EL)
+CHECKFLAGS      += -D__NDS32_EL__
 else
 KBUILD_CFLAGS   += $(call cc-option, -EB)
 KBUILD_AFLAGS   += $(call cc-option, -EB)
 LDFLAGS         += $(call cc-option, -EB)
+CHECKFLAGS      += -D__NDS32_EB__
 endif
 
 boot := arch/nds32/boot
diff --git a/arch/nds32/include/asm/cacheflush.h b/arch/nds32/include/asm/cacheflush.h
index 10b48f0d8e85..8b26198d51bb 100644
--- a/arch/nds32/include/asm/cacheflush.h
+++ b/arch/nds32/include/asm/cacheflush.h
@@ -8,6 +8,8 @@
 
 #define PG_dcache_dirty PG_arch_1
 
+void flush_icache_range(unsigned long start, unsigned long end);
+void flush_icache_page(struct vm_area_struct *vma, struct page *page);
 #ifdef CONFIG_CPU_CACHE_ALIASING
 void flush_cache_mm(struct mm_struct *mm);
 void flush_cache_dup_mm(struct mm_struct *mm);
@@ -34,13 +36,16 @@ void flush_anon_page(struct vm_area_struct *vma,
 void flush_kernel_dcache_page(struct page *page);
 void flush_kernel_vmap_range(void *addr, int size);
 void invalidate_kernel_vmap_range(void *addr, int size);
-void flush_icache_range(unsigned long start, unsigned long end);
-void flush_icache_page(struct vm_area_struct *vma, struct page *page);
 #define flush_dcache_mmap_lock(mapping)   xa_lock_irq(&(mapping)->i_pages)
 #define flush_dcache_mmap_unlock(mapping) xa_unlock_irq(&(mapping)->i_pages)
 
 #else
 #include <asm-generic/cacheflush.h>
+#undef flush_icache_range
+#undef flush_icache_page
+#undef flush_icache_user_range
+void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
+                             unsigned long addr, int len);
 #endif
 
 #endif /* __NDS32_CACHEFLUSH_H__ */
diff --git a/arch/nds32/include/asm/futex.h b/arch/nds32/include/asm/futex.h
index eab5e84bd991..cb6cb91cfdf8 100644
--- a/arch/nds32/include/asm/futex.h
+++ b/arch/nds32/include/asm/futex.h
@@ -16,7 +16,7 @@
         "       .popsection\n"                                  \
         "       .pushsection .fixup,\"ax\"\n"                   \
         "4:     move    %0, " err_reg "\n"                      \
-        "       j       3b\n"                                   \
+        "       b       3b\n"                                   \
         "       .popsection"
 
 #define __futex_atomic_op(insn, ret, oldval, tmp, uaddr, oparg) \
diff --git a/arch/nds32/kernel/setup.c b/arch/nds32/kernel/setup.c
index 2f5b2ccebe47..63a1a5ef5219 100644
--- a/arch/nds32/kernel/setup.c
+++ b/arch/nds32/kernel/setup.c
@@ -278,7 +278,8 @@ static void __init setup_memory(void)
 
 void __init setup_arch(char **cmdline_p)
 {
-        early_init_devtree( __dtb_start);
+        early_init_devtree(__atags_pointer ? \
+                phys_to_virt(__atags_pointer) : __dtb_start);
 
         setup_cpuinfo();
 
diff --git a/arch/nds32/mm/cacheflush.c b/arch/nds32/mm/cacheflush.c
index ce8fd34497bf..254703653b6f 100644
--- a/arch/nds32/mm/cacheflush.c
+++ b/arch/nds32/mm/cacheflush.c
@@ -13,7 +13,39 @@
 
 extern struct cache_info L1_cache_info[2];
 
-#ifndef CONFIG_CPU_CACHE_ALIASING
+void flush_icache_range(unsigned long start, unsigned long end)
+{
+        unsigned long line_size, flags;
+        line_size = L1_cache_info[DCACHE].line_size;
+        start = start & ~(line_size - 1);
+        end = (end + line_size - 1) & ~(line_size - 1);
+        local_irq_save(flags);
+        cpu_cache_wbinval_range(start, end, 1);
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL(flush_icache_range);
+
+void flush_icache_page(struct vm_area_struct *vma, struct page *page)
+{
+        unsigned long flags;
+        unsigned long kaddr;
+        local_irq_save(flags);
+        kaddr = (unsigned long)kmap_atomic(page);
+        cpu_cache_wbinval_page(kaddr, vma->vm_flags & VM_EXEC);
+        kunmap_atomic((void *)kaddr);
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL(flush_icache_page);
+
+void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
+                             unsigned long addr, int len)
+{
+        unsigned long kaddr;
+        kaddr = (unsigned long)kmap_atomic(page) + (addr & ~PAGE_MASK);
+        flush_icache_range(kaddr, kaddr + len);
+        kunmap_atomic((void *)kaddr);
+}
+
 void update_mmu_cache(struct vm_area_struct *vma, unsigned long addr,
                       pte_t * pte)
 {
@@ -35,19 +67,15 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long addr,
 
         if ((test_and_clear_bit(PG_dcache_dirty, &page->flags)) ||
             (vma->vm_flags & VM_EXEC)) {
-
-                if (!PageHighMem(page)) {
-                        cpu_cache_wbinval_page((unsigned long)
-                                               page_address(page),
-                                               vma->vm_flags & VM_EXEC);
-                } else {
-                        unsigned long kaddr = (unsigned long)kmap_atomic(page);
-                        cpu_cache_wbinval_page(kaddr, vma->vm_flags & VM_EXEC);
-                        kunmap_atomic((void *)kaddr);
-                }
+                unsigned long kaddr;
+                local_irq_save(flags);
+                kaddr = (unsigned long)kmap_atomic(page);
+                cpu_cache_wbinval_page(kaddr, vma->vm_flags & VM_EXEC);
+                kunmap_atomic((void *)kaddr);
+                local_irq_restore(flags);
         }
 }
-#else
+#ifdef CONFIG_CPU_CACHE_ALIASING
 extern pte_t va_present(struct mm_struct *mm, unsigned long addr);
 
 static inline unsigned long aliasing(unsigned long addr, unsigned long page)
@@ -317,52 +345,4 @@ void invalidate_kernel_vmap_range(void *addr, int size)
         local_irq_restore(flags);
 }
 EXPORT_SYMBOL(invalidate_kernel_vmap_range);
-
-void flush_icache_range(unsigned long start, unsigned long end)
-{
-        unsigned long line_size, flags;
-        line_size = L1_cache_info[DCACHE].line_size;
-        start = start & ~(line_size - 1);
-        end = (end + line_size - 1) & ~(line_size - 1);
-        local_irq_save(flags);
-        cpu_cache_wbinval_range(start, end, 1);
-        local_irq_restore(flags);
-}
-EXPORT_SYMBOL(flush_icache_range);
-
-void flush_icache_page(struct vm_area_struct *vma, struct page *page)
-{
-        unsigned long flags;
-        local_irq_save(flags);
-        cpu_cache_wbinval_page((unsigned long)page_address(page),
-                               vma->vm_flags & VM_EXEC);
-        local_irq_restore(flags);
-}
-
-void update_mmu_cache(struct vm_area_struct *vma, unsigned long addr,
-                      pte_t * pte)
-{
-        struct page *page;
-        unsigned long flags;
-        unsigned long pfn = pte_pfn(*pte);
-
-        if (!pfn_valid(pfn))
-                return;
-
-        if (vma->vm_mm == current->active_mm) {
-                local_irq_save(flags);
-                __nds32__mtsr_dsb(addr, NDS32_SR_TLB_VPN);
-                __nds32__tlbop_rwr(*pte);
-                __nds32__isb();
-                local_irq_restore(flags);
-        }
-
-        page = pfn_to_page(pfn);
-        if (test_and_clear_bit(PG_dcache_dirty, &page->flags) ||
-            (vma->vm_flags & VM_EXEC)) {
-                local_irq_save(flags);
-                cpu_dcache_wbinval_page((unsigned long)page_address(page));
-                local_irq_restore(flags);
-        }
-}
 #endif
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 2ea575cb3401..fb96206de317 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -243,6 +243,7 @@ endif
 cpu-as-$(CONFIG_4xx)            += -Wa,-m405
 cpu-as-$(CONFIG_ALTIVEC)        += $(call as-option,-Wa$(comma)-maltivec)
 cpu-as-$(CONFIG_E200)           += -Wa,-me200
+cpu-as-$(CONFIG_E500)           += -Wa,-me500
 cpu-as-$(CONFIG_PPC_BOOK3S_64)  += -Wa,-mpower4
 cpu-as-$(CONFIG_PPC_E500MC)     += $(call as-option,-Wa$(comma)-me500mc)
 
diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h
index 896efa559996..79d570cbf332 100644
--- a/arch/powerpc/include/asm/mmu_context.h
+++ b/arch/powerpc/include/asm/mmu_context.h
@@ -35,9 +35,9 @@ extern struct mm_iommu_table_group_mem_t *mm_iommu_lookup_rm(
 extern struct mm_iommu_table_group_mem_t *mm_iommu_find(struct mm_struct *mm,
                 unsigned long ua, unsigned long entries);
 extern long mm_iommu_ua_to_hpa(struct mm_iommu_table_group_mem_t *mem,
-                unsigned long ua, unsigned long *hpa);
+                unsigned long ua, unsigned int pageshift, unsigned long *hpa);
 extern long mm_iommu_ua_to_hpa_rm(struct mm_iommu_table_group_mem_t *mem,
-                unsigned long ua, unsigned long *hpa);
+                unsigned long ua, unsigned int pageshift, unsigned long *hpa);
 extern long mm_iommu_mapped_inc(struct mm_iommu_table_group_mem_t *mem);
 extern void mm_iommu_mapped_dec(struct mm_iommu_table_group_mem_t *mem);
 #endif
diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S
index e734f6e45abc..689306118b48 100644
--- a/arch/powerpc/kernel/idle_book3s.S
+++ b/arch/powerpc/kernel/idle_book3s.S
@@ -144,7 +144,9 @@ power9_restore_additional_sprs:
         mtspr   SPRN_MMCR1, r4
 
         ld      r3, STOP_MMCR2(r13)
+        ld      r4, PACA_SPRG_VDSO(r13)
         mtspr   SPRN_MMCR2, r3
+        mtspr   SPRN_SPRG3, r4
         blr
 
 /*
diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c
index d066e37551ec..8c456fa691a5 100644
--- a/arch/powerpc/kvm/book3s_64_vio.c
+++ b/arch/powerpc/kvm/book3s_64_vio.c
@@ -449,7 +449,7 @@ long kvmppc_tce_iommu_do_map(struct kvm *kvm, struct iommu_table *tbl,
                 /* This only handles v2 IOMMU type, v1 is handled via ioctl() */
                 return H_TOO_HARD;
 
-        if (WARN_ON_ONCE(mm_iommu_ua_to_hpa(mem, ua, &hpa)))
+        if (WARN_ON_ONCE(mm_iommu_ua_to_hpa(mem, ua, tbl->it_page_shift, &hpa)))
                 return H_HARDWARE;
 
         if (mm_iommu_mapped_inc(mem))
diff --git a/arch/powerpc/kvm/book3s_64_vio_hv.c b/arch/powerpc/kvm/book3s_64_vio_hv.c
index 925fc316a104..5b298f5a1a14 100644
--- a/arch/powerpc/kvm/book3s_64_vio_hv.c
+++ b/arch/powerpc/kvm/book3s_64_vio_hv.c
@@ -279,7 +279,8 @@ static long kvmppc_rm_tce_iommu_do_map(struct kvm *kvm, struct iommu_table *tbl,
         if (!mem)
                 return H_TOO_HARD;
 
-        if (WARN_ON_ONCE_RM(mm_iommu_ua_to_hpa_rm(mem, ua, &hpa)))
+        if (WARN_ON_ONCE_RM(mm_iommu_ua_to_hpa_rm(mem, ua, tbl->it_page_shift,
+                        &hpa)))
                 return H_HARDWARE;
 
         pua = (void *) vmalloc_to_phys(pua);
@@ -469,7 +470,8 @@ long kvmppc_rm_h_put_tce_indirect(struct kvm_vcpu *vcpu,
 
                 mem = mm_iommu_lookup_rm(vcpu->kvm->mm, ua, IOMMU_PAGE_SIZE_4K);
                 if (mem)
-                        prereg = mm_iommu_ua_to_hpa_rm(mem, ua, &tces) == 0;
+                        prereg = mm_iommu_ua_to_hpa_rm(mem, ua,
+                                        IOMMU_PAGE_SHIFT_4K, &tces) == 0;
         }
 
         if (!prereg) {
diff --git a/arch/powerpc/mm/mmu_context_iommu.c b/arch/powerpc/mm/mmu_context_iommu.c
index abb43646927a..a4ca57612558 100644
--- a/arch/powerpc/mm/mmu_context_iommu.c
+++ b/arch/powerpc/mm/mmu_context_iommu.c
@@ -19,6 +19,7 @@
 #include <linux/hugetlb.h>
 #include <linux/swap.h>
 #include <asm/mmu_context.h>
+#include <asm/pte-walk.h>
 
 static DEFINE_MUTEX(mem_list_mutex);
 
@@ -27,6 +28,7 @@ struct mm_iommu_table_group_mem_t {
         struct rcu_head rcu;
         unsigned long used;
         atomic64_t mapped;
+        unsigned int pageshift;
         u64 ua;                 /* userspace address */
         u64 entries;            /* number of entries in hpas[] */
         u64 *hpas;              /* vmalloc'ed */
@@ -125,6 +127,8 @@ long mm_iommu_get(struct mm_struct *mm, unsigned long ua, unsigned long entries,
 {
         struct mm_iommu_table_group_mem_t *mem;
         long i, j, ret = 0, locked_entries = 0;
+        unsigned int pageshift;
+        unsigned long flags;
         struct page *page = NULL;
 
         mutex_lock(&mem_list_mutex);
@@ -159,6 +163,12 @@ long mm_iommu_get(struct mm_struct *mm, unsigned long ua, unsigned long entries,
                 goto unlock_exit;
         }
 
+        /*
+         * For a starting point for a maximum page size calculation
+         * we use @ua and @entries natural alignment to allow IOMMU pages
+         * smaller than huge pages but still bigger than PAGE_SIZE.
+         */
+        mem->pageshift = __ffs(ua | (entries << PAGE_SHIFT));
         mem->hpas = vzalloc(array_size(entries, sizeof(mem->hpas[0])));
         if (!mem->hpas) {
                 kfree(mem);
@@ -199,6 +209,23 @@ long mm_iommu_get(struct mm_struct *mm, unsigned long ua, unsigned long entries,
                         }
                 }
 populate:
+                pageshift = PAGE_SHIFT;
+                if (PageCompound(page)) {
+                        pte_t *pte;
+                        struct page *head = compound_head(page);
+                        unsigned int compshift = compound_order(head);
+
+                        local_irq_save(flags); /* disables as well */
+                        pte = find_linux_pte(mm->pgd, ua, NULL, &pageshift);
+                        local_irq_restore(flags);
+
+                        /* Double check it is still the same pinned page */
+                        if (pte && pte_page(*pte) == head &&
+                                        pageshift == compshift)
+                                pageshift = max_t(unsigned int, pageshift,
+                                                PAGE_SHIFT);
+                }
+                mem->pageshift = min(mem->pageshift, pageshift);
                 mem->hpas[i] = page_to_pfn(page) << PAGE_SHIFT;
         }
 
@@ -349,7 +376,7 @@ struct mm_iommu_table_group_mem_t *mm_iommu_find(struct mm_struct *mm,
 EXPORT_SYMBOL_GPL(mm_iommu_find);
 
 long mm_iommu_ua_to_hpa(struct mm_iommu_table_group_mem_t *mem,
-                unsigned long ua, unsigned long *hpa)
+                unsigned long ua, unsigned int pageshift, unsigned long *hpa)
 {
         const long entry = (ua - mem->ua) >> PAGE_SHIFT;
         u64 *va = &mem->hpas[entry];
@@ -357,6 +384,9 @@ long mm_iommu_ua_to_hpa(struct mm_iommu_table_group_mem_t *mem,
         if (entry >= mem->entries)
                 return -EFAULT;
 
+        if (pageshift > mem->pageshift)
+                return -EFAULT;
+
         *hpa = *va | (ua & ~PAGE_MASK);
 
         return 0;
@@ -364,7 +394,7 @@ long mm_iommu_ua_to_hpa(struct mm_iommu_table_group_mem_t *mem,
 EXPORT_SYMBOL_GPL(mm_iommu_ua_to_hpa);
 
 long mm_iommu_ua_to_hpa_rm(struct mm_iommu_table_group_mem_t *mem,
-                unsigned long ua, unsigned long *hpa)
+                unsigned long ua, unsigned int pageshift, unsigned long *hpa)
 {
         const long entry = (ua - mem->ua) >> PAGE_SHIFT;
         void *va = &mem->hpas[entry];
@@ -373,6 +403,9 @@ long mm_iommu_ua_to_hpa_rm(struct mm_iommu_table_group_mem_t *mem,
         if (entry >= mem->entries)
                 return -EFAULT;
 
+        if (pageshift > mem->pageshift)
+                return -EFAULT;
+
         pa = (void *) vmalloc_to_phys(va);
         if (!pa)
                 return -EFAULT;
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 47166ad2a669..196978733e64 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -2734,7 +2734,7 @@ generic_inst_dump(unsigned long adr, long count, int praddr,
 {
         int nr, dotted;
         unsigned long first_adr;
-        unsigned long inst, last_inst = 0;
+        unsigned int inst, last_inst = 0;
         unsigned char val[4];
 
         dotted = 0;
@@ -2758,7 +2758,7 @@ generic_inst_dump(unsigned long adr, long count, int praddr,
                 dotted = 0;
                 last_inst = inst;
                 if (praddr)
-                        printf(REG"  %.8lx", adr, inst);
+                        printf(REG"  %.8x", adr, inst);
                 printf("\t");
                 dump_func(inst, adr);
                 printf("\n");
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index f1dbb4ee19d7..887d3a7bb646 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -63,7 +63,7 @@ config X86
         select ARCH_HAS_PTE_SPECIAL
         select ARCH_HAS_REFCOUNT
         select ARCH_HAS_UACCESS_FLUSHCACHE      if X86_64
-        select ARCH_HAS_UACCESS_MCSAFE          if X86_64
+        select ARCH_HAS_UACCESS_MCSAFE          if X86_64 && X86_MCE
         select ARCH_HAS_SET_MEMORY
         select ARCH_HAS_SG_CHAIN
         select ARCH_HAS_STRICT_KERNEL_RWX
diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c
index 8a10a045b57b..8cf03f101938 100644
--- a/arch/x86/events/intel/ds.c
+++ b/arch/x86/events/intel/ds.c
@@ -408,9 +408,11 @@ static int alloc_bts_buffer(int cpu)
         ds->bts_buffer_base = (unsigned long) cea;
         ds_update_cea(cea, buffer, BTS_BUFFER_SIZE, PAGE_KERNEL);
         ds->bts_index = ds->bts_buffer_base;
-        max = BTS_RECORD_SIZE * (BTS_BUFFER_SIZE / BTS_RECORD_SIZE);
-        ds->bts_absolute_maximum = ds->bts_buffer_base + max;
-        ds->bts_interrupt_threshold = ds->bts_absolute_maximum - (max / 16);
+        max = BTS_BUFFER_SIZE / BTS_RECORD_SIZE;
+        ds->bts_absolute_maximum = ds->bts_buffer_base +
+                                        max * BTS_RECORD_SIZE;
+        ds->bts_interrupt_threshold = ds->bts_absolute_maximum -
+                                        (max / 16) * BTS_RECORD_SIZE;
         return 0;
 }
 
diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
index c356098b6fb9..4d4015ddcf26 100644
--- a/arch/x86/include/asm/apm.h
+++ b/arch/x86/include/asm/apm.h
@@ -7,8 +7,6 @@
 #ifndef _ASM_X86_MACH_DEFAULT_APM_H
 #define _ASM_X86_MACH_DEFAULT_APM_H
 
-#include <asm/nospec-branch.h>
-
 #ifdef APM_ZERO_SEGS
 #       define APM_DO_ZERO_SEGS \
                 "pushl %%ds\n\t" \
@@ -34,7 +32,6 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
          * N.B. We do NOT need a cld after the BIOS call
          * because we always save and restore the flags.
          */
-        firmware_restrict_branch_speculation_start();
         __asm__ __volatile__(APM_DO_ZERO_SEGS
                 "pushl %%edi\n\t"
                 "pushl %%ebp\n\t"
@@ -47,7 +44,6 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
                   "=S" (*esi)
                 : "a" (func), "b" (ebx_in), "c" (ecx_in)
                 : "memory", "cc");
-        firmware_restrict_branch_speculation_end();
 }
 
 static inline bool apm_bios_call_simple_asm(u32 func, u32 ebx_in,
@@ -60,7 +56,6 @@ static inline bool apm_bios_call_simple_asm(u32 func, u32 ebx_in,
          * N.B. We do NOT need a cld after the BIOS call
          * because we always save and restore the flags.
          */
-        firmware_restrict_branch_speculation_start();
         __asm__ __volatile__(APM_DO_ZERO_SEGS
                 "pushl %%edi\n\t"
                 "pushl %%ebp\n\t"
@@ -73,7 +68,6 @@ static inline bool apm_bios_call_simple_asm(u32 func, u32 ebx_in,
                   "=S" (si)
                 : "a" (func), "b" (ebx_in), "c" (ecx_in)
                 : "memory", "cc");
-        firmware_restrict_branch_speculation_end();
         return error;
 }
 
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
index 62acb613114b..a9d637bc301d 100644
--- a/arch/x86/include/asm/uaccess_64.h
+++ b/arch/x86/include/asm/uaccess_64.h
@@ -52,7 +52,12 @@ copy_to_user_mcsafe(void *to, const void *from, unsigned len)
         unsigned long ret;
 
         __uaccess_begin();
-        ret = memcpy_mcsafe(to, from, len);
+        /*
+         * Note, __memcpy_mcsafe() is explicitly used since it can
+         * handle exceptions / faults.  memcpy_mcsafe() may fall back to
+         * memcpy() which lacks this handling.
+         */
+        ret = __memcpy_mcsafe(to, from, len);
         __uaccess_end();
         return ret;
 }
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 5d0de79fdab0..ec00d1ff5098 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -240,6 +240,7 @@
 #include <asm/olpc.h>
 #include <asm/paravirt.h>
 #include <asm/reboot.h>
+#include <asm/nospec-branch.h>
 
 #if defined(CONFIG_APM_DISPLAY_BLANK) && defined(CONFIG_VT)
 extern int (*console_blank_hook)(int);
@@ -614,11 +615,13 @@ static long __apm_bios_call(void *_call)
         gdt[0x40 / 8] = bad_bios_desc;
 
         apm_irq_save(flags);
+        firmware_restrict_branch_speculation_start();
         APM_DO_SAVE_SEGS;
         apm_bios_call_asm(call->func, call->ebx, call->ecx,
                           &call->eax, &call->ebx, &call->ecx, &call->edx,
                           &call->esi);
         APM_DO_RESTORE_SEGS;
+        firmware_restrict_branch_speculation_end();
         apm_irq_restore(flags);
         gdt[0x40 / 8] = save_desc_40;
         put_cpu();
@@ -690,10 +693,12 @@ static long __apm_bios_call_simple(void *_call)
         gdt[0x40 / 8] = bad_bios_desc;
 
         apm_irq_save(flags);
+        firmware_restrict_branch_speculation_start();
         APM_DO_SAVE_SEGS;
         error = apm_bios_call_simple_asm(call->func, call->ebx, call->ecx,
                                          &call->eax);
         APM_DO_RESTORE_SEGS;
+        firmware_restrict_branch_speculation_end();
         apm_irq_restore(flags);
         gdt[0x40 / 8] = save_desc_40;
         put_cpu();
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index bf8d1eb7fca3..3b8e7c13c614 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -138,6 +138,7 @@ static unsigned long kvm_get_tsc_khz(void)
         src = &hv_clock[cpu].pvti;
         tsc_khz = pvclock_tsc_khz(src);
         put_cpu();
+        setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ);
         return tsc_khz;
 }
 
@@ -319,6 +320,8 @@ void __init kvmclock_init(void)
         printk(KERN_INFO "kvm-clock: Using msrs %x and %x",
                 msr_kvm_system_time, msr_kvm_wall_clock);
 
+        pvclock_set_pvti_cpu0_va(hv_clock);
+
         if (kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE_STABLE_BIT))
                 pvclock_set_flags(PVCLOCK_TSC_STABLE_BIT);
 
@@ -366,14 +369,11 @@ int __init kvm_setup_vsyscall_timeinfo(void)
         vcpu_time = &hv_clock[cpu].pvti;
         flags = pvclock_read_flags(vcpu_time);
 
-        if (!(flags & PVCLOCK_TSC_STABLE_BIT)) {
-                put_cpu();
-                return 1;
-        }
-
-        pvclock_set_pvti_cpu0_va(hv_clock);
         put_cpu();
 
+        if (!(flags & PVCLOCK_TSC_STABLE_BIT))
+                return 1;
+
         kvm_clock.archdata.vclock_mode = VCLOCK_PVCLOCK;
 #endif
         return 0;
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index 92fd433c50b9..1bbec387d289 100644
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -85,7 +85,7 @@ config KVM_AMD_SEV
         def_bool y
         bool "AMD Secure Encrypted Virtualization (SEV) support"
         depends on KVM_AMD && X86_64
-        depends on CRYPTO_DEV_CCP && CRYPTO_DEV_CCP_DD && CRYPTO_DEV_SP_PSP
+        depends on CRYPTO_DEV_SP_PSP && !(KVM_AMD=y && CRYPTO_DEV_CCP_DD=m)
         ---help---
         Provides support for launching Encrypted VMs on AMD processors.
 
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 1689f433f3a0..e30da9a2430c 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2571,6 +2571,7 @@ static void vmx_save_host_state(struct kvm_vcpu *vcpu)
         struct vcpu_vmx *vmx = to_vmx(vcpu);
 #ifdef CONFIG_X86_64
         int cpu = raw_smp_processor_id();
+        unsigned long fs_base, kernel_gs_base;
 #endif
         int i;
 
@@ -2586,12 +2587,20 @@ static void vmx_save_host_state(struct kvm_vcpu *vcpu)
         vmx->host_state.gs_ldt_reload_needed = vmx->host_state.ldt_sel;
 
 #ifdef CONFIG_X86_64
-        save_fsgs_for_kvm();
-        vmx->host_state.fs_sel = current->thread.fsindex;
-        vmx->host_state.gs_sel = current->thread.gsindex;
-#else
-        savesegment(fs, vmx->host_state.fs_sel);
-        savesegment(gs, vmx->host_state.gs_sel);
+        if (likely(is_64bit_mm(current->mm))) {
+                save_fsgs_for_kvm();
+                vmx->host_state.fs_sel = current->thread.fsindex;
+                vmx->host_state.gs_sel = current->thread.gsindex;
+                fs_base = current->thread.fsbase;
+                kernel_gs_base = current->thread.gsbase;
+        } else {
+#endif
+                savesegment(fs, vmx->host_state.fs_sel);
+                savesegment(gs, vmx->host_state.gs_sel);
+#ifdef CONFIG_X86_64
+                fs_base = read_msr(MSR_FS_BASE);
+                kernel_gs_base = read_msr(MSR_KERNEL_GS_BASE);
+        }
 #endif
         if (!(vmx->host_state.fs_sel & 7)) {
                 vmcs_write16(HOST_FS_SELECTOR, vmx->host_state.fs_sel);
@@ -2611,10 +2620,10 @@ static void vmx_save_host_state(struct kvm_vcpu *vcpu)
         savesegment(ds, vmx->host_state.ds_sel);
         savesegment(es, vmx->host_state.es_sel);
 
-        vmcs_writel(HOST_FS_BASE, current->thread.fsbase);
+        vmcs_writel(HOST_FS_BASE, fs_base);
         vmcs_writel(HOST_GS_BASE, cpu_kernelmode_gs_base(cpu));
 
-        vmx->msr_host_kernel_gs_base = current->thread.gsbase;
+        vmx->msr_host_kernel_gs_base = kernel_gs_base;
         if (is_long_mode(&vmx->vcpu))
                 wrmsrl(MSR_KERNEL_GS_BASE, vmx->msr_guest_kernel_gs_base);
 #else
@@ -4322,11 +4331,7 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf)
         vmcs_conf->order = get_order(vmcs_conf->size);
         vmcs_conf->basic_cap = vmx_msr_high & ~0x1fff;
 
-        /* KVM supports Enlightened VMCS v1 only */
-        if (static_branch_unlikely(&enable_evmcs))
-                vmcs_conf->revision_id = KVM_EVMCS_VERSION;
-        else
-                vmcs_conf->revision_id = vmx_msr_low;
+        vmcs_conf->revision_id = vmx_msr_low;
 
         vmcs_conf->pin_based_exec_ctrl = _pin_based_exec_control;
         vmcs_conf->cpu_based_exec_ctrl = _cpu_based_exec_control;
@@ -4396,7 +4401,13 @@ static struct vmcs *alloc_vmcs_cpu(int cpu)
                 return NULL;
         vmcs = page_address(pages);
         memset(vmcs, 0, vmcs_config.size);
-        vmcs->revision_id = vmcs_config.revision_id; /* vmcs revision id */
+
+        /* KVM supports Enlightened VMCS v1 only */
+        if (static_branch_unlikely(&enable_evmcs))
+                vmcs->revision_id = KVM_EVMCS_VERSION;
+        else
+                vmcs->revision_id = vmcs_config.revision_id;
+
         return vmcs;
 }
 
@@ -4564,6 +4575,19 @@ static __init int alloc_kvm_area(void)
                         return -ENOMEM;
                 }
 
+                /*
+                 * When eVMCS is enabled, alloc_vmcs_cpu() sets
+                 * vmcs->revision_id to KVM_EVMCS_VERSION instead of
+                 * revision_id reported by MSR_IA32_VMX_BASIC.
+                 *
+                 * However, even though not explictly documented by
+                 * TLFS, VMXArea passed as VMXON argument should
+                 * still be marked with revision_id reported by
+                 * physical CPU.
+                 */
+                if (static_branch_unlikely(&enable_evmcs))
+                        vmcs->revision_id = vmcs_config.revision_id;
+
                 per_cpu(vmxarea, cpu) = vmcs;
         }
         return 0;
@@ -11753,7 +11777,6 @@ static int enter_vmx_non_root_mode(struct kvm_vcpu *vcpu)
 {
         struct vcpu_vmx *vmx = to_vmx(vcpu);
         struct vmcs12 *vmcs12 = get_vmcs12(vcpu);
-        u32 msr_entry_idx;
         u32 exit_qual;
         int r;
 
@@ -11775,10 +11798,10 @@ static int enter_vmx_non_root_mode(struct kvm_vcpu *vcpu)
         nested_get_vmcs12_pages(vcpu, vmcs12);
 
         r = EXIT_REASON_MSR_LOAD_FAIL;
-        msr_entry_idx = nested_vmx_load_msr(vcpu,
-                                            vmcs12->vm_entry_msr_load_addr,
-                                            vmcs12->vm_entry_msr_load_count);
-        if (msr_entry_idx)
+        exit_qual = nested_vmx_load_msr(vcpu,
+                                        vmcs12->vm_entry_msr_load_addr,
+                                        vmcs12->vm_entry_msr_load_count);
+        if (exit_qual)
                 goto fail;
 
         /*
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 0046aa70205a..2b812b3c5088 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1097,6 +1097,7 @@ static u32 msr_based_features[] = {
 
         MSR_F10H_DECFG,
         MSR_IA32_UCODE_REV,
+        MSR_IA32_ARCH_CAPABILITIES,
 };
 
 static unsigned int num_msr_based_features;
@@ -1105,7 +1106,8 @@ static int kvm_get_msr_feature(struct kvm_msr_entry *msr)
 {
         switch (msr->index) {
         case MSR_IA32_UCODE_REV:
-                rdmsrl(msr->index, msr->data);
+        case MSR_IA32_ARCH_CAPABILITIES:
+                rdmsrl_safe(msr->index, &msr->data);
                 break;
         default:
                 if (kvm_x86_ops->get_msr_feature(msr))
diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 314c52c967e5..c166f424871c 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -1155,8 +1155,10 @@ int af_alg_get_rsgl(struct sock *sk, struct msghdr *msg, int flags,
 
                 /* make one iovec available as scatterlist */
                 err = af_alg_make_sg(&rsgl->sgl, &msg->msg_iter, seglen);
-                if (err < 0)
+                if (err < 0) {
+                        rsgl->sg_num_bytes = 0;
                         return err;
+                }
 
                 /* chain the new scatterlist with previous one */
                 if (areq->last_rsgl)
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 442a9e24f439..917f77f4cb55 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -2042,7 +2042,7 @@ static const struct dmi_system_id acpi_ec_no_wakeup[] = {
                 .ident = "Thinkpad X1 Carbon 6th",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "20KGS3JF01"),
+                        DMI_MATCH(DMI_PRODUCT_FAMILY, "Thinkpad X1 Carbon 6th"),
                 },
         },
         { },
diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c
index 53fe633df1e8..c9bf2c219841 100644
--- a/drivers/char/agp/alpha-agp.c
+++ b/drivers/char/agp/alpha-agp.c
@@ -11,7 +11,7 @@
 
 #include "agp.h"
 
-static int alpha_core_agp_vm_fault(struct vm_fault *vmf)
+static vm_fault_t alpha_core_agp_vm_fault(struct vm_fault *vmf)
 {
         alpha_agp_info *agp = agp_bridge->dev_private_data;
         dma_addr_t dma_addr;
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index e50c29c97ca7..c69e39fdd02b 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -156,7 +156,7 @@ static u64 amd64_configure(struct pci_dev *hammer, u64 gatt_table)
 
         /* Address to map to */
         pci_read_config_dword(hammer, AMD64_GARTAPERTUREBASE, &tmp);
-        aperturebase = tmp << 25;
+        aperturebase = (u64)tmp << 25;
         aper_base = (aperturebase & PCI_BASE_ADDRESS_MEM_MASK);
 
         enable_gart_translation(hammer, gatt_table);
@@ -277,7 +277,7 @@ static int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp, u16 cap)
         pci_read_config_dword(nb, AMD64_GARTAPERTURECTL, &nb_order);
         nb_order = (nb_order >> 1) & 7;
         pci_read_config_dword(nb, AMD64_GARTAPERTUREBASE, &nb_base);
-        nb_aper = nb_base << 25;
+        nb_aper = (u64)nb_base << 25;
 
         /* Northbridge seems to contain crap. Try the AGP bridge. */
 
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index ece120da3353..3c3971256130 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -2394,6 +2394,18 @@ static bool __init intel_pstate_no_acpi_pss(void)
         return true;
 }
 
+static bool __init intel_pstate_no_acpi_pcch(void)
+{
+        acpi_status status;
+        acpi_handle handle;
+
+        status = acpi_get_handle(NULL, "\\_SB", &handle);
+        if (ACPI_FAILURE(status))
+                return true;
+
+        return !acpi_has_method(handle, "PCCH");
+}
+
 static bool __init intel_pstate_has_acpi_ppc(void)
 {
         int i;
@@ -2453,7 +2465,10 @@ static bool __init intel_pstate_platform_pwr_mgmt_exists(void)
 
         switch (plat_info[idx].data) {
         case PSS:
-                return intel_pstate_no_acpi_pss();
+                if (!intel_pstate_no_acpi_pss())
+                        return false;
+
+                return intel_pstate_no_acpi_pcch();
         case PPC:
                 return intel_pstate_has_acpi_ppc() && !force_load;
         }
diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c
index 3f0ce2ae35ee..0c56c9759672 100644
--- a/drivers/cpufreq/pcc-cpufreq.c
+++ b/drivers/cpufreq/pcc-cpufreq.c
@@ -580,6 +580,10 @@ static int __init pcc_cpufreq_init(void)
 {
         int ret;
 
+        /* Skip initialization if another cpufreq driver is there. */
+        if (cpufreq_get_current_driver())
+                return 0;
+
         if (acpi_disabled)
                 return 0;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
index f4c474a95875..71efcf38f11b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
@@ -57,6 +57,10 @@
 #define ACP_I2S_COMP2_CAP_REG_OFFSET            0xa8
 #define ACP_I2S_COMP1_PLAY_REG_OFFSET           0x6c
 #define ACP_I2S_COMP2_PLAY_REG_OFFSET           0x68
+#define ACP_BT_PLAY_REGS_START                  0x14970
+#define ACP_BT_PLAY_REGS_END                    0x14a24
+#define ACP_BT_COMP1_REG_OFFSET                 0xac
+#define ACP_BT_COMP2_REG_OFFSET                 0xa8
 
 #define mmACP_PGFSM_RETAIN_REG                  0x51c9
 #define mmACP_PGFSM_CONFIG_REG                  0x51ca
@@ -77,7 +81,7 @@
 #define ACP_SOFT_RESET_DONE_TIME_OUT_VALUE      0x000000FF
 
 #define ACP_TIMEOUT_LOOP                        0x000000FF
-#define ACP_DEVS                                3
+#define ACP_DEVS                                4
 #define ACP_SRC_ID                              162
 
 enum {
@@ -316,14 +320,13 @@ static int acp_hw_init(void *handle)
         if (adev->acp.acp_cell == NULL)
                 return -ENOMEM;
 
-        adev->acp.acp_res = kcalloc(4, sizeof(struct resource), GFP_KERNEL);
-
+        adev->acp.acp_res = kcalloc(5, sizeof(struct resource), GFP_KERNEL);
         if (adev->acp.acp_res == NULL) {
                 kfree(adev->acp.acp_cell);
                 return -ENOMEM;
         }
 
-        i2s_pdata = kcalloc(2, sizeof(struct i2s_platform_data), GFP_KERNEL);
+        i2s_pdata = kcalloc(3, sizeof(struct i2s_platform_data), GFP_KERNEL);
         if (i2s_pdata == NULL) {
                 kfree(adev->acp.acp_res);
                 kfree(adev->acp.acp_cell);
@@ -358,6 +361,20 @@ static int acp_hw_init(void *handle)
         i2s_pdata[1].i2s_reg_comp1 = ACP_I2S_COMP1_CAP_REG_OFFSET;
         i2s_pdata[1].i2s_reg_comp2 = ACP_I2S_COMP2_CAP_REG_OFFSET;
 
+        i2s_pdata[2].quirks = DW_I2S_QUIRK_COMP_REG_OFFSET;
+        switch (adev->asic_type) {
+        case CHIP_STONEY:
+                i2s_pdata[2].quirks |= DW_I2S_QUIRK_16BIT_IDX_OVERRIDE;
+                break;
+        default:
+                break;
+        }
+
+        i2s_pdata[2].cap = DWC_I2S_PLAY | DWC_I2S_RECORD;
+        i2s_pdata[2].snd_rates = SNDRV_PCM_RATE_8000_96000;
+        i2s_pdata[2].i2s_reg_comp1 = ACP_BT_COMP1_REG_OFFSET;
+        i2s_pdata[2].i2s_reg_comp2 = ACP_BT_COMP2_REG_OFFSET;
+
         adev->acp.acp_res[0].name = "acp2x_dma";
         adev->acp.acp_res[0].flags = IORESOURCE_MEM;
         adev->acp.acp_res[0].start = acp_base;
@@ -373,13 +390,18 @@ static int acp_hw_init(void *handle)
         adev->acp.acp_res[2].start = acp_base + ACP_I2S_CAP_REGS_START;
         adev->acp.acp_res[2].end = acp_base + ACP_I2S_CAP_REGS_END;
 
-        adev->acp.acp_res[3].name = "acp2x_dma_irq";
-        adev->acp.acp_res[3].flags = IORESOURCE_IRQ;
-        adev->acp.acp_res[3].start = amdgpu_irq_create_mapping(adev, 162);
-        adev->acp.acp_res[3].end = adev->acp.acp_res[3].start;
+        adev->acp.acp_res[3].name = "acp2x_dw_bt_i2s_play_cap";
+        adev->acp.acp_res[3].flags = IORESOURCE_MEM;
+        adev->acp.acp_res[3].start = acp_base + ACP_BT_PLAY_REGS_START;
+        adev->acp.acp_res[3].end = acp_base + ACP_BT_PLAY_REGS_END;
+
+        adev->acp.acp_res[4].name = "acp2x_dma_irq";
+        adev->acp.acp_res[4].flags = IORESOURCE_IRQ;
+        adev->acp.acp_res[4].start = amdgpu_irq_create_mapping(adev, 162);
+        adev->acp.acp_res[4].end = adev->acp.acp_res[4].start;
 
         adev->acp.acp_cell[0].name = "acp_audio_dma";
-        adev->acp.acp_cell[0].num_resources = 4;
+        adev->acp.acp_cell[0].num_resources = 5;
         adev->acp.acp_cell[0].resources = &adev->acp.acp_res[0];
         adev->acp.acp_cell[0].platform_data = &adev->asic_type;
         adev->acp.acp_cell[0].pdata_size = sizeof(adev->asic_type);
@@ -396,6 +418,12 @@ static int acp_hw_init(void *handle)
         adev->acp.acp_cell[2].platform_data = &i2s_pdata[1];
         adev->acp.acp_cell[2].pdata_size = sizeof(struct i2s_platform_data);
 
+        adev->acp.acp_cell[3].name = "designware-i2s";
+        adev->acp.acp_cell[3].num_resources = 1;
+        adev->acp.acp_cell[3].resources = &adev->acp.acp_res[3];
+        adev->acp.acp_cell[3].platform_data = &i2s_pdata[2];
+        adev->acp.acp_cell[3].pdata_size = sizeof(struct i2s_platform_data);
+
         r = mfd_add_hotplug_devices(adev->acp.parent, adev->acp.acp_cell,
                                                                 ACP_DEVS);
         if (r)
@@ -451,7 +479,6 @@ static int acp_hw_init(void *handle)
         val = cgs_read_register(adev->acp.cgs_device, mmACP_SOFT_RESET);
         val &= ~ACP_SOFT_RESET__SoftResetAud_MASK;
         cgs_write_register(adev->acp.cgs_device, mmACP_SOFT_RESET, val);
-
         return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
index 9ab89371d9e8..ca8bf1c9a98e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
@@ -575,6 +575,7 @@ static const struct amdgpu_px_quirk amdgpu_px_quirk_list[] = {
         { 0x1002, 0x6900, 0x1002, 0x0124, AMDGPU_PX_QUIRK_FORCE_ATPX },
         { 0x1002, 0x6900, 0x1028, 0x0812, AMDGPU_PX_QUIRK_FORCE_ATPX },
         { 0x1002, 0x6900, 0x1028, 0x0813, AMDGPU_PX_QUIRK_FORCE_ATPX },
+        { 0x1002, 0x6900, 0x1025, 0x125A, AMDGPU_PX_QUIRK_FORCE_ATPX },
         { 0, 0, 0, 0, 0 },
 };
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 82312a7bc6ad..9c85a90be293 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -927,6 +927,10 @@ static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev,
                 r = amdgpu_bo_vm_update_pte(p);
                 if (r)
                         return r;
+
+                r = reservation_object_reserve_shared(vm->root.base.bo->tbo.resv);
+                if (r)
+                        return r;
         }
 
         return amdgpu_cs_sync_rings(p);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 6e5284e6c028..2c5f093e79e3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2747,6 +2747,9 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
         if (r)
                 return r;
 
+        /* Make sure IB tests flushed */
+        flush_delayed_work(&adev->late_init_work);
+
         /* blat the mode back in */
         if (fbcon) {
                 if (!amdgpu_device_has_dc_support(adev)) {
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index edf16b2b957a..fdcb498f6d19 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -107,6 +107,9 @@ static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base,
                 return;
         list_add_tail(&base->bo_list, &bo->va);
 
+        if (bo->tbo.type == ttm_bo_type_kernel)
+                list_move(&base->vm_status, &vm->relocated);
+
         if (bo->tbo.resv != vm->root.base.bo->tbo.resv)
                 return;
 
@@ -468,7 +471,6 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev,
                         pt->parent = amdgpu_bo_ref(parent->base.bo);
 
                         amdgpu_vm_bo_base_init(&entry->base, vm, pt);
-                        list_move(&entry->base.vm_status, &vm->relocated);
                 }
 
                 if (level < AMDGPU_VM_PTB) {
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 4304d9e408b8..ace9ad578ca0 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -83,22 +83,21 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux,
         enum i2c_mot_mode mot = (msg->request & DP_AUX_I2C_MOT) ?
                 I2C_MOT_TRUE : I2C_MOT_FALSE;
         enum ddc_result res;
-        uint32_t read_bytes = msg->size;
+        ssize_t read_bytes;
 
         if (WARN_ON(msg->size > 16))
                 return -E2BIG;
 
         switch (msg->request & ~DP_AUX_I2C_MOT) {
         case DP_AUX_NATIVE_READ:
-                res = dal_ddc_service_read_dpcd_data(
+                read_bytes = dal_ddc_service_read_dpcd_data(
                                 TO_DM_AUX(aux)->ddc_service,
                                 false,
                                 I2C_MOT_UNDEF,
                                 msg->address,
                                 msg->buffer,
-                                msg->size,
-                                &read_bytes);
-                break;
+                                msg->size);
+                return read_bytes;
         case DP_AUX_NATIVE_WRITE:
                 res = dal_ddc_service_write_dpcd_data(
                                 TO_DM_AUX(aux)->ddc_service,
@@ -109,15 +108,14 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux,
                                 msg->size);
                 break;
         case DP_AUX_I2C_READ:
-                res = dal_ddc_service_read_dpcd_data(
+                read_bytes = dal_ddc_service_read_dpcd_data(
                                 TO_DM_AUX(aux)->ddc_service,
                                 true,
                                 mot,
                                 msg->address,
                                 msg->buffer,
-                                msg->size,
-                                &read_bytes);
-                break;
+                                msg->size);
+                return read_bytes;
         case DP_AUX_I2C_WRITE:
                 res = dal_ddc_service_write_dpcd_data(
                                 TO_DM_AUX(aux)->ddc_service,
@@ -139,9 +137,7 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux,
                  r == DDC_RESULT_SUCESSFULL);
 #endif
 
-        if (res != DDC_RESULT_SUCESSFULL)
-                return -EIO;
-        return read_bytes;
+        return msg->size;
 }
 
 static enum drm_connector_status
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
index 5a3346124a01..5a2e952c5bea 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
@@ -255,8 +255,9 @@ static void pp_to_dc_clock_levels_with_latency(
                         DC_DECODE_PP_CLOCK_TYPE(dc_clk_type));
 
         for (i = 0; i < clk_level_info->num_levels; i++) {
-                DRM_DEBUG("DM_PPLIB:\t %d\n", pp_clks->data[i].clocks_in_khz);
-                clk_level_info->data[i].clocks_in_khz = pp_clks->data[i].clocks_in_khz;
+                DRM_DEBUG("DM_PPLIB:\t %d in 10kHz\n", pp_clks->data[i].clocks_in_khz);
+                /* translate 10kHz to kHz */
+                clk_level_info->data[i].clocks_in_khz = pp_clks->data[i].clocks_in_khz * 10;
                 clk_level_info->data[i].latency_in_us = pp_clks->data[i].latency_in_us;
         }
 }
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c
index ae48d603ebd6..49c2face1e7a 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c
@@ -629,14 +629,13 @@ bool dal_ddc_service_query_ddc_data(
         return ret;
 }
 
-enum ddc_result dal_ddc_service_read_dpcd_data(
+ssize_t dal_ddc_service_read_dpcd_data(
         struct ddc_service *ddc,
         bool i2c,
         enum i2c_mot_mode mot,
         uint32_t address,
         uint8_t *data,
-        uint32_t len,
-        uint32_t *read)
+        uint32_t len)
 {
         struct aux_payload read_payload = {
                 .i2c_over_aux = i2c,
@@ -653,8 +652,6 @@ enum ddc_result dal_ddc_service_read_dpcd_data(
                 .mot = mot
         };
 
-        *read = 0;
-
         if (len > DEFAULT_AUX_MAX_DATA_SIZE) {
                 BREAK_TO_DEBUGGER();
                 return DDC_RESULT_FAILED_INVALID_OPERATION;
@@ -664,8 +661,7 @@ enum ddc_result dal_ddc_service_read_dpcd_data(
                 ddc->ctx->i2caux,
                 ddc->ddc_pin,
                 &command)) {
-                *read = command.payloads->length;
-                return DDC_RESULT_SUCESSFULL;
+                return (ssize_t)command.payloads->length;
         }
 
         return DDC_RESULT_FAILED_OPERATION;
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index 7857cb42b3e6..bdd121485cbc 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -1767,12 +1767,10 @@ static void dp_test_send_link_training(struct dc_link *link)
         dp_retrain_link_dp_test(link, &link_settings, false);
 }
 
-/* TODO hbr2 compliance eye output is unstable
+/* TODO Raven hbr2 compliance eye output is unstable
  * (toggling on and off) with debugger break
  * This caueses intermittent PHY automation failure
  * Need to look into the root cause */
-static uint8_t force_tps4_for_cp2520 = 1;
-
 static void dp_test_send_phy_test_pattern(struct dc_link *link)
 {
         union phy_test_pattern dpcd_test_pattern;
@@ -1832,13 +1830,13 @@ static void dp_test_send_phy_test_pattern(struct dc_link *link)
                 break;
         case PHY_TEST_PATTERN_CP2520_1:
                 /* CP2520 pattern is unstable, temporarily use TPS4 instead */
-                test_pattern = (force_tps4_for_cp2520 == 1) ?
+                test_pattern = (link->dc->caps.force_dp_tps4_for_cp2520 == 1) ?
                                 DP_TEST_PATTERN_TRAINING_PATTERN4 :
                                 DP_TEST_PATTERN_HBR2_COMPLIANCE_EYE;
                 break;
         case PHY_TEST_PATTERN_CP2520_2:
                 /* CP2520 pattern is unstable, temporarily use TPS4 instead */
-                test_pattern = (force_tps4_for_cp2520 == 1) ?
+                test_pattern = (link->dc->caps.force_dp_tps4_for_cp2520 == 1) ?
                                 DP_TEST_PATTERN_TRAINING_PATTERN4 :
                                 DP_TEST_PATTERN_HBR2_COMPLIANCE_EYE;
                 break;
diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 9cfde0ccf4e9..53c71296f3dd 100644
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -76,6 +76,7 @@ struct dc_caps {
         bool is_apu;
         bool dual_link_dvi;
         bool post_blend_color_processing;
+        bool force_dp_tps4_for_cp2520;
 };
 
 struct dc_dcc_surface_param {
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
index b235a75355b8..bae752332a9f 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
@@ -741,6 +741,29 @@ static struct mem_input_funcs dce_mi_funcs = {
         .mem_input_is_flip_pending = dce_mi_is_flip_pending
 };
 
+static struct mem_input_funcs dce112_mi_funcs = {
+        .mem_input_program_display_marks = dce112_mi_program_display_marks,
+        .allocate_mem_input = dce_mi_allocate_dmif,
+        .free_mem_input = dce_mi_free_dmif,
+        .mem_input_program_surface_flip_and_addr =
+                        dce_mi_program_surface_flip_and_addr,
+        .mem_input_program_pte_vm = dce_mi_program_pte_vm,
+        .mem_input_program_surface_config =
+                        dce_mi_program_surface_config,
+        .mem_input_is_flip_pending = dce_mi_is_flip_pending
+};
+
+static struct mem_input_funcs dce120_mi_funcs = {
+        .mem_input_program_display_marks = dce120_mi_program_display_marks,
+        .allocate_mem_input = dce_mi_allocate_dmif,
+        .free_mem_input = dce_mi_free_dmif,
+        .mem_input_program_surface_flip_and_addr =
+                        dce_mi_program_surface_flip_and_addr,
+        .mem_input_program_pte_vm = dce_mi_program_pte_vm,
+        .mem_input_program_surface_config =
+                        dce_mi_program_surface_config,
+        .mem_input_is_flip_pending = dce_mi_is_flip_pending
+};
 
 void dce_mem_input_construct(
         struct dce_mem_input *dce_mi,
@@ -769,7 +792,7 @@ void dce112_mem_input_construct(
         const struct dce_mem_input_mask *mi_mask)
 {
         dce_mem_input_construct(dce_mi, ctx, inst, regs, mi_shift, mi_mask);
-        dce_mi->base.funcs->mem_input_program_display_marks = dce112_mi_program_display_marks;
+        dce_mi->base.funcs = &dce112_mi_funcs;
 }
 
 void dce120_mem_input_construct(
@@ -781,5 +804,5 @@ void dce120_mem_input_construct(
         const struct dce_mem_input_mask *mi_mask)
 {
         dce_mem_input_construct(dce_mi, ctx, inst, regs, mi_shift, mi_mask);
-        dce_mi->base.funcs->mem_input_program_display_marks = dce120_mi_program_display_marks;
+        dce_mi->base.funcs = &dce120_mi_funcs;
 }
diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
index 38ec0d609297..344dd2e69e7c 100644
--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
@@ -678,9 +678,22 @@ bool dce100_validate_bandwidth(
         struct dc  *dc,
         struct dc_state *context)
 {
-        /* TODO implement when needed but for now hardcode max value*/
-        context->bw.dce.dispclk_khz = 681000;
-        context->bw.dce.yclk_khz = 250000 * MEMORY_TYPE_MULTIPLIER;
+        int i;
+        bool at_least_one_pipe = false;
+
+        for (i = 0; i < dc->res_pool->pipe_count; i++) {
+                if (context->res_ctx.pipe_ctx[i].stream)
+                        at_least_one_pipe = true;
+        }
+
+        if (at_least_one_pipe) {
+                /* TODO implement when needed but for now hardcode max value*/
+                context->bw.dce.dispclk_khz = 681000;
+                context->bw.dce.yclk_khz = 250000 * MEMORY_TYPE_MULTIPLIER;
+        } else {
+                context->bw.dce.dispclk_khz = 0;
+                context->bw.dce.yclk_khz = 0;
+        }
 
         return true;
 }
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index df5cb2d1d164..34dac84066a0 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -1027,6 +1027,8 @@ static bool construct(
         dc->caps.max_slave_planes = 1;
         dc->caps.is_apu = true;
         dc->caps.post_blend_color_processing = false;
+        /* Raven DP PHY HBR2 eye diagram pattern is not stable. Use TP4 */
+        dc->caps.force_dp_tps4_for_cp2520 = true;
 
         if (dc->ctx->dce_environment == DCE_ENV_PRODUCTION_DRV)
                 dc->debug = debug_defaults_drv;
diff --git a/drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h b/drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h
index 30b3a08b91be..090b7a8dd67b 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h
@@ -102,14 +102,13 @@ bool dal_ddc_service_query_ddc_data(
                 uint8_t *read_buf,
                 uint32_t read_size);
 
-enum ddc_result dal_ddc_service_read_dpcd_data(
+ssize_t dal_ddc_service_read_dpcd_data(
                 struct ddc_service *ddc,
                 bool i2c,
                 enum i2c_mot_mode mot,
                 uint32_t address,
                 uint8_t *data,
-                uint32_t len,
-                uint32_t *read);
+                uint32_t len);
 
 enum ddc_result dal_ddc_service_write_dpcd_data(
                 struct ddc_service *ddc,
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
index d644a9bb9078..9f407c48d4f0 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
@@ -381,6 +381,7 @@ int smu7_request_smu_load_fw(struct pp_hwmgr *hwmgr)
         uint32_t fw_to_load;
         int result = 0;
         struct SMU_DRAMData_TOC *toc;
+        uint32_t num_entries = 0;
 
         if (!hwmgr->reload_fw) {
                 pr_info("skip reloading...\n");
@@ -422,41 +423,41 @@ int smu7_request_smu_load_fw(struct pp_hwmgr *hwmgr)
         }
 
         toc = (struct SMU_DRAMData_TOC *)smu_data->header;
-        toc->num_entries = 0;
         toc->structure_version = 1;
 
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_RLC_G, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_RLC_G, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_CP_CE, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_CP_CE, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_CP_PFP, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_CP_PFP, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_CP_ME, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_CP_ME, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_CP_MEC, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_CP_MEC, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_CP_MEC_JT1, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_CP_MEC_JT1, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_CP_MEC_JT2, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_CP_MEC_JT2, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_SDMA0, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_SDMA0, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_SDMA1, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_SDMA1, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         if (!hwmgr->not_vf)
                 PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_MEC_STORAGE, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_MEC_STORAGE, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
 
+        toc->num_entries = num_entries;
         smu7_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_DRV_DRAM_ADDR_HI, upper_32_bits(smu_data->header_buffer.mc_addr));
         smu7_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_DRV_DRAM_ADDR_LO, lower_32_bits(smu_data->header_buffer.mc_addr));
 
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index 03eeee11dd5b..42a40daff132 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -519,8 +519,9 @@ static irqreturn_t armada_drm_irq(int irq, void *arg)
         u32 v, stat = readl_relaxed(dcrtc->base + LCD_SPU_IRQ_ISR);
 
         /*
-         * This is rediculous - rather than writing bits to clear, we
-         * have to set the actual status register value.  This is racy.
+         * Reading the ISR appears to clear bits provided CLEAN_SPU_IRQ_ISR
+         * is set.  Writing has some other effect to acknowledge the IRQ -
+         * without this, we only get a single IRQ.
          */
         writel_relaxed(0, dcrtc->base + LCD_SPU_IRQ_ISR);
 
@@ -1116,16 +1117,22 @@ armada_drm_crtc_set_property(struct drm_crtc *crtc,
 static int armada_drm_crtc_enable_vblank(struct drm_crtc *crtc)
 {
         struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
+        unsigned long flags;
 
+        spin_lock_irqsave(&dcrtc->irq_lock, flags);
         armada_drm_crtc_enable_irq(dcrtc, VSYNC_IRQ_ENA);
+        spin_unlock_irqrestore(&dcrtc->irq_lock, flags);
         return 0;
 }
 
 static void armada_drm_crtc_disable_vblank(struct drm_crtc *crtc)
 {
         struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
+        unsigned long flags;
 
+        spin_lock_irqsave(&dcrtc->irq_lock, flags);
         armada_drm_crtc_disable_irq(dcrtc, VSYNC_IRQ_ENA);
+        spin_unlock_irqrestore(&dcrtc->irq_lock, flags);
 }
 
 static const struct drm_crtc_funcs armada_crtc_funcs = {
@@ -1415,6 +1422,7 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,
                        CFG_PDWN64x66, dcrtc->base + LCD_SPU_SRAM_PARA1);
         writel_relaxed(0x2032ff81, dcrtc->base + LCD_SPU_DMA_CTRL1);
         writel_relaxed(dcrtc->irq_ena, dcrtc->base + LCD_SPU_IRQ_ENA);
+        readl_relaxed(dcrtc->base + LCD_SPU_IRQ_ISR);
         writel_relaxed(0, dcrtc->base + LCD_SPU_IRQ_ISR);
 
         ret = devm_request_irq(dev, irq, armada_drm_irq, 0, "armada_drm_crtc",
diff --git a/drivers/gpu/drm/armada/armada_hw.h b/drivers/gpu/drm/armada/armada_hw.h
index 27319a8335e2..345dc4d0851e 100644
--- a/drivers/gpu/drm/armada/armada_hw.h
+++ b/drivers/gpu/drm/armada/armada_hw.h
@@ -160,6 +160,7 @@ enum {
         CFG_ALPHAM_GRA          = 0x1 << 16,
         CFG_ALPHAM_CFG          = 0x2 << 16,
         CFG_ALPHA_MASK          = 0xff << 8,
+#define CFG_ALPHA(x)            ((x) << 8)
         CFG_PIXCMD_MASK         = 0xff,
 };
 
diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c
index c391955009d6..afa7ded3ae31 100644
--- a/drivers/gpu/drm/armada/armada_overlay.c
+++ b/drivers/gpu/drm/armada/armada_overlay.c
@@ -28,6 +28,7 @@ struct armada_ovl_plane_properties {
         uint16_t contrast;
         uint16_t saturation;
         uint32_t colorkey_mode;
+        uint32_t colorkey_enable;
 };
 
 struct armada_ovl_plane {
@@ -54,11 +55,13 @@ armada_ovl_update_attr(struct armada_ovl_plane_properties *prop,
         writel_relaxed(0x00002000, dcrtc->base + LCD_SPU_CBSH_HUE);
 
         spin_lock_irq(&dcrtc->irq_lock);
-        armada_updatel(prop->colorkey_mode | CFG_ALPHAM_GRA,
-                     CFG_CKMODE_MASK | CFG_ALPHAM_MASK | CFG_ALPHA_MASK,
-                     dcrtc->base + LCD_SPU_DMA_CTRL1);
-
-        armada_updatel(ADV_GRACOLORKEY, 0, dcrtc->base + LCD_SPU_ADV_REG);
+        armada_updatel(prop->colorkey_mode,
+                       CFG_CKMODE_MASK | CFG_ALPHAM_MASK | CFG_ALPHA_MASK,
+                       dcrtc->base + LCD_SPU_DMA_CTRL1);
+        if (dcrtc->variant->has_spu_adv_reg)
+                armada_updatel(prop->colorkey_enable,
+                               ADV_GRACOLORKEY | ADV_VIDCOLORKEY,
+                               dcrtc->base + LCD_SPU_ADV_REG);
         spin_unlock_irq(&dcrtc->irq_lock);
 }
 
@@ -321,8 +324,17 @@ static int armada_ovl_plane_set_property(struct drm_plane *plane,
                 dplane->prop.colorkey_vb |= K2B(val);
                 update_attr = true;
         } else if (property == priv->colorkey_mode_prop) {
-                dplane->prop.colorkey_mode &= ~CFG_CKMODE_MASK;
-                dplane->prop.colorkey_mode |= CFG_CKMODE(val);
+                if (val == CKMODE_DISABLE) {
+                        dplane->prop.colorkey_mode =
+                                CFG_CKMODE(CKMODE_DISABLE) |
+                                CFG_ALPHAM_CFG | CFG_ALPHA(255);
+                        dplane->prop.colorkey_enable = 0;
+                } else {
+                        dplane->prop.colorkey_mode =
+                                CFG_CKMODE(val) |
+                                CFG_ALPHAM_GRA | CFG_ALPHA(0);
+                        dplane->prop.colorkey_enable = ADV_GRACOLORKEY;
+                }
                 update_attr = true;
         } else if (property == priv->brightness_prop) {
                 dplane->prop.brightness = val - 256;
@@ -453,7 +465,9 @@ int armada_overlay_plane_create(struct drm_device *dev, unsigned long crtcs)
         dplane->prop.colorkey_yr = 0xfefefe00;
         dplane->prop.colorkey_ug = 0x01010100;
         dplane->prop.colorkey_vb = 0x01010100;
-        dplane->prop.colorkey_mode = CFG_CKMODE(CKMODE_RGB);
+        dplane->prop.colorkey_mode = CFG_CKMODE(CKMODE_RGB) |
+                                     CFG_ALPHAM_GRA | CFG_ALPHA(0);
+        dplane->prop.colorkey_enable = ADV_GRACOLORKEY;
         dplane->prop.brightness = 0;
         dplane->prop.contrast = 0x4000;
         dplane->prop.saturation = 0x4000;
diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
index b51c05d03f14..7f562410f9cf 100644
--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
+++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
@@ -862,6 +862,7 @@ static int cmd_reg_handler(struct parser_exec_state *s,
 {
         struct intel_vgpu *vgpu = s->vgpu;
         struct intel_gvt *gvt = vgpu->gvt;
+        u32 ctx_sr_ctl;
 
         if (offset + 4 > gvt->device_info.mmio_size) {
                 gvt_vgpu_err("%s access to (%x) outside of MMIO range\n",
@@ -894,6 +895,28 @@ static int cmd_reg_handler(struct parser_exec_state *s,
                 patch_value(s, cmd_ptr(s, index), VGT_PVINFO_PAGE);
         }
 
+        /* TODO
+         * Right now only scan LRI command on KBL and in inhibit context.
+         * It's good enough to support initializing mmio by lri command in
+         * vgpu inhibit context on KBL.
+         */
+        if (IS_KABYLAKE(s->vgpu->gvt->dev_priv) &&
+                        intel_gvt_mmio_is_in_ctx(gvt, offset) &&
+                        !strncmp(cmd, "lri", 3)) {
+                intel_gvt_hypervisor_read_gpa(s->vgpu,
+                        s->workload->ring_context_gpa + 12, &ctx_sr_ctl, 4);
+                /* check inhibit context */
+                if (ctx_sr_ctl & 1) {
+                        u32 data = cmd_val(s, index + 1);
+
+                        if (intel_gvt_mmio_has_mode_mask(s->vgpu->gvt, offset))
+                                intel_vgpu_mask_mmio_write(vgpu,
+                                                        offset, &data, 4);
+                        else
+                                vgpu_vreg(vgpu, offset) = data;
+                }
+        }
+
         /* TODO: Update the global mask if this MMIO is a masked-MMIO */
         intel_gvt_mmio_set_cmd_accessed(gvt, offset);
         return 0;
diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
index 05d15a095310..858967daf04b 100644
--- a/drivers/gpu/drm/i915/gvt/gvt.h
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -268,6 +268,8 @@ struct intel_gvt_mmio {
 #define F_CMD_ACCESSED  (1 << 5)
 /* This reg could be accessed by unaligned address */
 #define F_UNALIGN       (1 << 6)
+/* This reg is saved/restored in context */
+#define F_IN_CTX        (1 << 7)
 
         struct gvt_mmio_block *mmio_block;
         unsigned int num_mmio_block;
@@ -639,6 +641,33 @@ static inline bool intel_gvt_mmio_has_mode_mask(
         return gvt->mmio.mmio_attribute[offset >> 2] & F_MODE_MASK;
 }
 
+/**
+ * intel_gvt_mmio_is_in_ctx - check if a MMIO has in-ctx mask
+ * @gvt: a GVT device
+ * @offset: register offset
+ *
+ * Returns:
+ * True if a MMIO has a in-context mask, false if it isn't.
+ *
+ */
+static inline bool intel_gvt_mmio_is_in_ctx(
+                        struct intel_gvt *gvt, unsigned int offset)
+{
+        return gvt->mmio.mmio_attribute[offset >> 2] & F_IN_CTX;
+}
+
+/**
+ * intel_gvt_mmio_set_in_ctx - mask a MMIO in logical context
+ * @gvt: a GVT device
+ * @offset: register offset
+ *
+ */
+static inline void intel_gvt_mmio_set_in_ctx(
+                        struct intel_gvt *gvt, unsigned int offset)
+{
+        gvt->mmio.mmio_attribute[offset >> 2] |= F_IN_CTX;
+}
+
 int intel_gvt_debugfs_add_vgpu(struct intel_vgpu *vgpu);
 void intel_gvt_debugfs_remove_vgpu(struct intel_vgpu *vgpu);
 int intel_gvt_debugfs_init(struct intel_gvt *gvt);
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
index bcbc47a88a70..8f1caacdc78a 100644
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -3046,6 +3046,30 @@ int intel_vgpu_default_mmio_write(struct intel_vgpu *vgpu, unsigned int offset,
 }
 
 /**
+ * intel_vgpu_mask_mmio_write - write mask register
+ * @vgpu: a vGPU
+ * @offset: access offset
+ * @p_data: write data buffer
+ * @bytes: access data length
+ *
+ * Returns:
+ * Zero on success, negative error code if failed.
+ */
+int intel_vgpu_mask_mmio_write(struct intel_vgpu *vgpu, unsigned int offset,
+                void *p_data, unsigned int bytes)
+{
+        u32 mask, old_vreg;
+
+        old_vreg = vgpu_vreg(vgpu, offset);
+        write_vreg(vgpu, offset, p_data, bytes);
+        mask = vgpu_vreg(vgpu, offset) >> 16;
+        vgpu_vreg(vgpu, offset) = (old_vreg & ~mask) |
+                                (vgpu_vreg(vgpu, offset) & mask);
+
+        return 0;
+}
+
+/**
  * intel_gvt_in_force_nonpriv_whitelist - if a mmio is in whitelist to be
  * force-nopriv register
  *
diff --git a/drivers/gpu/drm/i915/gvt/mmio.h b/drivers/gpu/drm/i915/gvt/mmio.h
index 71b620875943..dac8c6401e26 100644
--- a/drivers/gpu/drm/i915/gvt/mmio.h
+++ b/drivers/gpu/drm/i915/gvt/mmio.h
@@ -98,4 +98,6 @@ bool intel_gvt_in_force_nonpriv_whitelist(struct intel_gvt *gvt,
 int intel_vgpu_mmio_reg_rw(struct intel_vgpu *vgpu, unsigned int offset,
                            void *pdata, unsigned int bytes, bool is_read);
 
+int intel_vgpu_mask_mmio_write(struct intel_vgpu *vgpu, unsigned int offset,
+                                  void *p_data, unsigned int bytes);
 #endif
diff --git a/drivers/gpu/drm/i915/gvt/mmio_context.c b/drivers/gpu/drm/i915/gvt/mmio_context.c
index 0f949554d118..5ca9caf7552a 100644
--- a/drivers/gpu/drm/i915/gvt/mmio_context.c
+++ b/drivers/gpu/drm/i915/gvt/mmio_context.c
@@ -581,7 +581,9 @@ void intel_gvt_init_engine_mmio_context(struct intel_gvt *gvt)
 
         for (mmio = gvt->engine_mmio_list.mmio;
              i915_mmio_reg_valid(mmio->reg); mmio++) {
-                if (mmio->in_context)
+                if (mmio->in_context) {
                         gvt->engine_mmio_list.ctx_mmio_count[mmio->ring_id]++;
+                        intel_gvt_mmio_set_in_ctx(gvt, mmio->reg.reg);
+                }
         }
 }
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 4a02747ac658..c16cb025755e 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1998,10 +1998,38 @@ static void valleyview_pipestat_irq_handler(struct drm_i915_private *dev_priv,
 
 static u32 i9xx_hpd_irq_ack(struct drm_i915_private *dev_priv)
 {
-        u32 hotplug_status = I915_READ(PORT_HOTPLUG_STAT);
+        u32 hotplug_status = 0, hotplug_status_mask;
+        int i;
+
+        if (IS_G4X(dev_priv) ||
+            IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
+                hotplug_status_mask = HOTPLUG_INT_STATUS_G4X |
+                        DP_AUX_CHANNEL_MASK_INT_STATUS_G4X;
+        else
+                hotplug_status_mask = HOTPLUG_INT_STATUS_I915;
 
-        if (hotplug_status)
+        /*
+         * We absolutely have to clear all the pending interrupt
+         * bits in PORT_HOTPLUG_STAT. Otherwise the ISR port
+         * interrupt bit won't have an edge, and the i965/g4x
+         * edge triggered IIR will not notice that an interrupt
+         * is still pending. We can't use PORT_HOTPLUG_EN to
+         * guarantee the edge as the act of toggling the enable
+         * bits can itself generate a new hotplug interrupt :(
+         */
+        for (i = 0; i < 10; i++) {
+                u32 tmp = I915_READ(PORT_HOTPLUG_STAT) & hotplug_status_mask;
+
+                if (tmp == 0)
+                        return hotplug_status;
+
+                hotplug_status |= tmp;
                 I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status);
+        }
+
+        WARN_ONCE(1,
+                  "PORT_HOTPLUG_STAT did not clear (0x%08x)\n",
+                  I915_READ(PORT_HOTPLUG_STAT));
 
         return hotplug_status;
 }
diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.c b/drivers/gpu/drm/nouveau/dispnv04/disp.c
index 501d2d290e9c..70dce544984e 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/disp.c
@@ -55,6 +55,9 @@ nv04_display_create(struct drm_device *dev)
         nouveau_display(dev)->init = nv04_display_init;
         nouveau_display(dev)->fini = nv04_display_fini;
 
+        /* Pre-nv50 doesn't support atomic, so don't expose the ioctls */
+        dev->driver->driver_features &= ~DRIVER_ATOMIC;
+
         nouveau_hw_save_vga_fonts(dev, 1);
 
         nv04_crtc_create(dev, 0);
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index b83465ae7c1b..9bae4db84cfb 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -1585,8 +1585,9 @@ nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe)
  *****************************************************************************/
 
 static void
-nv50_disp_atomic_commit_core(struct nouveau_drm *drm, u32 *interlock)
+nv50_disp_atomic_commit_core(struct drm_atomic_state *state, u32 *interlock)
 {
+        struct nouveau_drm *drm = nouveau_drm(state->dev);
         struct nv50_disp *disp = nv50_disp(drm->dev);
         struct nv50_core *core = disp->core;
         struct nv50_mstm *mstm;
@@ -1618,6 +1619,22 @@ nv50_disp_atomic_commit_core(struct nouveau_drm *drm, u32 *interlock)
 }
 
 static void
+nv50_disp_atomic_commit_wndw(struct drm_atomic_state *state, u32 *interlock)
+{
+        struct drm_plane_state *new_plane_state;
+        struct drm_plane *plane;
+        int i;
+
+        for_each_new_plane_in_state(state, plane, new_plane_state, i) {
+                struct nv50_wndw *wndw = nv50_wndw(plane);
+                if (interlock[wndw->interlock.type] & wndw->interlock.data) {
+                        if (wndw->func->update)
+                                wndw->func->update(wndw, interlock);
+                }
+        }
+}
+
+static void
 nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
 {
         struct drm_device *dev = state->dev;
@@ -1684,7 +1701,8 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
                         help->disable(encoder);
                         interlock[NV50_DISP_INTERLOCK_CORE] |= 1;
                         if (outp->flush_disable) {
-                                nv50_disp_atomic_commit_core(drm, interlock);
+                                nv50_disp_atomic_commit_wndw(state, interlock);
+                                nv50_disp_atomic_commit_core(state, interlock);
                                 memset(interlock, 0x00, sizeof(interlock));
                         }
                 }
@@ -1693,15 +1711,8 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
         /* Flush disable. */
         if (interlock[NV50_DISP_INTERLOCK_CORE]) {
                 if (atom->flush_disable) {
-                        for_each_new_plane_in_state(state, plane, new_plane_state, i) {
-                                struct nv50_wndw *wndw = nv50_wndw(plane);
-                                if (interlock[wndw->interlock.type] & wndw->interlock.data) {
-                                        if (wndw->func->update)
-                                                wndw->func->update(wndw, interlock);
-                                }
-                        }
-
-                        nv50_disp_atomic_commit_core(drm, interlock);
+                        nv50_disp_atomic_commit_wndw(state, interlock);
+                        nv50_disp_atomic_commit_core(state, interlock);
                         memset(interlock, 0x00, sizeof(interlock));
                 }
         }
@@ -1762,18 +1773,14 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
         }
 
         /* Flush update. */
-        for_each_new_plane_in_state(state, plane, new_plane_state, i) {
-                struct nv50_wndw *wndw = nv50_wndw(plane);
-                if (interlock[wndw->interlock.type] & wndw->interlock.data) {
-                        if (wndw->func->update)
-                                wndw->func->update(wndw, interlock);
-                }
-        }
+        nv50_disp_atomic_commit_wndw(state, interlock);
 
         if (interlock[NV50_DISP_INTERLOCK_CORE]) {
                 if (interlock[NV50_DISP_INTERLOCK_BASE] ||
+                    interlock[NV50_DISP_INTERLOCK_OVLY] ||
+                    interlock[NV50_DISP_INTERLOCK_WNDW] ||
                     !atom->state.legacy_cursor_update)
-                        nv50_disp_atomic_commit_core(drm, interlock);
+                        nv50_disp_atomic_commit_core(state, interlock);
                 else
                         disp->core->func->update(disp->core, interlock, false);
         }
@@ -1871,7 +1878,7 @@ nv50_disp_atomic_commit(struct drm_device *dev,
                 nv50_disp_atomic_commit_tail(state);
 
         drm_for_each_crtc(crtc, dev) {
-                if (crtc->state->enable) {
+                if (crtc->state->active) {
                         if (!drm->have_disp_power_ref) {
                                 drm->have_disp_power_ref = true;
                                 return 0;
@@ -2119,10 +2126,6 @@ nv50_display_destroy(struct drm_device *dev)
         kfree(disp);
 }
 
-MODULE_PARM_DESC(atomic, "Expose atomic ioctl (default: disabled)");
-static int nouveau_atomic = 0;
-module_param_named(atomic, nouveau_atomic, int, 0400);
-
 int
 nv50_display_create(struct drm_device *dev)
 {
@@ -2147,8 +2150,6 @@ nv50_display_create(struct drm_device *dev)
         disp->disp = &nouveau_display(dev)->disp;
         dev->mode_config.funcs = &nv50_disp_func;
         dev->driver->driver_features |= DRIVER_PREFER_XBGR_30BPP;
-        if (nouveau_atomic)
-                dev->driver->driver_features |= DRIVER_ATOMIC;
 
         /* small shared memory area we use for notifiers and semaphores */
         ret = nouveau_bo_new(&drm->client, 4096, 0x1000, TTM_PL_FLAG_VRAM,
diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
index debbbf0fd4bd..408b955e5c39 100644
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
@@ -267,6 +267,7 @@ nouveau_backlight_init(struct drm_device *dev)
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct nvif_device *device = &drm->client.device;
         struct drm_connector *connector;
+        struct drm_connector_list_iter conn_iter;
 
         INIT_LIST_HEAD(&drm->bl_connectors);
 
@@ -275,7 +276,8 @@ nouveau_backlight_init(struct drm_device *dev)
                 return 0;
         }
 
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+        drm_connector_list_iter_begin(dev, &conn_iter);
+        drm_for_each_connector_iter(connector, &conn_iter) {
                 if (connector->connector_type != DRM_MODE_CONNECTOR_LVDS &&
                     connector->connector_type != DRM_MODE_CONNECTOR_eDP)
                         continue;
@@ -292,7 +294,7 @@ nouveau_backlight_init(struct drm_device *dev)
                         break;
                 }
         }
-
+        drm_connector_list_iter_end(&conn_iter);
 
         return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 7b557c354307..af68eae4c626 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -1208,14 +1208,19 @@ nouveau_connector_create(struct drm_device *dev, int index)
         struct nouveau_display *disp = nouveau_display(dev);
         struct nouveau_connector *nv_connector = NULL;
         struct drm_connector *connector;
+        struct drm_connector_list_iter conn_iter;
         int type, ret = 0;
         bool dummy;
 
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+        drm_connector_list_iter_begin(dev, &conn_iter);
+        nouveau_for_each_non_mst_connector_iter(connector, &conn_iter) {
                 nv_connector = nouveau_connector(connector);
-                if (nv_connector->index == index)
+                if (nv_connector->index == index) {
+                        drm_connector_list_iter_end(&conn_iter);
                         return connector;
+                }
         }
+        drm_connector_list_iter_end(&conn_iter);
 
         nv_connector = kzalloc(sizeof(*nv_connector), GFP_KERNEL);
         if (!nv_connector)
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h
index a4d1a059bd3d..dc7454e7f19a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.h
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.h
@@ -33,6 +33,7 @@
 #include <drm/drm_encoder.h>
 #include <drm/drm_dp_helper.h>
 #include "nouveau_crtc.h"
+#include "nouveau_encoder.h"
 
 struct nvkm_i2c_port;
 
@@ -60,19 +61,46 @@ static inline struct nouveau_connector *nouveau_connector(
         return container_of(con, struct nouveau_connector, base);
 }
 
+static inline bool
+nouveau_connector_is_mst(struct drm_connector *connector)
+{
+        const struct nouveau_encoder *nv_encoder;
+        const struct drm_encoder *encoder;
+
+        if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)
+                return false;
+
+        nv_encoder = find_encoder(connector, DCB_OUTPUT_ANY);
+        if (!nv_encoder)
+                return false;
+
+        encoder = &nv_encoder->base.base;
+        return encoder->encoder_type == DRM_MODE_ENCODER_DPMST;
+}
+
+#define nouveau_for_each_non_mst_connector_iter(connector, iter) \
+        drm_for_each_connector_iter(connector, iter) \
+                for_each_if(!nouveau_connector_is_mst(connector))
+
 static inline struct nouveau_connector *
 nouveau_crtc_connector_get(struct nouveau_crtc *nv_crtc)
 {
         struct drm_device *dev = nv_crtc->base.dev;
         struct drm_connector *connector;
+        struct drm_connector_list_iter conn_iter;
+        struct nouveau_connector *nv_connector = NULL;
         struct drm_crtc *crtc = to_drm_crtc(nv_crtc);
 
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-                if (connector->encoder && connector->encoder->crtc == crtc)
-                        return nouveau_connector(connector);
+        drm_connector_list_iter_begin(dev, &conn_iter);
+        nouveau_for_each_non_mst_connector_iter(connector, &conn_iter) {
+                if (connector->encoder && connector->encoder->crtc == crtc) {
+                        nv_connector = nouveau_connector(connector);
+                        break;
+                }
         }
+        drm_connector_list_iter_end(&conn_iter);
 
-        return NULL;
+        return nv_connector;
 }
 
 struct drm_connector *
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 774b429142bc..ec7861457b84 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -404,6 +404,7 @@ nouveau_display_init(struct drm_device *dev)
         struct nouveau_display *disp = nouveau_display(dev);
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct drm_connector *connector;
+        struct drm_connector_list_iter conn_iter;
         int ret;
 
         ret = disp->init(dev);
@@ -411,10 +412,12 @@ nouveau_display_init(struct drm_device *dev)
                 return ret;
 
         /* enable hotplug interrupts */
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+        drm_connector_list_iter_begin(dev, &conn_iter);
+        nouveau_for_each_non_mst_connector_iter(connector, &conn_iter) {
                 struct nouveau_connector *conn = nouveau_connector(connector);
                 nvif_notify_get(&conn->hpd);
         }
+        drm_connector_list_iter_end(&conn_iter);
 
         /* enable flip completion events */
         nvif_notify_get(&drm->flip);
@@ -427,6 +430,7 @@ nouveau_display_fini(struct drm_device *dev, bool suspend)
         struct nouveau_display *disp = nouveau_display(dev);
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct drm_connector *connector;
+        struct drm_connector_list_iter conn_iter;
 
         if (!suspend) {
                 if (drm_drv_uses_atomic_modeset(dev))
@@ -439,10 +443,12 @@ nouveau_display_fini(struct drm_device *dev, bool suspend)
         nvif_notify_put(&drm->flip);
 
         /* disable hotplug interrupts */
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+        drm_connector_list_iter_begin(dev, &conn_iter);
+        nouveau_for_each_non_mst_connector_iter(connector, &conn_iter) {
                 struct nouveau_connector *conn = nouveau_connector(connector);
                 nvif_notify_put(&conn->hpd);
         }
+        drm_connector_list_iter_end(&conn_iter);
 
         drm_kms_helper_poll_disable(dev);
         disp->fini(dev);
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 775443c9af94..f5d3158f0378 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -81,6 +81,10 @@ MODULE_PARM_DESC(modeset, "enable driver (default: auto, "
 int nouveau_modeset = -1;
 module_param_named(modeset, nouveau_modeset, int, 0400);
 
+MODULE_PARM_DESC(atomic, "Expose atomic ioctl (default: disabled)");
+static int nouveau_atomic = 0;
+module_param_named(atomic, nouveau_atomic, int, 0400);
+
 MODULE_PARM_DESC(runpm, "disable (0), force enable (1), optimus only default (-1)");
 static int nouveau_runtime_pm = -1;
 module_param_named(runpm, nouveau_runtime_pm, int, 0400);
@@ -509,6 +513,9 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
 
         pci_set_master(pdev);
 
+        if (nouveau_atomic)
+                driver_pci.driver_features |= DRIVER_ATOMIC;
+
         ret = drm_get_pci_dev(pdev, pent, &driver_pci);
         if (ret) {
                 nvkm_device_del(&device);
@@ -874,22 +881,11 @@ nouveau_pmops_runtime_resume(struct device *dev)
 static int
 nouveau_pmops_runtime_idle(struct device *dev)
 {
-        struct pci_dev *pdev = to_pci_dev(dev);
-        struct drm_device *drm_dev = pci_get_drvdata(pdev);
-        struct nouveau_drm *drm = nouveau_drm(drm_dev);
-        struct drm_crtc *crtc;
-
         if (!nouveau_pmops_runtime()) {
                 pm_runtime_forbid(dev);
                 return -EBUSY;
         }
 
-        list_for_each_entry(crtc, &drm->dev->mode_config.crtc_list, head) {
-                if (crtc->enabled) {
-                        DRM_DEBUG_DRIVER("failing to power off - crtc active\n");
-                        return -EBUSY;
-                }
-        }
         pm_runtime_mark_last_busy(dev);
         pm_runtime_autosuspend(dev);
         /* we don't want the main rpm_idle to call suspend - we want to autosuspend */
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 300daee74209..e6ccafcb9c41 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -616,7 +616,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
                 struct nouveau_bo *nvbo;
                 uint32_t data;
 
-                if (unlikely(r->bo_index > req->nr_buffers)) {
+                if (unlikely(r->bo_index >= req->nr_buffers)) {
                         NV_PRINTK(err, cli, "reloc bo index invalid\n");
                         ret = -EINVAL;
                         break;
@@ -626,7 +626,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
                 if (b->presumed.valid)
                         continue;
 
-                if (unlikely(r->reloc_bo_index > req->nr_buffers)) {
+                if (unlikely(r->reloc_bo_index >= req->nr_buffers)) {
                         NV_PRINTK(err, cli, "reloc container bo index invalid\n");
                         ret = -EINVAL;
                         break;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
index 73b5d46104bd..434d2fc5bb1c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
@@ -140,6 +140,9 @@ nvkm_fb_init(struct nvkm_subdev *subdev)
         if (fb->func->init)
                 fb->func->init(fb);
 
+        if (fb->func->init_remapper)
+                fb->func->init_remapper(fb);
+
         if (fb->func->init_page) {
                 ret = fb->func->init_page(fb);
                 if (WARN_ON(ret))
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c
index dffe1f5e1071..8205ce436b3e 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c
@@ -37,6 +37,14 @@ gp100_fb_init_unkn(struct nvkm_fb *base)
 }
 
 void
+gp100_fb_init_remapper(struct nvkm_fb *fb)
+{
+        struct nvkm_device *device = fb->subdev.device;
+        /* Disable address remapper. */
+        nvkm_mask(device, 0x100c14, 0x00040000, 0x00000000);
+}
+
+void
 gp100_fb_init(struct nvkm_fb *base)
 {
         struct gf100_fb *fb = gf100_fb(base);
@@ -56,6 +64,7 @@ gp100_fb = {
         .dtor = gf100_fb_dtor,
         .oneinit = gf100_fb_oneinit,
         .init = gp100_fb_init,
+        .init_remapper = gp100_fb_init_remapper,
         .init_page = gm200_fb_init_page,
         .init_unkn = gp100_fb_init_unkn,
         .ram_new = gp100_ram_new,
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c
index b84b9861ef26..b4d74e815674 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c
@@ -31,6 +31,7 @@ gp102_fb = {
         .dtor = gf100_fb_dtor,
         .oneinit = gf100_fb_oneinit,
         .init = gp100_fb_init,
+        .init_remapper = gp100_fb_init_remapper,
         .init_page = gm200_fb_init_page,
         .ram_new = gp100_ram_new,
 };
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
index 2857f31466bf..1e4ad61c19e1 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
@@ -11,6 +11,7 @@ struct nvkm_fb_func {
         u32 (*tags)(struct nvkm_fb *);
         int (*oneinit)(struct nvkm_fb *);
         void (*init)(struct nvkm_fb *);
+        void (*init_remapper)(struct nvkm_fb *);
         int (*init_page)(struct nvkm_fb *);
         void (*init_unkn)(struct nvkm_fb *);
         void (*intr)(struct nvkm_fb *);
@@ -69,5 +70,6 @@ int gf100_fb_init_page(struct nvkm_fb *);
 
 int gm200_fb_init_page(struct nvkm_fb *);
 
+void gp100_fb_init_remapper(struct nvkm_fb *);
 void gp100_fb_init_unkn(struct nvkm_fb *);
 #endif
diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile
index 2589f4acd5ae..9c81301d0eed 100644
--- a/drivers/gpu/drm/sun4i/Makefile
+++ b/drivers/gpu/drm/sun4i/Makefile
@@ -32,7 +32,10 @@ obj-$(CONFIG_DRM_SUN4I)		+= sun4i-tcon.o
 obj-$(CONFIG_DRM_SUN4I)         += sun4i_tv.o
 obj-$(CONFIG_DRM_SUN4I)         += sun6i_drc.o
 
-obj-$(CONFIG_DRM_SUN4I_BACKEND) += sun4i-backend.o sun4i-frontend.o
+obj-$(CONFIG_DRM_SUN4I_BACKEND) += sun4i-backend.o
+ifdef CONFIG_DRM_SUN4I_BACKEND
+obj-$(CONFIG_DRM_SUN4I)         += sun4i-frontend.o
+endif
 obj-$(CONFIG_DRM_SUN4I_HDMI)    += sun4i-drm-hdmi.o
 obj-$(CONFIG_DRM_SUN6I_DSI)     += sun6i-dsi.o
 obj-$(CONFIG_DRM_SUN8I_DW_HDMI) += sun8i-drm-hdmi.o
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 776c1513e582..a2bd5876c633 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -398,7 +398,7 @@ int tegra_drm_submit(struct tegra_drm_context *context,
                  * unaligned offset is malformed and cause commands stream
                  * corruption on the buffer address relocation.
                  */
-                if (offset & 3 || offset >= obj->gem.size) {
+                if (offset & 3 || offset > obj->gem.size) {
                         err = -EINVAL;
                         goto fail;
                 }
diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index f1d5f76e9c33..d88073e7d22d 100644
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -218,6 +218,9 @@ static int host1x_probe(struct platform_device *pdev)
                 return err;
         }
 
+        if (IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL))
+                goto skip_iommu;
+
         host->group = iommu_group_get(&pdev->dev);
         if (host->group) {
                 struct iommu_domain_geometry *geometry;
diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c
index e2f4a4d93d20..527a1cddb14f 100644
--- a/drivers/gpu/host1x/job.c
+++ b/drivers/gpu/host1x/job.c
@@ -569,7 +569,8 @@ void host1x_job_unpin(struct host1x_job *job)
         for (i = 0; i < job->num_unpins; i++) {
                 struct host1x_job_unpin_data *unpin = &job->unpins[i];
 
-                if (!IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL) && host->domain) {
+                if (!IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL) &&
+                    unpin->size && host->domain) {
                         iommu_unmap(host->domain, job->addr_phys[i],
                                     unpin->size);
                         free_iova(&host->iova,
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index b344a883f116..115ff26e9ced 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -484,14 +484,37 @@ static int dmar_forcedac;
 static int intel_iommu_strict;
 static int intel_iommu_superpage = 1;
 static int intel_iommu_ecs = 1;
+static int intel_iommu_pasid28;
 static int iommu_identity_mapping;
 
 #define IDENTMAP_ALL            1
 #define IDENTMAP_GFX            2
 #define IDENTMAP_AZALIA         4
 
-#define ecs_enabled(iommu)      (intel_iommu_ecs && ecap_ecs(iommu->ecap))
-#define pasid_enabled(iommu)    (ecs_enabled(iommu) && ecap_pasid(iommu->ecap))
+/* Broadwell and Skylake have broken ECS support — normal so-called "second
+ * level" translation of DMA requests-without-PASID doesn't actually happen
+ * unless you also set the NESTE bit in an extended context-entry. Which of
+ * course means that SVM doesn't work because it's trying to do nested
+ * translation of the physical addresses it finds in the process page tables,
+ * through the IOVA->phys mapping found in the "second level" page tables.
+ *
+ * The VT-d specification was retroactively changed to change the definition
+ * of the capability bits and pretend that Broadwell/Skylake never happened...
+ * but unfortunately the wrong bit was changed. It's ECS which is broken, but
+ * for some reason it was the PASID capability bit which was redefined (from
+ * bit 28 on BDW/SKL to bit 40 in future).
+ *
+ * So our test for ECS needs to eschew those implementations which set the old
+ * PASID capabiity bit 28, since those are the ones on which ECS is broken.
+ * Unless we are working around the 'pasid28' limitations, that is, by putting
+ * the device into passthrough mode for normal DMA and thus masking the bug.
+ */
+#define ecs_enabled(iommu) (intel_iommu_ecs && ecap_ecs(iommu->ecap) && \
+                            (intel_iommu_pasid28 || !ecap_broken_pasid(iommu->ecap)))
+/* PASID support is thus enabled if ECS is enabled and *either* of the old
+ * or new capability bits are set. */
+#define pasid_enabled(iommu) (ecs_enabled(iommu) &&                     \
+                              (ecap_pasid(iommu->ecap) || ecap_broken_pasid(iommu->ecap)))
 
 int intel_iommu_gfx_mapped;
 EXPORT_SYMBOL_GPL(intel_iommu_gfx_mapped);
@@ -554,6 +577,11 @@ static int __init intel_iommu_setup(char *str)
                         printk(KERN_INFO
                                 "Intel-IOMMU: disable extended context table support\n");
                         intel_iommu_ecs = 0;
+                } else if (!strncmp(str, "pasid28", 7)) {
+                        printk(KERN_INFO
+                                "Intel-IOMMU: enable pre-production PASID support\n");
+                        intel_iommu_pasid28 = 1;
+                        iommu_identity_mapping |= IDENTMAP_GFX;
                 } else if (!strncmp(str, "tboot_noforce", 13)) {
                         printk(KERN_INFO
                                 "Intel-IOMMU: not forcing on after tboot. This could expose security risk for tboot\n");
diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c
index 07ea6a48aac6..87107c995cb5 100644
--- a/drivers/md/dm-writecache.c
+++ b/drivers/md/dm-writecache.c
@@ -136,6 +136,7 @@ struct dm_writecache {
         struct dm_target *ti;
         struct dm_dev *dev;
         struct dm_dev *ssd_dev;
+        sector_t start_sector;
         void *memory_map;
         uint64_t memory_map_size;
         size_t metadata_sectors;
@@ -293,6 +294,10 @@ static int persistent_memory_claim(struct dm_writecache *wc)
         }
 
         dax_read_unlock(id);
+
+        wc->memory_map += (size_t)wc->start_sector << SECTOR_SHIFT;
+        wc->memory_map_size -= (size_t)wc->start_sector << SECTOR_SHIFT;
+
         return 0;
 err3:
         kvfree(pages);
@@ -311,7 +316,7 @@ static int persistent_memory_claim(struct dm_writecache *wc)
 static void persistent_memory_release(struct dm_writecache *wc)
 {
         if (wc->memory_vmapped)
-                vunmap(wc->memory_map);
+                vunmap(wc->memory_map - ((size_t)wc->start_sector << SECTOR_SHIFT));
 }
 
 static struct page *persistent_memory_page(void *addr)
@@ -359,7 +364,7 @@ static void *memory_data(struct dm_writecache *wc, struct wc_entry *e)
 
 static sector_t cache_sector(struct dm_writecache *wc, struct wc_entry *e)
 {
-        return wc->metadata_sectors +
+        return wc->start_sector + wc->metadata_sectors +
                 ((sector_t)e->index << (wc->block_size_bits - SECTOR_SHIFT));
 }
 
@@ -471,6 +476,7 @@ static void ssd_commit_flushed(struct dm_writecache *wc)
                 if (unlikely(region.sector + region.count > wc->metadata_sectors))
                         region.count = wc->metadata_sectors - region.sector;
 
+                region.sector += wc->start_sector;
                 atomic_inc(&endio.count);
                 req.bi_op = REQ_OP_WRITE;
                 req.bi_op_flags = REQ_SYNC;
@@ -1946,14 +1952,6 @@ static int writecache_ctr(struct dm_target *ti, unsigned argc, char **argv)
         }
         wc->memory_map_size = i_size_read(wc->ssd_dev->bdev->bd_inode);
 
-        if (WC_MODE_PMEM(wc)) {
-                r = persistent_memory_claim(wc);
-                if (r) {
-                        ti->error = "Unable to map persistent memory for cache";
-                        goto bad;
-                }
-        }
-
         /*
          * Parse the cache block size
          */
@@ -1982,7 +1980,16 @@ static int writecache_ctr(struct dm_target *ti, unsigned argc, char **argv)
 
         while (opt_params) {
                 string = dm_shift_arg(&as), opt_params--;
-                if (!strcasecmp(string, "high_watermark") && opt_params >= 1) {
+                if (!strcasecmp(string, "start_sector") && opt_params >= 1) {
+                        unsigned long long start_sector;
+                        string = dm_shift_arg(&as), opt_params--;
+                        if (sscanf(string, "%llu%c", &start_sector, &dummy) != 1)
+                                goto invalid_optional;
+                        wc->start_sector = start_sector;
+                        if (wc->start_sector != start_sector ||
+                            wc->start_sector >= wc->memory_map_size >> SECTOR_SHIFT)
+                                goto invalid_optional;
+                } else if (!strcasecmp(string, "high_watermark") && opt_params >= 1) {
                         string = dm_shift_arg(&as), opt_params--;
                         if (sscanf(string, "%d%c", &high_wm_percent, &dummy) != 1)
                                 goto invalid_optional;
@@ -2039,12 +2046,20 @@ invalid_optional:
                 goto bad;
         }
 
-        if (!WC_MODE_PMEM(wc)) {
+        if (WC_MODE_PMEM(wc)) {
+                r = persistent_memory_claim(wc);
+                if (r) {
+                        ti->error = "Unable to map persistent memory for cache";
+                        goto bad;
+                }
+        } else {
                 struct dm_io_region region;
                 struct dm_io_request req;
                 size_t n_blocks, n_metadata_blocks;
                 uint64_t n_bitmap_bits;
 
+                wc->memory_map_size -= (uint64_t)wc->start_sector << SECTOR_SHIFT;
+
                 bio_list_init(&wc->flush_list);
                 wc->flush_thread = kthread_create(writecache_flush_thread, wc, "dm_writecache_flush");
                 if (IS_ERR(wc->flush_thread)) {
@@ -2097,7 +2112,7 @@ invalid_optional:
                 }
 
                 region.bdev = wc->ssd_dev->bdev;
-                region.sector = 0;
+                region.sector = wc->start_sector;
                 region.count = wc->metadata_sectors;
                 req.bi_op = REQ_OP_READ;
                 req.bi_op_flags = REQ_SYNC;
@@ -2265,7 +2280,7 @@ static void writecache_status(struct dm_target *ti, status_type_t type,
 
 static struct target_type writecache_target = {
         .name                   = "writecache",
-        .version                = {1, 0, 0},
+        .version                = {1, 1, 0},
         .module                 = THIS_MODULE,
         .ctr                    = writecache_ctr,
         .dtr                    = writecache_dtr,
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
index fc7383106946..91eb8910b1c9 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
@@ -63,8 +63,6 @@
 
 #define AQ_CFG_NAPI_WEIGHT     64U
 
-#define AQ_CFG_MULTICAST_ADDRESS_MAX     32U
-
 /*#define AQ_CFG_MAC_ADDR_PERMANENT {0x30, 0x0E, 0xE3, 0x12, 0x34, 0x56}*/
 
 #define AQ_NIC_FC_OFF    0U
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
index a2d416b24ffc..2c6ebd91a9f2 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
@@ -98,6 +98,8 @@ struct aq_stats_s {
 #define AQ_HW_MEDIA_TYPE_TP    1U
 #define AQ_HW_MEDIA_TYPE_FIBRE 2U
 
+#define AQ_HW_MULTICAST_ADDRESS_MAX     32U
+
 struct aq_hw_s {
         atomic_t flags;
         u8 rbl_enabled:1;
@@ -177,7 +179,7 @@ struct aq_hw_ops {
                                     unsigned int packet_filter);
 
         int (*hw_multicast_list_set)(struct aq_hw_s *self,
-                                     u8 ar_mac[AQ_CFG_MULTICAST_ADDRESS_MAX]
+                                     u8 ar_mac[AQ_HW_MULTICAST_ADDRESS_MAX]
                                      [ETH_ALEN],
                                      u32 count);
 
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c
index ba5fe8c4125d..e3ae29e523f0 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_main.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_main.c
@@ -135,17 +135,10 @@ err_exit:
 static void aq_ndev_set_multicast_settings(struct net_device *ndev)
 {
         struct aq_nic_s *aq_nic = netdev_priv(ndev);
-        int err = 0;
 
-        err = aq_nic_set_packet_filter(aq_nic, ndev->flags);
-        if (err < 0)
-                return;
+        aq_nic_set_packet_filter(aq_nic, ndev->flags);
 
-        if (netdev_mc_count(ndev)) {
-                err = aq_nic_set_multicast_list(aq_nic, ndev);
-                if (err < 0)
-                        return;
-        }
+        aq_nic_set_multicast_list(aq_nic, ndev);
 }
 
 static const struct net_device_ops aq_ndev_ops = {
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
index 1a1a6380c128..7a22d0257e04 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
@@ -563,34 +563,41 @@ err_exit:
 
 int aq_nic_set_multicast_list(struct aq_nic_s *self, struct net_device *ndev)
 {
+        unsigned int packet_filter = self->packet_filter;
         struct netdev_hw_addr *ha = NULL;
         unsigned int i = 0U;
 
-        self->mc_list.count = 0U;
-
-        netdev_for_each_mc_addr(ha, ndev) {
-                ether_addr_copy(self->mc_list.ar[i++], ha->addr);
-                ++self->mc_list.count;
+        self->mc_list.count = 0;
+        if (netdev_uc_count(ndev) > AQ_HW_MULTICAST_ADDRESS_MAX) {
+                packet_filter |= IFF_PROMISC;
+        } else {
+                netdev_for_each_uc_addr(ha, ndev) {
+                        ether_addr_copy(self->mc_list.ar[i++], ha->addr);
 
-                if (i >= AQ_CFG_MULTICAST_ADDRESS_MAX)
-                        break;
+                        if (i >= AQ_HW_MULTICAST_ADDRESS_MAX)
+                                break;
+                }
         }
 
-        if (i >= AQ_CFG_MULTICAST_ADDRESS_MAX) {
-                /* Number of filters is too big: atlantic does not support this.
-                 * Force all multi filter to support this.
-                 * With this we disable all UC filters and setup "all pass"
-                 * multicast mask
-                 */
-                self->packet_filter |= IFF_ALLMULTI;
-                self->aq_nic_cfg.mc_list_count = 0;
-                return self->aq_hw_ops->hw_packet_filter_set(self->aq_hw,
-                                                             self->packet_filter);
+        if (i + netdev_mc_count(ndev) > AQ_HW_MULTICAST_ADDRESS_MAX) {
+                packet_filter |= IFF_ALLMULTI;
         } else {
-                return self->aq_hw_ops->hw_multicast_list_set(self->aq_hw,
-                                                    self->mc_list.ar,
-                                                    self->mc_list.count);
+                netdev_for_each_mc_addr(ha, ndev) {
+                        ether_addr_copy(self->mc_list.ar[i++], ha->addr);
+
+                        if (i >= AQ_HW_MULTICAST_ADDRESS_MAX)
+                                break;
+                }
+        }
+
+        if (i > 0 && i < AQ_HW_MULTICAST_ADDRESS_MAX) {
+                packet_filter |= IFF_MULTICAST;
+                self->mc_list.count = i;
+                self->aq_hw_ops->hw_multicast_list_set(self->aq_hw,
+                                                       self->mc_list.ar,
+                                                       self->mc_list.count);
         }
+        return aq_nic_set_packet_filter(self, packet_filter);
 }
 
 int aq_nic_set_mtu(struct aq_nic_s *self, int new_mtu)
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
index faa533a0ec47..fecfc401f95d 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
@@ -75,7 +75,7 @@ struct aq_nic_s {
         struct aq_hw_link_status_s link_status;
         struct {
                 u32 count;
-                u8 ar[AQ_CFG_MULTICAST_ADDRESS_MAX][ETH_ALEN];
+                u8 ar[AQ_HW_MULTICAST_ADDRESS_MAX][ETH_ALEN];
         } mc_list;
 
         struct pci_dev *pdev;
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
index 67e2f9fb9402..8cc6abadc03b 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
@@ -765,7 +765,7 @@ static int hw_atl_a0_hw_packet_filter_set(struct aq_hw_s *self,
 
 static int hw_atl_a0_hw_multicast_list_set(struct aq_hw_s *self,
                                            u8 ar_mac
-                                           [AQ_CFG_MULTICAST_ADDRESS_MAX]
+                                           [AQ_HW_MULTICAST_ADDRESS_MAX]
                                            [ETH_ALEN],
                                            u32 count)
 {
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
index 819f6bcf9b4e..956860a69797 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
@@ -784,7 +784,7 @@ static int hw_atl_b0_hw_packet_filter_set(struct aq_hw_s *self,
 
 static int hw_atl_b0_hw_multicast_list_set(struct aq_hw_s *self,
                                            u8 ar_mac
-                                           [AQ_CFG_MULTICAST_ADDRESS_MAX]
+                                           [AQ_HW_MULTICAST_ADDRESS_MAX]
                                            [ETH_ALEN],
                                            u32 count)
 {
@@ -812,7 +812,7 @@ static int hw_atl_b0_hw_multicast_list_set(struct aq_hw_s *self,
 
                 hw_atl_rpfl2_uc_flr_en_set(self,
                                            (self->aq_nic_cfg->is_mc_list_enabled),
-                                    HW_ATL_B0_MAC_MIN + i);
+                                           HW_ATL_B0_MAC_MIN + i);
         }
 
         err = aq_hw_err_from_flags(self);
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index d5fca2e5a9bc..a1f60f89e059 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1946,8 +1946,8 @@ static int bcm_sysport_open(struct net_device *dev)
         if (!priv->is_lite)
                 priv->crc_fwd = !!(umac_readl(priv, UMAC_CMD) & CMD_CRC_FWD);
         else
-                priv->crc_fwd = !!(gib_readl(priv, GIB_CONTROL) &
-                                   GIB_FCS_STRIP);
+                priv->crc_fwd = !((gib_readl(priv, GIB_CONTROL) &
+                                  GIB_FCS_STRIP) >> GIB_FCS_STRIP_SHIFT);
 
         phydev = of_phy_connect(dev, priv->phy_dn, bcm_sysport_adj_link,
                                 0, priv->phy_interface);
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h
index d6e5d0cbf3a3..cf440b91fd04 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.h
+++ b/drivers/net/ethernet/broadcom/bcmsysport.h
@@ -278,7 +278,8 @@ struct bcm_rsb {
 #define  GIB_GTX_CLK_EXT_CLK            (0 << GIB_GTX_CLK_SEL_SHIFT)
 #define  GIB_GTX_CLK_125MHZ             (1 << GIB_GTX_CLK_SEL_SHIFT)
 #define  GIB_GTX_CLK_250MHZ             (2 << GIB_GTX_CLK_SEL_SHIFT)
-#define  GIB_FCS_STRIP                  (1 << 6)
+#define  GIB_FCS_STRIP_SHIFT            6
+#define  GIB_FCS_STRIP                  (1 << GIB_FCS_STRIP_SHIFT)
 #define  GIB_LCL_LOOP_EN                (1 << 7)
 #define  GIB_LCL_LOOP_TXEN              (1 << 8)
 #define  GIB_RMT_LOOP_EN                (1 << 9)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 176fc9f4d7de..4394c1162be4 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -5712,7 +5712,9 @@ static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init)
         }
         vnic->uc_filter_count = 1;
 
-        vnic->rx_mask = CFA_L2_SET_RX_MASK_REQ_MASK_BCAST;
+        vnic->rx_mask = 0;
+        if (bp->dev->flags & IFF_BROADCAST)
+                vnic->rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_BCAST;
 
         if ((bp->dev->flags & IFF_PROMISC) && bnxt_promisc_ok(bp))
                 vnic->rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;
@@ -5917,7 +5919,7 @@ unsigned int bnxt_get_max_func_irqs(struct bnxt *bp)
         return min_t(unsigned int, hw_resc->max_irqs, hw_resc->max_cp_rings);
 }
 
-void bnxt_set_max_func_irqs(struct bnxt *bp, unsigned int max_irqs)
+static void bnxt_set_max_func_irqs(struct bnxt *bp, unsigned int max_irqs)
 {
         bp->hw_resc.max_irqs = max_irqs;
 }
@@ -6888,7 +6890,7 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)
                 rc = bnxt_request_irq(bp);
                 if (rc) {
                         netdev_err(bp->dev, "bnxt_request_irq err: %x\n", rc);
-                        goto open_err;
+                        goto open_err_irq;
                 }
         }
 
@@ -6928,6 +6930,8 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)
 open_err:
         bnxt_debug_dev_exit(bp);
         bnxt_disable_napi(bp);
+
+open_err_irq:
         bnxt_del_napi(bp);
 
 open_err_free_mem:
@@ -7214,13 +7218,16 @@ static void bnxt_set_rx_mode(struct net_device *dev)
 
         mask &= ~(CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS |
                   CFA_L2_SET_RX_MASK_REQ_MASK_MCAST |
-                  CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST);
+                  CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST |
+                  CFA_L2_SET_RX_MASK_REQ_MASK_BCAST);
 
         if ((dev->flags & IFF_PROMISC) && bnxt_promisc_ok(bp))
                 mask |= CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;
 
         uc_update = bnxt_uc_list_updated(bp);
 
+        if (dev->flags & IFF_BROADCAST)
+                mask |= CFA_L2_SET_RX_MASK_REQ_MASK_BCAST;
         if (dev->flags & IFF_ALLMULTI) {
                 mask |= CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST;
                 vnic->mc_list_count = 0;
@@ -8502,11 +8509,11 @@ int bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx, bool shared)
         int rx, tx, cp;
 
         _bnxt_get_max_rings(bp, &rx, &tx, &cp);
+        *max_rx = rx;
+        *max_tx = tx;
         if (!rx || !tx || !cp)
                 return -ENOMEM;
 
-        *max_rx = rx;
-        *max_tx = tx;
         return bnxt_trim_rings(bp, max_rx, max_tx, cp, shared);
 }
 
@@ -8520,8 +8527,11 @@ static int bnxt_get_dflt_rings(struct bnxt *bp, int *max_rx, int *max_tx,
                 /* Not enough rings, try disabling agg rings. */
                 bp->flags &= ~BNXT_FLAG_AGG_RINGS;
                 rc = bnxt_get_max_rings(bp, max_rx, max_tx, shared);
-                if (rc)
+                if (rc) {
+                        /* set BNXT_FLAG_AGG_RINGS back for consistency */
+                        bp->flags |= BNXT_FLAG_AGG_RINGS;
                         return rc;
+                }
                 bp->flags |= BNXT_FLAG_NO_AGG_RINGS;
                 bp->dev->hw_features &= ~(NETIF_F_LRO | NETIF_F_GRO_HW);
                 bp->dev->features &= ~(NETIF_F_LRO | NETIF_F_GRO_HW);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 9b14eb610b9f..91575ef97c8c 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1470,7 +1470,6 @@ void bnxt_set_max_func_stat_ctxs(struct bnxt *bp, unsigned int max);
 unsigned int bnxt_get_max_func_cp_rings(struct bnxt *bp);
 void bnxt_set_max_func_cp_rings(struct bnxt *bp, unsigned int max);
 unsigned int bnxt_get_max_func_irqs(struct bnxt *bp);
-void bnxt_set_max_func_irqs(struct bnxt *bp, unsigned int max);
 int bnxt_get_avail_msix(struct bnxt *bp, int num);
 int bnxt_reserve_rings(struct bnxt *bp);
 void bnxt_tx_disable(struct bnxt *bp);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
index 795f45024c20..491bd40a254d 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
@@ -27,6 +27,15 @@
 #define BNXT_FID_INVALID                        0xffff
 #define VLAN_TCI(vid, prio)     ((vid) | ((prio) << VLAN_PRIO_SHIFT))
 
+#define is_vlan_pcp_wildcarded(vlan_tci_mask)   \
+        ((ntohs(vlan_tci_mask) & VLAN_PRIO_MASK) == 0x0000)
+#define is_vlan_pcp_exactmatch(vlan_tci_mask)   \
+        ((ntohs(vlan_tci_mask) & VLAN_PRIO_MASK) == VLAN_PRIO_MASK)
+#define is_vlan_pcp_zero(vlan_tci)      \
+        ((ntohs(vlan_tci) & VLAN_PRIO_MASK) == 0x0000)
+#define is_vid_exactmatch(vlan_tci_mask)        \
+        ((ntohs(vlan_tci_mask) & VLAN_VID_MASK) == VLAN_VID_MASK)
+
 /* Return the dst fid of the func for flow forwarding
  * For PFs: src_fid is the fid of the PF
  * For VF-reps: src_fid the fid of the VF
@@ -389,6 +398,21 @@ static bool is_exactmatch(void *mask, int len)
         return true;
 }
 
+static bool is_vlan_tci_allowed(__be16  vlan_tci_mask,
+                                __be16  vlan_tci)
+{
+        /* VLAN priority must be either exactly zero or fully wildcarded and
+         * VLAN id must be exact match.
+         */
+        if (is_vid_exactmatch(vlan_tci_mask) &&
+            ((is_vlan_pcp_exactmatch(vlan_tci_mask) &&
+              is_vlan_pcp_zero(vlan_tci)) ||
+             is_vlan_pcp_wildcarded(vlan_tci_mask)))
+                return true;
+
+        return false;
+}
+
 static bool bits_set(void *key, int len)
 {
         const u8 *p = key;
@@ -803,9 +827,9 @@ static bool bnxt_tc_can_offload(struct bnxt *bp, struct bnxt_tc_flow *flow)
         /* Currently VLAN fields cannot be partial wildcard */
         if (bits_set(&flow->l2_key.inner_vlan_tci,
                      sizeof(flow->l2_key.inner_vlan_tci)) &&
-            !is_exactmatch(&flow->l2_mask.inner_vlan_tci,
-                           sizeof(flow->l2_mask.inner_vlan_tci))) {
-                netdev_info(bp->dev, "Wildcard match unsupported for VLAN TCI\n");
+            !is_vlan_tci_allowed(flow->l2_mask.inner_vlan_tci,
+                                 flow->l2_key.inner_vlan_tci)) {
+                netdev_info(bp->dev, "Unsupported VLAN TCI\n");
                 return false;
         }
         if (bits_set(&flow->l2_key.inner_vlan_tpid,
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
index 347e4f946eb2..840f6e505f73 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
@@ -169,7 +169,6 @@ static int bnxt_req_msix_vecs(struct bnxt_en_dev *edev, int ulp_id,
                 edev->ulp_tbl[ulp_id].msix_requested = avail_msix;
         }
         bnxt_fill_msix_vecs(bp, ent);
-        bnxt_set_max_func_irqs(bp, bnxt_get_max_func_irqs(bp) - avail_msix);
         bnxt_set_max_func_cp_rings(bp, max_cp_rings - avail_msix);
         edev->flags |= BNXT_EN_FLAG_MSIX_REQUESTED;
         return avail_msix;
@@ -192,7 +191,6 @@ static int bnxt_free_msix_vecs(struct bnxt_en_dev *edev, int ulp_id)
         msix_requested = edev->ulp_tbl[ulp_id].msix_requested;
         bnxt_set_max_func_cp_rings(bp, max_cp_rings + msix_requested);
         edev->ulp_tbl[ulp_id].msix_requested = 0;
-        bnxt_set_max_func_irqs(bp, bnxt_get_max_func_irqs(bp) + msix_requested);
         edev->flags &= ~BNXT_EN_FLAG_MSIX_REQUESTED;
         if (netif_running(dev)) {
                 bnxt_close_nic(bp, true, false);
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 3be87efdc93d..aa1374d0af93 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -6,11 +6,15 @@
  * Copyright (C) 2004 Sun Microsystems Inc.
  * Copyright (C) 2005-2016 Broadcom Corporation.
  * Copyright (C) 2016-2017 Broadcom Limited.
+ * Copyright (C) 2018 Broadcom. All Rights Reserved. The term "Broadcom"
+ * refers to Broadcom Inc. and/or its subsidiaries.
  *
  * Firmware is:
  *      Derived from proprietary unpublished source code,
  *      Copyright (C) 2000-2016 Broadcom Corporation.
  *      Copyright (C) 2016-2017 Broadcom Ltd.
+ *      Copyright (C) 2018 Broadcom. All Rights Reserved. The term "Broadcom"
+ *      refers to Broadcom Inc. and/or its subsidiaries.
  *
  *      Permission is hereby granted for the distribution of this firmware
  *      data in hexadecimal or equivalent format, provided this copyright
@@ -9290,6 +9294,15 @@ static int tg3_chip_reset(struct tg3 *tp)
 
         tg3_restore_clk(tp);
 
+        /* Increase the core clock speed to fix tx timeout issue for 5762
+         * with 100Mbps link speed.
+         */
+        if (tg3_asic_rev(tp) == ASIC_REV_5762) {
+                val = tr32(TG3_CPMU_CLCK_ORIDE_ENABLE);
+                tw32(TG3_CPMU_CLCK_ORIDE_ENABLE, val |
+                     TG3_CPMU_MAC_ORIDE_ENABLE);
+        }
+
         /* Reprobe ASF enable state.  */
         tg3_flag_clear(tp, ENABLE_ASF);
         tp->phy_flags &= ~(TG3_PHYFLG_1G_ON_VAUX_OK |
diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
index 1d61aa3efda1..a772a33b685c 100644
--- a/drivers/net/ethernet/broadcom/tg3.h
+++ b/drivers/net/ethernet/broadcom/tg3.h
@@ -7,6 +7,8 @@
  * Copyright (C) 2004 Sun Microsystems Inc.
  * Copyright (C) 2007-2016 Broadcom Corporation.
  * Copyright (C) 2016-2017 Broadcom Limited.
+ * Copyright (C) 2018 Broadcom. All Rights Reserved. The term "Broadcom"
+ * refers to Broadcom Inc. and/or its subsidiaries.
  */
 
 #ifndef _T3_H
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index 86659823b259..3d45f4c92cf6 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -166,6 +166,7 @@
 #define GEM_DCFG6               0x0294 /* Design Config 6 */
 #define GEM_DCFG7               0x0298 /* Design Config 7 */
 #define GEM_DCFG8               0x029C /* Design Config 8 */
+#define GEM_DCFG10              0x02A4 /* Design Config 10 */
 
 #define GEM_TXBDCTRL    0x04cc /* TX Buffer Descriptor control register */
 #define GEM_RXBDCTRL    0x04d0 /* RX Buffer Descriptor control register */
@@ -490,6 +491,12 @@
 #define GEM_SCR2CMP_OFFSET                      0
 #define GEM_SCR2CMP_SIZE                        8
 
+/* Bitfields in DCFG10 */
+#define GEM_TXBD_RDBUFF_OFFSET                  12
+#define GEM_TXBD_RDBUFF_SIZE                    4
+#define GEM_RXBD_RDBUFF_OFFSET                  8
+#define GEM_RXBD_RDBUFF_SIZE                    4
+
 /* Bitfields in TISUBN */
 #define GEM_SUBNSINCR_OFFSET                    0
 #define GEM_SUBNSINCR_SIZE                      16
@@ -635,6 +642,7 @@
 #define MACB_CAPS_USRIO_DISABLED                0x00000010
 #define MACB_CAPS_JUMBO                         0x00000020
 #define MACB_CAPS_GEM_HAS_PTP                   0x00000040
+#define MACB_CAPS_BD_RD_PREFETCH                0x00000080
 #define MACB_CAPS_FIFO_MODE                     0x10000000
 #define MACB_CAPS_GIGABIT_MODE_AVAILABLE        0x20000000
 #define MACB_CAPS_SG_DISABLED                   0x40000000
@@ -1203,6 +1211,9 @@ struct macb {
         unsigned int max_tuples;
 
         struct tasklet_struct   hresp_err_tasklet;
+
+        int     rx_bd_rd_prefetch;
+        int     tx_bd_rd_prefetch;
 };
 
 #ifdef CONFIG_MACB_USE_HWSTAMP
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 96cc03a6d942..a6c911bb5ce2 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -1811,23 +1811,25 @@ static void macb_free_consistent(struct macb *bp)
 {
         struct macb_queue *queue;
         unsigned int q;
+        int size;
 
-        queue = &bp->queues[0];
         bp->macbgem_ops.mog_free_rx_buffers(bp);
-        if (queue->rx_ring) {
-                dma_free_coherent(&bp->pdev->dev, RX_RING_BYTES(bp),
-                                queue->rx_ring, queue->rx_ring_dma);
-                queue->rx_ring = NULL;
-        }
 
         for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
                 kfree(queue->tx_skb);
                 queue->tx_skb = NULL;
                 if (queue->tx_ring) {
-                        dma_free_coherent(&bp->pdev->dev, TX_RING_BYTES(bp),
+                        size = TX_RING_BYTES(bp) + bp->tx_bd_rd_prefetch;
+                        dma_free_coherent(&bp->pdev->dev, size,
                                           queue->tx_ring, queue->tx_ring_dma);
                         queue->tx_ring = NULL;
                 }
+                if (queue->rx_ring) {
+                        size = RX_RING_BYTES(bp) + bp->rx_bd_rd_prefetch;
+                        dma_free_coherent(&bp->pdev->dev, size,
+                                          queue->rx_ring, queue->rx_ring_dma);
+                        queue->rx_ring = NULL;
+                }
         }
 }
 
@@ -1874,7 +1876,7 @@ static int macb_alloc_consistent(struct macb *bp)
         int size;
 
         for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
-                size = TX_RING_BYTES(bp);
+                size = TX_RING_BYTES(bp) + bp->tx_bd_rd_prefetch;
                 queue->tx_ring = dma_alloc_coherent(&bp->pdev->dev, size,
                                                     &queue->tx_ring_dma,
                                                     GFP_KERNEL);
@@ -1890,7 +1892,7 @@ static int macb_alloc_consistent(struct macb *bp)
                 if (!queue->tx_skb)
                         goto out_err;
 
-                size = RX_RING_BYTES(bp);
+                size = RX_RING_BYTES(bp) + bp->rx_bd_rd_prefetch;
                 queue->rx_ring = dma_alloc_coherent(&bp->pdev->dev, size,
                                                  &queue->rx_ring_dma, GFP_KERNEL);
                 if (!queue->rx_ring)
@@ -3797,7 +3799,7 @@ static const struct macb_config np4_config = {
 static const struct macb_config zynqmp_config = {
         .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE |
                         MACB_CAPS_JUMBO |
-                        MACB_CAPS_GEM_HAS_PTP,
+                        MACB_CAPS_GEM_HAS_PTP | MACB_CAPS_BD_RD_PREFETCH,
         .dma_burst_length = 16,
         .clk_init = macb_clk_init,
         .init = macb_init,
@@ -3858,7 +3860,7 @@ static int macb_probe(struct platform_device *pdev)
         void __iomem *mem;
         const char *mac;
         struct macb *bp;
-        int err;
+        int err, val;
 
         regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         mem = devm_ioremap_resource(&pdev->dev, regs);
@@ -3947,6 +3949,18 @@ static int macb_probe(struct platform_device *pdev)
         else
                 dev->max_mtu = ETH_DATA_LEN;
 
+        if (bp->caps & MACB_CAPS_BD_RD_PREFETCH) {
+                val = GEM_BFEXT(RXBD_RDBUFF, gem_readl(bp, DCFG10));
+                if (val)
+                        bp->rx_bd_rd_prefetch = (2 << (val - 1)) *
+                                                macb_dma_desc_get_size(bp);
+
+                val = GEM_BFEXT(TXBD_RDBUFF, gem_readl(bp, DCFG10));
+                if (val)
+                        bp->tx_bd_rd_prefetch = (2 << (val - 1)) *
+                                                macb_dma_desc_get_size(bp);
+        }
+
         mac = of_get_mac_address(np);
         if (mac) {
                 ether_addr_copy(bp->dev->dev_addr, mac);
diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig
index 043e3c11c42b..92d88c5f76fb 100644
--- a/drivers/net/ethernet/cavium/Kconfig
+++ b/drivers/net/ethernet/cavium/Kconfig
@@ -15,7 +15,7 @@ if NET_VENDOR_CAVIUM
 
 config THUNDER_NIC_PF
         tristate "Thunder Physical function driver"
-        depends on 64BIT
+        depends on 64BIT && PCI
         select THUNDER_NIC_BGX
         ---help---
           This driver supports Thunder's NIC physical function.
@@ -28,13 +28,13 @@ config THUNDER_NIC_PF
 config THUNDER_NIC_VF
         tristate "Thunder Virtual function driver"
         imply CAVIUM_PTP
-        depends on 64BIT
+        depends on 64BIT && PCI
         ---help---
           This driver supports Thunder's NIC virtual function
 
 config  THUNDER_NIC_BGX
         tristate "Thunder MAC interface driver (BGX)"
-        depends on 64BIT
+        depends on 64BIT && PCI
         select PHYLIB
         select MDIO_THUNDER
         select THUNDER_NIC_RGX
@@ -44,7 +44,7 @@ config	THUNDER_NIC_BGX
 
 config  THUNDER_NIC_RGX
         tristate "Thunder MAC interface driver (RGX)"
-        depends on 64BIT
+        depends on 64BIT && PCI
         select PHYLIB
         select MDIO_THUNDER
         ---help---
@@ -53,7 +53,7 @@ config	THUNDER_NIC_RGX
 
 config CAVIUM_PTP
         tristate "Cavium PTP coprocessor as PTP clock"
-        depends on 64BIT
+        depends on 64BIT && PCI
         imply PTP_1588_CLOCK
         default y
         ---help---
@@ -65,7 +65,7 @@ config CAVIUM_PTP
 
 config LIQUIDIO
         tristate "Cavium LiquidIO support"
-        depends on 64BIT
+        depends on 64BIT && PCI
         depends on MAY_USE_DEVLINK
         imply PTP_1588_CLOCK
         select FW_LOADER
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 8a815bb57177..7e8454d3b1ad 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -91,6 +91,9 @@ static int octeon_console_debug_enabled(u32 console)
  */
 #define LIO_SYNC_OCTEON_TIME_INTERVAL_MS 60000
 
+/* time to wait for possible in-flight requests in milliseconds */
+#define WAIT_INFLIGHT_REQUEST   msecs_to_jiffies(1000)
+
 struct lio_trusted_vf_ctx {
         struct completion complete;
         int status;
@@ -259,7 +262,7 @@ static inline void pcierror_quiesce_device(struct octeon_device *oct)
         force_io_queues_off(oct);
 
         /* To allow for in-flight requests */
-        schedule_timeout_uninterruptible(100);
+        schedule_timeout_uninterruptible(WAIT_INFLIGHT_REQUEST);
 
         if (wait_for_pending_requests(oct))
                 dev_err(&oct->pci_dev->dev, "There were pending requests\n");
diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
index 3f6afb54a5eb..bb43ddb7539e 100644
--- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
@@ -643,13 +643,21 @@ static int octeon_mgmt_set_mac_address(struct net_device *netdev, void *addr)
 static int octeon_mgmt_change_mtu(struct net_device *netdev, int new_mtu)
 {
         struct octeon_mgmt *p = netdev_priv(netdev);
-        int size_without_fcs = new_mtu + OCTEON_MGMT_RX_HEADROOM;
+        int max_packet = new_mtu + ETH_HLEN + ETH_FCS_LEN;
 
         netdev->mtu = new_mtu;
 
-        cvmx_write_csr(p->agl + AGL_GMX_RX_FRM_MAX, size_without_fcs);
+        /* HW lifts the limit if the frame is VLAN tagged
+         * (+4 bytes per each tag, up to two tags)
+         */
+        cvmx_write_csr(p->agl + AGL_GMX_RX_FRM_MAX, max_packet);
+        /* Set the hardware to truncate packets larger than the MTU. The jabber
+         * register must be set to a multiple of 8 bytes, so round up. JABBER is
+         * an unconditional limit, so we need to account for two possible VLAN
+         * tags.
+         */
         cvmx_write_csr(p->agl + AGL_GMX_RX_JABBER,
-                       (size_without_fcs + 7) & 0xfff8);
+                       (max_packet + 7 + VLAN_HLEN * 2) & 0xfff8);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
index 7b795edd9d3a..a19172dbe6be 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
@@ -51,6 +51,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
+#include <linux/nospec.h>
 
 #include "common.h"
 #include "cxgb3_ioctl.h"
@@ -2268,6 +2269,7 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
 
                 if (t.qset_idx >= nqsets)
                         return -EINVAL;
+                t.qset_idx = array_index_nospec(t.qset_idx, nqsets);
 
                 q = &adapter->params.sge.qset[q1 + t.qset_idx];
                 t.rspq_size = q->rspq_size;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index 974a868a4824..3720c3e11ebb 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -8702,7 +8702,7 @@ static int t4_get_flash_params(struct adapter *adap)
         };
 
         unsigned int part, manufacturer;
-        unsigned int density, size;
+        unsigned int density, size = 0;
         u32 flashid = 0;
         int ret;
 
@@ -8772,11 +8772,6 @@ static int t4_get_flash_params(struct adapter *adap)
                 case 0x22: /* 256MB */
                         size = 1 << 28;
                         break;
-
-                default:
-                        dev_err(adap->pdev_dev, "Micron Flash Part has bad size, ID = %#x, Density code = %#x\n",
-                                flashid, density);
-                        return -EINVAL;
                 }
                 break;
         }
@@ -8792,10 +8787,6 @@ static int t4_get_flash_params(struct adapter *adap)
                 case 0x17: /* 64MB */
                         size = 1 << 26;
                         break;
-                default:
-                        dev_err(adap->pdev_dev, "ISSI Flash Part has bad size, ID = %#x, Density code = %#x\n",
-                                flashid, density);
-                        return -EINVAL;
                 }
                 break;
         }
@@ -8811,10 +8802,6 @@ static int t4_get_flash_params(struct adapter *adap)
                 case 0x18: /* 16MB */
                         size = 1 << 24;
                         break;
-                default:
-                        dev_err(adap->pdev_dev, "Macronix Flash Part has bad size, ID = %#x, Density code = %#x\n",
-                                flashid, density);
-                        return -EINVAL;
                 }
                 break;
         }
@@ -8830,17 +8817,21 @@ static int t4_get_flash_params(struct adapter *adap)
                 case 0x18: /* 16MB */
                         size = 1 << 24;
                         break;
-                default:
-                        dev_err(adap->pdev_dev, "Winbond Flash Part has bad size, ID = %#x, Density code = %#x\n",
-                                flashid, density);
-                        return -EINVAL;
                 }
                 break;
         }
-        default:
-                dev_err(adap->pdev_dev, "Unsupported Flash Part, ID = %#x\n",
-                        flashid);
-                return -EINVAL;
+        }
+
+        /* If we didn't recognize the FLASH part, that's no real issue: the
+         * Hardware/Software contract says that Hardware will _*ALWAYS*_
+         * use a FLASH part which is at least 4MB in size and has 64KB
+         * sectors.  The unrecognized FLASH part is likely to be much larger
+         * than 4MB, but that's all we really need.
+         */
+        if (size == 0) {
+                dev_warn(adap->pdev_dev, "Unknown Flash Part, ID = %#x, assuming 4MB\n",
+                         flashid);
+                size = 1 << 22;
         }
 
         /* Store decoded Flash size and fall through into vetting code. */
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index d0e196bff081..ffe7acbeaa22 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -329,7 +329,8 @@ static void replenish_rx_pool(struct ibmvnic_adapter *adapter,
         return;
 
 failure:
-        dev_info(dev, "replenish pools failure\n");
+        if (lpar_rc != H_PARAMETER && lpar_rc != H_CLOSED)
+                dev_err_ratelimited(dev, "rx: replenish packet buffer failed\n");
         pool->free_map[pool->next_free] = index;
         pool->rx_buff[index].skb = NULL;
 
@@ -1617,7 +1618,8 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)
                                       &tx_crq);
         }
         if (lpar_rc != H_SUCCESS) {
-                dev_err(dev, "tx failed with code %ld\n", lpar_rc);
+                if (lpar_rc != H_CLOSED && lpar_rc != H_PARAMETER)
+                        dev_err_ratelimited(dev, "tx: send failed\n");
                 dev_kfree_skb_any(skb);
                 tx_buff->skb = NULL;
 
@@ -1825,8 +1827,8 @@ static int do_reset(struct ibmvnic_adapter *adapter,
 
                 rc = ibmvnic_login(netdev);
                 if (rc) {
-                        adapter->state = VNIC_PROBED;
-                        return 0;
+                        adapter->state = reset_state;
+                        return rc;
                 }
 
                 if (adapter->reset_reason == VNIC_RESET_CHANGE_PARAM ||
@@ -3204,6 +3206,25 @@ static union ibmvnic_crq *ibmvnic_next_crq(struct ibmvnic_adapter *adapter)
         return crq;
 }
 
+static void print_subcrq_error(struct device *dev, int rc, const char *func)
+{
+        switch (rc) {
+        case H_PARAMETER:
+                dev_warn_ratelimited(dev,
+                                     "%s failed: Send request is malformed or adapter failover pending. (rc=%d)\n",
+                                     func, rc);
+                break;
+        case H_CLOSED:
+                dev_warn_ratelimited(dev,
+                                     "%s failed: Backing queue closed. Adapter is down or failover pending. (rc=%d)\n",
+                                     func, rc);
+                break;
+        default:
+                dev_err_ratelimited(dev, "%s failed: (rc=%d)\n", func, rc);
+                break;
+        }
+}
+
 static int send_subcrq(struct ibmvnic_adapter *adapter, u64 remote_handle,
                        union sub_crq *sub_crq)
 {
@@ -3230,11 +3251,8 @@ static int send_subcrq(struct ibmvnic_adapter *adapter, u64 remote_handle,
                                 cpu_to_be64(u64_crq[2]),
                                 cpu_to_be64(u64_crq[3]));
 
-        if (rc) {
-                if (rc == H_CLOSED)
-                        dev_warn(dev, "CRQ Queue closed\n");
-                dev_err(dev, "Send error (rc=%d)\n", rc);
-        }
+        if (rc)
+                print_subcrq_error(dev, rc, __func__);
 
         return rc;
 }
@@ -3252,11 +3270,8 @@ static int send_subcrq_indirect(struct ibmvnic_adapter *adapter,
                                 cpu_to_be64(remote_handle),
                                 ioba, num_entries);
 
-        if (rc) {
-                if (rc == H_CLOSED)
-                        dev_warn(dev, "CRQ Queue closed\n");
-                dev_err(dev, "Send (indirect) error (rc=%d)\n", rc);
-        }
+        if (rc)
+                print_subcrq_error(dev, rc, __func__);
 
         return rc;
 }
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index 3f5c350716bb..0bd1294ba517 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -1871,7 +1871,12 @@ s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
         if (enable_addr != 0)
                 rar_high |= IXGBE_RAH_AV;
 
+        /* Record lower 32 bits of MAC address and then make
+         * sure that write is flushed to hardware before writing
+         * the upper 16 bits and setting the valid bit.
+         */
         IXGBE_WRITE_REG(hw, IXGBE_RAL(index), rar_low);
+        IXGBE_WRITE_FLUSH(hw);
         IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);
 
         return 0;
@@ -1903,8 +1908,13 @@ s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index)
         rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(index));
         rar_high &= ~(0x0000FFFF | IXGBE_RAH_AV);
 
-        IXGBE_WRITE_REG(hw, IXGBE_RAL(index), 0);
+        /* Clear the address valid bit and upper 16 bits of the address
+         * before clearing the lower bits. This way we aren't updating
+         * a live filter.
+         */
         IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);
+        IXGBE_WRITE_FLUSH(hw);
+        IXGBE_WRITE_REG(hw, IXGBE_RAL(index), 0);
 
         /* clear VMDq pool/queue selection for this RAR */
         hw->mac.ops.clear_vmdq(hw, index, IXGBE_CLEAR_VMDQ_ALL);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
index c116f459945d..da4322e4daed 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
@@ -839,7 +839,7 @@ int ixgbe_ipsec_tx(struct ixgbe_ring *tx_ring,
         }
 
         itd->sa_idx = xs->xso.offload_handle - IXGBE_IPSEC_BASE_TX_INDEX;
-        if (unlikely(itd->sa_idx > IXGBE_IPSEC_MAX_SA_COUNT)) {
+        if (unlikely(itd->sa_idx >= IXGBE_IPSEC_MAX_SA_COUNT)) {
                 netdev_err(tx_ring->netdev, "%s: bad sa_idx=%d handle=%lu\n",
                            __func__, itd->sa_idx, xs->xso.offload_handle);
                 return 0;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 9f54ccbddea7..3360f7b9ee73 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -474,10 +474,10 @@ static int mlx4_en_complete_rx_desc(struct mlx4_en_priv *priv,
 {
         const struct mlx4_en_frag_info *frag_info = priv->frag_info;
         unsigned int truesize = 0;
+        bool release = true;
         int nr, frag_size;
         struct page *page;
         dma_addr_t dma;
-        bool release;
 
         /* Collect used fragments while replacing them in the HW descriptors */
         for (nr = 0;; frags++) {
@@ -500,7 +500,11 @@ static int mlx4_en_complete_rx_desc(struct mlx4_en_priv *priv,
                         release = page_count(page) != 1 ||
                                   page_is_pfmemalloc(page) ||
                                   page_to_nid(page) != numa_mem_id();
-                } else {
+                } else if (!priv->rx_headroom) {
+                        /* rx_headroom for non XDP setup is always 0.
+                         * When XDP is set, the above condition will
+                         * guarantee page is always released.
+                         */
                         u32 sz_align = ALIGN(frag_size, SMP_CACHE_BYTES);
 
                         frags->page_offset += sz_align;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 6aaaf3d9ba31..77b2adb29341 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -4756,6 +4756,12 @@ static void mlxsw_sp_rt6_destroy(struct mlxsw_sp_rt6 *mlxsw_sp_rt6)
         kfree(mlxsw_sp_rt6);
 }
 
+static bool mlxsw_sp_fib6_rt_can_mp(const struct fib6_info *rt)
+{
+        /* RTF_CACHE routes are ignored */
+        return (rt->fib6_flags & (RTF_GATEWAY | RTF_ADDRCONF)) == RTF_GATEWAY;
+}
+
 static struct fib6_info *
 mlxsw_sp_fib6_entry_rt(const struct mlxsw_sp_fib6_entry *fib6_entry)
 {
@@ -4765,11 +4771,11 @@ mlxsw_sp_fib6_entry_rt(const struct mlxsw_sp_fib6_entry *fib6_entry)
 
 static struct mlxsw_sp_fib6_entry *
 mlxsw_sp_fib6_node_mp_entry_find(const struct mlxsw_sp_fib_node *fib_node,
-                                 const struct fib6_info *nrt, bool append)
+                                 const struct fib6_info *nrt, bool replace)
 {
         struct mlxsw_sp_fib6_entry *fib6_entry;
 
-        if (!append)
+        if (!mlxsw_sp_fib6_rt_can_mp(nrt) || replace)
                 return NULL;
 
         list_for_each_entry(fib6_entry, &fib_node->entry_list, common.list) {
@@ -4784,7 +4790,8 @@ mlxsw_sp_fib6_node_mp_entry_find(const struct mlxsw_sp_fib_node *fib_node,
                         break;
                 if (rt->fib6_metric < nrt->fib6_metric)
                         continue;
-                if (rt->fib6_metric == nrt->fib6_metric)
+                if (rt->fib6_metric == nrt->fib6_metric &&
+                    mlxsw_sp_fib6_rt_can_mp(rt))
                         return fib6_entry;
                 if (rt->fib6_metric > nrt->fib6_metric)
                         break;
@@ -5163,7 +5170,7 @@ static struct mlxsw_sp_fib6_entry *
 mlxsw_sp_fib6_node_entry_find(const struct mlxsw_sp_fib_node *fib_node,
                               const struct fib6_info *nrt, bool replace)
 {
-        struct mlxsw_sp_fib6_entry *fib6_entry;
+        struct mlxsw_sp_fib6_entry *fib6_entry, *fallback = NULL;
 
         list_for_each_entry(fib6_entry, &fib_node->entry_list, common.list) {
                 struct fib6_info *rt = mlxsw_sp_fib6_entry_rt(fib6_entry);
@@ -5172,13 +5179,18 @@ mlxsw_sp_fib6_node_entry_find(const struct mlxsw_sp_fib_node *fib_node,
                         continue;
                 if (rt->fib6_table->tb6_id != nrt->fib6_table->tb6_id)
                         break;
-                if (replace && rt->fib6_metric == nrt->fib6_metric)
-                        return fib6_entry;
+                if (replace && rt->fib6_metric == nrt->fib6_metric) {
+                        if (mlxsw_sp_fib6_rt_can_mp(rt) ==
+                            mlxsw_sp_fib6_rt_can_mp(nrt))
+                                return fib6_entry;
+                        if (mlxsw_sp_fib6_rt_can_mp(nrt))
+                                fallback = fallback ?: fib6_entry;
+                }
                 if (rt->fib6_metric > nrt->fib6_metric)
-                        return fib6_entry;
+                        return fallback ?: fib6_entry;
         }
 
-        return NULL;
+        return fallback;
 }
 
 static int
@@ -5304,8 +5316,7 @@ static void mlxsw_sp_fib6_entry_replace(struct mlxsw_sp *mlxsw_sp,
 }
 
 static int mlxsw_sp_router_fib6_add(struct mlxsw_sp *mlxsw_sp,
-                                    struct fib6_info *rt, bool replace,
-                                    bool append)
+                                    struct fib6_info *rt, bool replace)
 {
         struct mlxsw_sp_fib6_entry *fib6_entry;
         struct mlxsw_sp_fib_node *fib_node;
@@ -5331,7 +5342,7 @@ static int mlxsw_sp_router_fib6_add(struct mlxsw_sp *mlxsw_sp,
         /* Before creating a new entry, try to append route to an existing
          * multipath entry.
          */
-        fib6_entry = mlxsw_sp_fib6_node_mp_entry_find(fib_node, rt, append);
+        fib6_entry = mlxsw_sp_fib6_node_mp_entry_find(fib_node, rt, replace);
         if (fib6_entry) {
                 err = mlxsw_sp_fib6_entry_nexthop_add(mlxsw_sp, fib6_entry, rt);
                 if (err)
@@ -5339,14 +5350,6 @@ static int mlxsw_sp_router_fib6_add(struct mlxsw_sp *mlxsw_sp,
                 return 0;
         }
 
-        /* We received an append event, yet did not find any route to
-         * append to.
-         */
-        if (WARN_ON(append)) {
-                err = -EINVAL;
-                goto err_fib6_entry_append;
-        }
-
         fib6_entry = mlxsw_sp_fib6_entry_create(mlxsw_sp, fib_node, rt);
         if (IS_ERR(fib6_entry)) {
                 err = PTR_ERR(fib6_entry);
@@ -5364,7 +5367,6 @@ static int mlxsw_sp_router_fib6_add(struct mlxsw_sp *mlxsw_sp,
 err_fib6_node_entry_link:
         mlxsw_sp_fib6_entry_destroy(mlxsw_sp, fib6_entry);
 err_fib6_entry_create:
-err_fib6_entry_append:
 err_fib6_entry_nexthop_add:
         mlxsw_sp_fib_node_put(mlxsw_sp, fib_node);
         return err;
@@ -5715,7 +5717,7 @@ static void mlxsw_sp_router_fib6_event_work(struct work_struct *work)
         struct mlxsw_sp_fib_event_work *fib_work =
                 container_of(work, struct mlxsw_sp_fib_event_work, work);
         struct mlxsw_sp *mlxsw_sp = fib_work->mlxsw_sp;
-        bool replace, append;
+        bool replace;
         int err;
 
         rtnl_lock();
@@ -5726,10 +5728,8 @@ static void mlxsw_sp_router_fib6_event_work(struct work_struct *work)
         case FIB_EVENT_ENTRY_APPEND: /* fall through */
         case FIB_EVENT_ENTRY_ADD:
                 replace = fib_work->event == FIB_EVENT_ENTRY_REPLACE;
-                append = fib_work->event == FIB_EVENT_ENTRY_APPEND;
                 err = mlxsw_sp_router_fib6_add(mlxsw_sp,
-                                               fib_work->fen6_info.rt, replace,
-                                               append);
+                                               fib_work->fen6_info.rt, replace);
                 if (err)
                         mlxsw_sp_router_fib_abort(mlxsw_sp);
                 mlxsw_sp_rt6_release(fib_work->fen6_info.rt);
diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h
index 00db3401b898..1dfaccd151f0 100644
--- a/drivers/net/ethernet/qlogic/qed/qed.h
+++ b/drivers/net/ethernet/qlogic/qed/qed.h
@@ -502,6 +502,7 @@ enum BAR_ID {
 struct qed_nvm_image_info {
         u32 num_images;
         struct bist_nvm_image_att *image_att;
+        bool valid;
 };
 
 #define DRV_MODULE_VERSION                    \
diff --git a/drivers/net/ethernet/qlogic/qed/qed_debug.c b/drivers/net/ethernet/qlogic/qed/qed_debug.c
index a14e48489029..4340c4c90bcb 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_debug.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_debug.c
@@ -6723,7 +6723,7 @@ static enum dbg_status qed_parse_mcp_trace_buf(u8 *trace_buf,
                 format_idx = header & MFW_TRACE_EVENTID_MASK;
 
                 /* Skip message if its index doesn't exist in the meta data */
-                if (format_idx > s_mcp_trace_meta.formats_num) {
+                if (format_idx >= s_mcp_trace_meta.formats_num) {
                         u8 format_size =
                                 (u8)((header & MFW_TRACE_PRM_SIZE_MASK) >>
                                      MFW_TRACE_PRM_SIZE_SHIFT);
diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index 0cbc74d6ca8b..758a9a5127fa 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -371,7 +371,7 @@ static struct qed_dev *qed_probe(struct pci_dev *pdev,
                 goto err2;
         }
 
-        DP_INFO(cdev, "qed_probe completed successffuly\n");
+        DP_INFO(cdev, "qed_probe completed successfully\n");
 
         return cdev;
 
diff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.c b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
index 4e0b443c9519..9d9e533bccdc 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_mcp.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
@@ -592,6 +592,9 @@ int qed_mcp_nvm_wr_cmd(struct qed_hwfn *p_hwfn,
         *o_mcp_resp = mb_params.mcp_resp;
         *o_mcp_param = mb_params.mcp_param;
 
+        /* nvm_info needs to be updated */
+        p_hwfn->nvm_info.valid = false;
+
         return 0;
 }
 
@@ -2555,11 +2558,14 @@ int qed_mcp_bist_nvm_get_image_att(struct qed_hwfn *p_hwfn,
 
 int qed_mcp_nvm_info_populate(struct qed_hwfn *p_hwfn)
 {
-        struct qed_nvm_image_info *nvm_info = &p_hwfn->nvm_info;
+        struct qed_nvm_image_info nvm_info;
         struct qed_ptt *p_ptt;
         int rc;
         u32 i;
 
+        if (p_hwfn->nvm_info.valid)
+                return 0;
+
         p_ptt = qed_ptt_acquire(p_hwfn);
         if (!p_ptt) {
                 DP_ERR(p_hwfn, "failed to acquire ptt\n");
@@ -2567,29 +2573,29 @@ int qed_mcp_nvm_info_populate(struct qed_hwfn *p_hwfn)
         }
 
         /* Acquire from MFW the amount of available images */
-        nvm_info->num_images = 0;
+        nvm_info.num_images = 0;
         rc = qed_mcp_bist_nvm_get_num_images(p_hwfn,
-                                             p_ptt, &nvm_info->num_images);
+                                             p_ptt, &nvm_info.num_images);
         if (rc == -EOPNOTSUPP) {
                 DP_INFO(p_hwfn, "DRV_MSG_CODE_BIST_TEST is not supported\n");
                 goto out;
-        } else if (rc || !nvm_info->num_images) {
+        } else if (rc || !nvm_info.num_images) {
                 DP_ERR(p_hwfn, "Failed getting number of images\n");
                 goto err0;
         }
 
-        nvm_info->image_att = kmalloc_array(nvm_info->num_images,
-                                            sizeof(struct bist_nvm_image_att),
-                                            GFP_KERNEL);
-        if (!nvm_info->image_att) {
+        nvm_info.image_att = kmalloc_array(nvm_info.num_images,
+                                           sizeof(struct bist_nvm_image_att),
+                                           GFP_KERNEL);
+        if (!nvm_info.image_att) {
                 rc = -ENOMEM;
                 goto err0;
         }
 
         /* Iterate over images and get their attributes */
-        for (i = 0; i < nvm_info->num_images; i++) {
+        for (i = 0; i < nvm_info.num_images; i++) {
                 rc = qed_mcp_bist_nvm_get_image_att(p_hwfn, p_ptt,
-                                                    &nvm_info->image_att[i], i);
+                                                    &nvm_info.image_att[i], i);
                 if (rc) {
                         DP_ERR(p_hwfn,
                                "Failed getting image index %d attributes\n", i);
@@ -2597,14 +2603,22 @@ int qed_mcp_nvm_info_populate(struct qed_hwfn *p_hwfn)
                 }
 
                 DP_VERBOSE(p_hwfn, QED_MSG_SP, "image index %d, size %x\n", i,
-                           nvm_info->image_att[i].len);
+                           nvm_info.image_att[i].len);
         }
 out:
+        /* Update hwfn's nvm_info */
+        if (nvm_info.num_images) {
+                p_hwfn->nvm_info.num_images = nvm_info.num_images;
+                kfree(p_hwfn->nvm_info.image_att);
+                p_hwfn->nvm_info.image_att = nvm_info.image_att;
+                p_hwfn->nvm_info.valid = true;
+        }
+
         qed_ptt_release(p_hwfn, p_ptt);
         return 0;
 
 err1:
-        kfree(nvm_info->image_att);
+        kfree(nvm_info.image_att);
 err0:
         qed_ptt_release(p_hwfn, p_ptt);
         return rc;
@@ -2641,6 +2655,7 @@ qed_mcp_get_nvm_image_att(struct qed_hwfn *p_hwfn,
                 return -EINVAL;
         }
 
+        qed_mcp_nvm_info_populate(p_hwfn);
         for (i = 0; i < p_hwfn->nvm_info.num_images; i++)
                 if (type == p_hwfn->nvm_info.image_att[i].image_type)
                         break;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
index 891f03a7a33d..8d7b9bb910f2 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
@@ -1128,6 +1128,8 @@ static ssize_t qlcnic_83xx_sysfs_flash_write_handler(struct file *filp,
         struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
 
         ret = kstrtoul(buf, 16, &data);
+        if (ret)
+                return ret;
 
         switch (data) {
         case QLC_83XX_FLASH_SECTOR_ERASE_CMD:
diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c
index 5803cd6db406..206f0266463e 100644
--- a/drivers/net/ethernet/qualcomm/qca_spi.c
+++ b/drivers/net/ethernet/qualcomm/qca_spi.c
@@ -658,7 +658,7 @@ qcaspi_netdev_open(struct net_device *dev)
                 return ret;
         }
 
-        netif_start_queue(qca->net_dev);
+        /* SPI thread takes care of TX queue */
 
         return 0;
 }
@@ -760,6 +760,9 @@ qcaspi_netdev_tx_timeout(struct net_device *dev)
         qca->net_dev->stats.tx_errors++;
         /* Trigger tx queue flush and QCA7000 reset */
         qca->sync = QCASPI_SYNC_UNKNOWN;
+
+        if (qca->spi_thread)
+                wake_up_process(qca->spi_thread);
 }
 
 static int
@@ -878,22 +881,22 @@ qca_spi_probe(struct spi_device *spi)
 
         if ((qcaspi_clkspeed < QCASPI_CLK_SPEED_MIN) ||
             (qcaspi_clkspeed > QCASPI_CLK_SPEED_MAX)) {
-                dev_info(&spi->dev, "Invalid clkspeed: %d\n",
-                         qcaspi_clkspeed);
+                dev_err(&spi->dev, "Invalid clkspeed: %d\n",
+                        qcaspi_clkspeed);
                 return -EINVAL;
         }
 
         if ((qcaspi_burst_len < QCASPI_BURST_LEN_MIN) ||
             (qcaspi_burst_len > QCASPI_BURST_LEN_MAX)) {
-                dev_info(&spi->dev, "Invalid burst len: %d\n",
-                         qcaspi_burst_len);
+                dev_err(&spi->dev, "Invalid burst len: %d\n",
+                        qcaspi_burst_len);
                 return -EINVAL;
         }
 
         if ((qcaspi_pluggable < QCASPI_PLUGGABLE_MIN) ||
             (qcaspi_pluggable > QCASPI_PLUGGABLE_MAX)) {
-                dev_info(&spi->dev, "Invalid pluggable: %d\n",
-                         qcaspi_pluggable);
+                dev_err(&spi->dev, "Invalid pluggable: %d\n",
+                        qcaspi_pluggable);
                 return -EINVAL;
         }
 
@@ -955,8 +958,8 @@ qca_spi_probe(struct spi_device *spi)
         }
 
         if (register_netdev(qcaspi_devs)) {
-                dev_info(&spi->dev, "Unable to register net device %s\n",
-                         qcaspi_devs->name);
+                dev_err(&spi->dev, "Unable to register net device %s\n",
+                        qcaspi_devs->name);
                 free_netdev(qcaspi_devs);
                 return -EFAULT;
         }
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index f4cae2be0fda..a3f69901ac87 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -7789,6 +7789,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 NETIF_F_HW_VLAN_CTAG_RX;
         dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
                 NETIF_F_HIGHDMA;
+        dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
 
         tp->cp_cmd |= RxChkSum | RxVlan;
 
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 68f122140966..0d811c02ff34 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -980,6 +980,13 @@ static void ravb_adjust_link(struct net_device *ndev)
         struct ravb_private *priv = netdev_priv(ndev);
         struct phy_device *phydev = ndev->phydev;
         bool new_state = false;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->lock, flags);
+
+        /* Disable TX and RX right over here, if E-MAC change is ignored */
+        if (priv->no_avb_link)
+                ravb_rcv_snd_disable(ndev);
 
         if (phydev->link) {
                 if (phydev->duplex != priv->duplex) {
@@ -997,18 +1004,21 @@ static void ravb_adjust_link(struct net_device *ndev)
                         ravb_modify(ndev, ECMR, ECMR_TXF, 0);
                         new_state = true;
                         priv->link = phydev->link;
-                        if (priv->no_avb_link)
-                                ravb_rcv_snd_enable(ndev);
                 }
         } else if (priv->link) {
                 new_state = true;
                 priv->link = 0;
                 priv->speed = 0;
                 priv->duplex = -1;
-                if (priv->no_avb_link)
-                        ravb_rcv_snd_disable(ndev);
         }
 
+        /* Enable TX and RX right over here, if E-MAC change is ignored */
+        if (priv->no_avb_link && phydev->link)
+                ravb_rcv_snd_enable(ndev);
+
+        mmiowb();
+        spin_unlock_irqrestore(&priv->lock, flags);
+
         if (new_state && netif_msg_link(priv))
                 phy_print_status(phydev);
 }
@@ -1096,75 +1106,6 @@ static int ravb_phy_start(struct net_device *ndev)
         return 0;
 }
 
-static int ravb_get_link_ksettings(struct net_device *ndev,
-                                   struct ethtool_link_ksettings *cmd)
-{
-        struct ravb_private *priv = netdev_priv(ndev);
-        unsigned long flags;
-
-        if (!ndev->phydev)
-                return -ENODEV;
-
-        spin_lock_irqsave(&priv->lock, flags);
-        phy_ethtool_ksettings_get(ndev->phydev, cmd);
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        return 0;
-}
-
-static int ravb_set_link_ksettings(struct net_device *ndev,
-                                   const struct ethtool_link_ksettings *cmd)
-{
-        struct ravb_private *priv = netdev_priv(ndev);
-        unsigned long flags;
-        int error;
-
-        if (!ndev->phydev)
-                return -ENODEV;
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        /* Disable TX and RX */
-        ravb_rcv_snd_disable(ndev);
-
-        error = phy_ethtool_ksettings_set(ndev->phydev, cmd);
-        if (error)
-                goto error_exit;
-
-        if (cmd->base.duplex == DUPLEX_FULL)
-                priv->duplex = 1;
-        else
-                priv->duplex = 0;
-
-        ravb_set_duplex(ndev);
-
-error_exit:
-        mdelay(1);
-
-        /* Enable TX and RX */
-        ravb_rcv_snd_enable(ndev);
-
-        mmiowb();
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        return error;
-}
-
-static int ravb_nway_reset(struct net_device *ndev)
-{
-        struct ravb_private *priv = netdev_priv(ndev);
-        int error = -ENODEV;
-        unsigned long flags;
-
-        if (ndev->phydev) {
-                spin_lock_irqsave(&priv->lock, flags);
-                error = phy_start_aneg(ndev->phydev);
-                spin_unlock_irqrestore(&priv->lock, flags);
-        }
-
-        return error;
-}
-
 static u32 ravb_get_msglevel(struct net_device *ndev)
 {
         struct ravb_private *priv = netdev_priv(ndev);
@@ -1377,7 +1318,7 @@ static int ravb_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)
 }
 
 static const struct ethtool_ops ravb_ethtool_ops = {
-        .nway_reset             = ravb_nway_reset,
+        .nway_reset             = phy_ethtool_nway_reset,
         .get_msglevel           = ravb_get_msglevel,
         .set_msglevel           = ravb_set_msglevel,
         .get_link               = ethtool_op_get_link,
@@ -1387,8 +1328,8 @@ static const struct ethtool_ops ravb_ethtool_ops = {
         .get_ringparam          = ravb_get_ringparam,
         .set_ringparam          = ravb_set_ringparam,
         .get_ts_info            = ravb_get_ts_info,
-        .get_link_ksettings     = ravb_get_link_ksettings,
-        .set_link_ksettings     = ravb_set_link_ksettings,
+        .get_link_ksettings     = phy_ethtool_get_link_ksettings,
+        .set_link_ksettings     = phy_ethtool_set_link_ksettings,
         .get_wol                = ravb_get_wol,
         .set_wol                = ravb_set_wol,
 };
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index e9007b613f17..5614fd231bbe 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1927,8 +1927,15 @@ static void sh_eth_adjust_link(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
         struct phy_device *phydev = ndev->phydev;
+        unsigned long flags;
         int new_state = 0;
 
+        spin_lock_irqsave(&mdp->lock, flags);
+
+        /* Disable TX and RX right over here, if E-MAC change is ignored */
+        if (mdp->cd->no_psr || mdp->no_ether_link)
+                sh_eth_rcv_snd_disable(ndev);
+
         if (phydev->link) {
                 if (phydev->duplex != mdp->duplex) {
                         new_state = 1;
@@ -1947,18 +1954,21 @@ static void sh_eth_adjust_link(struct net_device *ndev)
                         sh_eth_modify(ndev, ECMR, ECMR_TXF, 0);
                         new_state = 1;
                         mdp->link = phydev->link;
-                        if (mdp->cd->no_psr || mdp->no_ether_link)
-                                sh_eth_rcv_snd_enable(ndev);
                 }
         } else if (mdp->link) {
                 new_state = 1;
                 mdp->link = 0;
                 mdp->speed = 0;
                 mdp->duplex = -1;
-                if (mdp->cd->no_psr || mdp->no_ether_link)
-                        sh_eth_rcv_snd_disable(ndev);
         }
 
+        /* Enable TX and RX right over here, if E-MAC change is ignored */
+        if ((mdp->cd->no_psr || mdp->no_ether_link) && phydev->link)
+                sh_eth_rcv_snd_enable(ndev);
+
+        mmiowb();
+        spin_unlock_irqrestore(&mdp->lock, flags);
+
         if (new_state && netif_msg_link(mdp))
                 phy_print_status(phydev);
 }
@@ -2030,60 +2040,6 @@ static int sh_eth_phy_start(struct net_device *ndev)
         return 0;
 }
 
-static int sh_eth_get_link_ksettings(struct net_device *ndev,
-                                     struct ethtool_link_ksettings *cmd)
-{
-        struct sh_eth_private *mdp = netdev_priv(ndev);
-        unsigned long flags;
-
-        if (!ndev->phydev)
-                return -ENODEV;
-
-        spin_lock_irqsave(&mdp->lock, flags);
-        phy_ethtool_ksettings_get(ndev->phydev, cmd);
-        spin_unlock_irqrestore(&mdp->lock, flags);
-
-        return 0;
-}
-
-static int sh_eth_set_link_ksettings(struct net_device *ndev,
-                                     const struct ethtool_link_ksettings *cmd)
-{
-        struct sh_eth_private *mdp = netdev_priv(ndev);
-        unsigned long flags;
-        int ret;
-
-        if (!ndev->phydev)
-                return -ENODEV;
-
-        spin_lock_irqsave(&mdp->lock, flags);
-
-        /* disable tx and rx */
-        sh_eth_rcv_snd_disable(ndev);
-
-        ret = phy_ethtool_ksettings_set(ndev->phydev, cmd);
-        if (ret)
-                goto error_exit;
-
-        if (cmd->base.duplex == DUPLEX_FULL)
-                mdp->duplex = 1;
-        else
-                mdp->duplex = 0;
-
-        if (mdp->cd->set_duplex)
-                mdp->cd->set_duplex(ndev);
-
-error_exit:
-        mdelay(1);
-
-        /* enable tx and rx */
-        sh_eth_rcv_snd_enable(ndev);
-
-        spin_unlock_irqrestore(&mdp->lock, flags);
-
-        return ret;
-}
-
 /* If it is ever necessary to increase SH_ETH_REG_DUMP_MAX_REGS, the
  * version must be bumped as well.  Just adding registers up to that
  * limit is fine, as long as the existing register indices don't
@@ -2263,22 +2219,6 @@ static void sh_eth_get_regs(struct net_device *ndev, struct ethtool_regs *regs,
         pm_runtime_put_sync(&mdp->pdev->dev);
 }
 
-static int sh_eth_nway_reset(struct net_device *ndev)
-{
-        struct sh_eth_private *mdp = netdev_priv(ndev);
-        unsigned long flags;
-        int ret;
-
-        if (!ndev->phydev)
-                return -ENODEV;
-
-        spin_lock_irqsave(&mdp->lock, flags);
-        ret = phy_start_aneg(ndev->phydev);
-        spin_unlock_irqrestore(&mdp->lock, flags);
-
-        return ret;
-}
-
 static u32 sh_eth_get_msglevel(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
@@ -2429,7 +2369,7 @@ static int sh_eth_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)
 static const struct ethtool_ops sh_eth_ethtool_ops = {
         .get_regs_len   = sh_eth_get_regs_len,
         .get_regs       = sh_eth_get_regs,
-        .nway_reset     = sh_eth_nway_reset,
+        .nway_reset     = phy_ethtool_nway_reset,
         .get_msglevel   = sh_eth_get_msglevel,
         .set_msglevel   = sh_eth_set_msglevel,
         .get_link       = ethtool_op_get_link,
@@ -2438,8 +2378,8 @@ static const struct ethtool_ops sh_eth_ethtool_ops = {
         .get_sset_count     = sh_eth_get_sset_count,
         .get_ringparam  = sh_eth_get_ringparam,
         .set_ringparam  = sh_eth_set_ringparam,
-        .get_link_ksettings = sh_eth_get_link_ksettings,
-        .set_link_ksettings = sh_eth_set_link_ksettings,
+        .get_link_ksettings = phy_ethtool_get_link_ksettings,
+        .set_link_ksettings = phy_ethtool_set_link_ksettings,
         .get_wol        = sh_eth_get_wol,
         .set_wol        = sh_eth_set_wol,
 };
diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index 23f0785c0573..7eeac3d6cfe8 100644
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -4288,9 +4288,9 @@ static int efx_ef10_filter_pri(struct efx_ef10_filter_table *table,
         return -EPROTONOSUPPORT;
 }
 
-static s32 efx_ef10_filter_insert(struct efx_nic *efx,
-                                  struct efx_filter_spec *spec,
-                                  bool replace_equal)
+static s32 efx_ef10_filter_insert_locked(struct efx_nic *efx,
+                                         struct efx_filter_spec *spec,
+                                         bool replace_equal)
 {
         DECLARE_BITMAP(mc_rem_map, EFX_EF10_FILTER_SEARCH_LIMIT);
         struct efx_ef10_nic_data *nic_data = efx->nic_data;
@@ -4307,7 +4307,7 @@ static s32 efx_ef10_filter_insert(struct efx_nic *efx,
         bool is_mc_recip;
         s32 rc;
 
-        down_read(&efx->filter_sem);
+        WARN_ON(!rwsem_is_locked(&efx->filter_sem));
         table = efx->filter_state;
         down_write(&table->lock);
 
@@ -4498,10 +4498,22 @@ out_unlock:
         if (rss_locked)
                 mutex_unlock(&efx->rss_lock);
         up_write(&table->lock);
-        up_read(&efx->filter_sem);
         return rc;
 }
 
+static s32 efx_ef10_filter_insert(struct efx_nic *efx,
+                                  struct efx_filter_spec *spec,
+                                  bool replace_equal)
+{
+        s32 ret;
+
+        down_read(&efx->filter_sem);
+        ret = efx_ef10_filter_insert_locked(efx, spec, replace_equal);
+        up_read(&efx->filter_sem);
+
+        return ret;
+}
+
 static void efx_ef10_filter_update_rx_scatter(struct efx_nic *efx)
 {
         /* no need to do anything here on EF10 */
@@ -5285,7 +5297,7 @@ static int efx_ef10_filter_insert_addr_list(struct efx_nic *efx,
                 EFX_WARN_ON_PARANOID(ids[i] != EFX_EF10_FILTER_ID_INVALID);
                 efx_filter_init_rx(&spec, EFX_FILTER_PRI_AUTO, filter_flags, 0);
                 efx_filter_set_eth_local(&spec, vlan->vid, addr_list[i].addr);
-                rc = efx_ef10_filter_insert(efx, &spec, true);
+                rc = efx_ef10_filter_insert_locked(efx, &spec, true);
                 if (rc < 0) {
                         if (rollback) {
                                 netif_info(efx, drv, efx->net_dev,
@@ -5314,7 +5326,7 @@ static int efx_ef10_filter_insert_addr_list(struct efx_nic *efx,
                 efx_filter_init_rx(&spec, EFX_FILTER_PRI_AUTO, filter_flags, 0);
                 eth_broadcast_addr(baddr);
                 efx_filter_set_eth_local(&spec, vlan->vid, baddr);
-                rc = efx_ef10_filter_insert(efx, &spec, true);
+                rc = efx_ef10_filter_insert_locked(efx, &spec, true);
                 if (rc < 0) {
                         netif_warn(efx, drv, efx->net_dev,
                                    "Broadcast filter insert failed rc=%d\n", rc);
@@ -5370,7 +5382,7 @@ static int efx_ef10_filter_insert_def(struct efx_nic *efx,
         if (vlan->vid != EFX_FILTER_VID_UNSPEC)
                 efx_filter_set_eth_local(&spec, vlan->vid, NULL);
 
-        rc = efx_ef10_filter_insert(efx, &spec, true);
+        rc = efx_ef10_filter_insert_locked(efx, &spec, true);
         if (rc < 0) {
                 const char *um = multicast ? "Multicast" : "Unicast";
                 const char *encap_name = "";
@@ -5430,7 +5442,7 @@ static int efx_ef10_filter_insert_def(struct efx_nic *efx,
                                            filter_flags, 0);
                         eth_broadcast_addr(baddr);
                         efx_filter_set_eth_local(&spec, vlan->vid, baddr);
-                        rc = efx_ef10_filter_insert(efx, &spec, true);
+                        rc = efx_ef10_filter_insert_locked(efx, &spec, true);
                         if (rc < 0) {
                                 netif_warn(efx, drv, efx->net_dev,
                                            "Broadcast filter insert failed rc=%d\n",
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 570ec72266f3..ce3a177081a8 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -1871,12 +1871,6 @@ static void efx_remove_filters(struct efx_nic *efx)
         up_write(&efx->filter_sem);
 }
 
-static void efx_restore_filters(struct efx_nic *efx)
-{
-        down_read(&efx->filter_sem);
-        efx->type->filter_table_restore(efx);
-        up_read(&efx->filter_sem);
-}
 
 /**************************************************************************
  *
@@ -2688,6 +2682,7 @@ void efx_reset_down(struct efx_nic *efx, enum reset_type method)
         efx_disable_interrupts(efx);
 
         mutex_lock(&efx->mac_lock);
+        down_write(&efx->filter_sem);
         mutex_lock(&efx->rss_lock);
         if (efx->port_initialized && method != RESET_TYPE_INVISIBLE &&
             method != RESET_TYPE_DATAPATH)
@@ -2745,9 +2740,8 @@ int efx_reset_up(struct efx_nic *efx, enum reset_type method, bool ok)
         if (efx->type->rx_restore_rss_contexts)
                 efx->type->rx_restore_rss_contexts(efx);
         mutex_unlock(&efx->rss_lock);
-        down_read(&efx->filter_sem);
-        efx_restore_filters(efx);
-        up_read(&efx->filter_sem);
+        efx->type->filter_table_restore(efx);
+        up_write(&efx->filter_sem);
         if (efx->type->sriov_reset)
                 efx->type->sriov_reset(efx);
 
@@ -2764,6 +2758,7 @@ fail:
         efx->port_initialized = false;
 
         mutex_unlock(&efx->rss_lock);
+        up_write(&efx->filter_sem);
         mutex_unlock(&efx->mac_lock);
 
         return rc;
@@ -3473,7 +3468,9 @@ static int efx_pci_probe_main(struct efx_nic *efx)
 
         efx_init_napi(efx);
 
+        down_write(&efx->filter_sem);
         rc = efx->type->init(efx);
+        up_write(&efx->filter_sem);
         if (rc) {
                 netif_err(efx, probe, efx->net_dev,
                           "failed to initialise NIC\n");
@@ -3765,7 +3762,9 @@ static int efx_pm_resume(struct device *dev)
         rc = efx->type->reset(efx, RESET_TYPE_ALL);
         if (rc)
                 return rc;
+        down_write(&efx->filter_sem);
         rc = efx->type->init(efx);
+        up_write(&efx->filter_sem);
         if (rc)
                 return rc;
         rc = efx_pm_thaw(dev);
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
index 2e6e2a96b4f2..f9a61f90cfbc 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
@@ -37,7 +37,7 @@
  *              is done in the "stmmac files"
  */
 
-/* struct emac_variant - Descrive dwmac-sun8i hardware variant
+/* struct emac_variant - Describe dwmac-sun8i hardware variant
  * @default_syscon_value:       The default value of the EMAC register in syscon
  *                              This value is used for disabling properly EMAC
  *                              and used as a good starting value in case of the
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 6d141f3931eb..72da77b94ecd 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -94,7 +94,6 @@ static int dwmac1000_validate_ucast_entries(int ucast_entries)
 /**
  * stmmac_axi_setup - parse DT parameters for programming the AXI register
  * @pdev: platform device
- * @priv: driver private struct.
  * Description:
  * if required, from device-tree the AXI internal register can be tuned
  * by using platform parameters.
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 8e9d0ee1572b..31c3d77b4733 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -1274,6 +1274,7 @@ int netvsc_poll(struct napi_struct *napi, int budget)
         struct hv_device *device = netvsc_channel_to_device(channel);
         struct net_device *ndev = hv_get_drvdata(device);
         int work_done = 0;
+        int ret;
 
         /* If starting a new interval */
         if (!nvchan->desc)
@@ -1285,16 +1286,18 @@ int netvsc_poll(struct napi_struct *napi, int budget)
                 nvchan->desc = hv_pkt_iter_next(channel, nvchan->desc);
         }
 
-        /* If send of pending receive completions suceeded
-         *   and did not exhaust NAPI budget this time
-         *   and not doing busy poll
+        /* Send any pending receive completions */
+        ret = send_recv_completions(ndev, net_device, nvchan);
+
+        /* If it did not exhaust NAPI budget this time
+         *  and not doing busy poll
          * then re-enable host interrupts
-         *     and reschedule if ring is not empty.
+         *  and reschedule if ring is not empty
+         *   or sending receive completion failed.
          */
-        if (send_recv_completions(ndev, net_device, nvchan) == 0 &&
-            work_done < budget &&
+        if (work_done < budget &&
             napi_complete_done(napi, work_done) &&
-            hv_end_read(&channel->inbound) &&
+            (ret || hv_end_read(&channel->inbound)) &&
             napi_schedule_prep(napi)) {
                 hv_begin_read(&channel->inbound);
                 __napi_schedule(napi);
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 9b4e3c3787e5..408ece27131c 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -1338,6 +1338,7 @@ out:
         /* setting up multiple channels failed */
         net_device->max_chn = 1;
         net_device->num_chn = 1;
+        return 0;
 
 err_dev_remv:
         rndis_filter_device_remove(dev, net_device);
diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c
index 64f1b1e77bc0..23a52b9293f3 100644
--- a/drivers/net/ieee802154/adf7242.c
+++ b/drivers/net/ieee802154/adf7242.c
@@ -275,6 +275,8 @@ struct adf7242_local {
         struct spi_message stat_msg;
         struct spi_transfer stat_xfer;
         struct dentry *debugfs_root;
+        struct delayed_work work;
+        struct workqueue_struct *wqueue;
         unsigned long flags;
         int tx_stat;
         bool promiscuous;
@@ -575,10 +577,26 @@ static int adf7242_cmd_rx(struct adf7242_local *lp)
         /* Wait until the ACK is sent */
         adf7242_wait_status(lp, RC_STATUS_PHY_RDY, RC_STATUS_MASK, __LINE__);
         adf7242_clear_irqstat(lp);
+        mod_delayed_work(lp->wqueue, &lp->work, msecs_to_jiffies(400));
 
         return adf7242_cmd(lp, CMD_RC_RX);
 }
 
+static void adf7242_rx_cal_work(struct work_struct *work)
+{
+        struct adf7242_local *lp =
+        container_of(work, struct adf7242_local, work.work);
+
+        /* Reissuing RC_RX every 400ms - to adjust for offset
+         * drift in receiver (datasheet page 61, OCL section)
+         */
+
+        if (!test_bit(FLAG_XMIT, &lp->flags)) {
+                adf7242_cmd(lp, CMD_RC_PHY_RDY);
+                adf7242_cmd_rx(lp);
+        }
+}
+
 static int adf7242_set_txpower(struct ieee802154_hw *hw, int mbm)
 {
         struct adf7242_local *lp = hw->priv;
@@ -686,7 +704,7 @@ static int adf7242_start(struct ieee802154_hw *hw)
         enable_irq(lp->spi->irq);
         set_bit(FLAG_START, &lp->flags);
 
-        return adf7242_cmd(lp, CMD_RC_RX);
+        return adf7242_cmd_rx(lp);
 }
 
 static void adf7242_stop(struct ieee802154_hw *hw)
@@ -694,6 +712,7 @@ static void adf7242_stop(struct ieee802154_hw *hw)
         struct adf7242_local *lp = hw->priv;
 
         disable_irq(lp->spi->irq);
+        cancel_delayed_work_sync(&lp->work);
         adf7242_cmd(lp, CMD_RC_IDLE);
         clear_bit(FLAG_START, &lp->flags);
         adf7242_clear_irqstat(lp);
@@ -719,7 +738,10 @@ static int adf7242_channel(struct ieee802154_hw *hw, u8 page, u8 channel)
         adf7242_write_reg(lp, REG_CH_FREQ1, freq >> 8);
         adf7242_write_reg(lp, REG_CH_FREQ2, freq >> 16);
 
-        return adf7242_cmd(lp, CMD_RC_RX);
+        if (test_bit(FLAG_START, &lp->flags))
+                return adf7242_cmd_rx(lp);
+        else
+                return adf7242_cmd(lp, CMD_RC_PHY_RDY);
 }
 
 static int adf7242_set_hw_addr_filt(struct ieee802154_hw *hw,
@@ -814,6 +836,7 @@ static int adf7242_xmit(struct ieee802154_hw *hw, struct sk_buff *skb)
         /* ensure existing instances of the IRQ handler have completed */
         disable_irq(lp->spi->irq);
         set_bit(FLAG_XMIT, &lp->flags);
+        cancel_delayed_work_sync(&lp->work);
         reinit_completion(&lp->tx_complete);
         adf7242_cmd(lp, CMD_RC_PHY_RDY);
         adf7242_clear_irqstat(lp);
@@ -952,6 +975,7 @@ static irqreturn_t adf7242_isr(int irq, void *data)
         unsigned int xmit;
         u8 irq1;
 
+        mod_delayed_work(lp->wqueue, &lp->work, msecs_to_jiffies(400));
         adf7242_read_reg(lp, REG_IRQ1_SRC1, &irq1);
 
         if (!(irq1 & (IRQ_RX_PKT_RCVD | IRQ_CSMA_CA)))
@@ -1241,6 +1265,9 @@ static int adf7242_probe(struct spi_device *spi)
         spi_message_add_tail(&lp->stat_xfer, &lp->stat_msg);
 
         spi_set_drvdata(spi, lp);
+        INIT_DELAYED_WORK(&lp->work, adf7242_rx_cal_work);
+        lp->wqueue = alloc_ordered_workqueue(dev_name(&spi->dev),
+                                             WQ_MEM_RECLAIM);
 
         ret = adf7242_hw_init(lp);
         if (ret)
@@ -1284,6 +1311,9 @@ static int adf7242_remove(struct spi_device *spi)
         if (!IS_ERR_OR_NULL(lp->debugfs_root))
                 debugfs_remove_recursive(lp->debugfs_root);
 
+        cancel_delayed_work_sync(&lp->work);
+        destroy_workqueue(lp->wqueue);
+
         ieee802154_unregister_hw(lp->hw);
         mutex_destroy(&lp->bmux);
         ieee802154_free_hw(lp->hw);
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 77abedf0b524..3d9e91579866 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -940,7 +940,7 @@ at86rf230_xmit(struct ieee802154_hw *hw, struct sk_buff *skb)
 static int
 at86rf230_ed(struct ieee802154_hw *hw, u8 *level)
 {
-        BUG_ON(!level);
+        WARN_ON(!level);
         *level = 0xbe;
         return 0;
 }
@@ -1121,8 +1121,7 @@ at86rf230_set_hw_addr_filt(struct ieee802154_hw *hw,
         if (changed & IEEE802154_AFILT_SADDR_CHANGED) {
                 u16 addr = le16_to_cpu(filt->short_addr);
 
-                dev_vdbg(&lp->spi->dev,
-                         "at86rf230_set_hw_addr_filt called for saddr\n");
+                dev_vdbg(&lp->spi->dev, "%s called for saddr\n", __func__);
                 __at86rf230_write(lp, RG_SHORT_ADDR_0, addr);
                 __at86rf230_write(lp, RG_SHORT_ADDR_1, addr >> 8);
         }
@@ -1130,8 +1129,7 @@ at86rf230_set_hw_addr_filt(struct ieee802154_hw *hw,
         if (changed & IEEE802154_AFILT_PANID_CHANGED) {
                 u16 pan = le16_to_cpu(filt->pan_id);
 
-                dev_vdbg(&lp->spi->dev,
-                         "at86rf230_set_hw_addr_filt called for pan id\n");
+                dev_vdbg(&lp->spi->dev, "%s called for pan id\n", __func__);
                 __at86rf230_write(lp, RG_PAN_ID_0, pan);
                 __at86rf230_write(lp, RG_PAN_ID_1, pan >> 8);
         }
@@ -1140,15 +1138,13 @@ at86rf230_set_hw_addr_filt(struct ieee802154_hw *hw,
                 u8 i, addr[8];
 
                 memcpy(addr, &filt->ieee_addr, 8);
-                dev_vdbg(&lp->spi->dev,
-                         "at86rf230_set_hw_addr_filt called for IEEE addr\n");
+                dev_vdbg(&lp->spi->dev, "%s called for IEEE addr\n", __func__);
                 for (i = 0; i < 8; i++)
                         __at86rf230_write(lp, RG_IEEE_ADDR_0 + i, addr[i]);
         }
 
         if (changed & IEEE802154_AFILT_PANC_CHANGED) {
-                dev_vdbg(&lp->spi->dev,
-                         "at86rf230_set_hw_addr_filt called for panc change\n");
+                dev_vdbg(&lp->spi->dev, "%s called for panc change\n", __func__);
                 if (filt->pan_coord)
                         at86rf230_write_subreg(lp, SR_AACK_I_AM_COORD, 1);
                 else
@@ -1252,7 +1248,6 @@ at86rf230_set_cca_mode(struct ieee802154_hw *hw,
         return at86rf230_write_subreg(lp, SR_CCA_MODE, val);
 }
 
-
 static int
 at86rf230_set_cca_ed_level(struct ieee802154_hw *hw, s32 mbm)
 {
diff --git a/drivers/net/ieee802154/fakelb.c b/drivers/net/ieee802154/fakelb.c
index 0d673f7682ee..176395e4b7bb 100644
--- a/drivers/net/ieee802154/fakelb.c
+++ b/drivers/net/ieee802154/fakelb.c
@@ -49,7 +49,7 @@ struct fakelb_phy {
 
 static int fakelb_hw_ed(struct ieee802154_hw *hw, u8 *level)
 {
-        BUG_ON(!level);
+        WARN_ON(!level);
         *level = 0xbe;
 
         return 0;
diff --git a/drivers/net/ieee802154/mcr20a.c b/drivers/net/ieee802154/mcr20a.c
index de0d7f28a181..e428277781ac 100644
--- a/drivers/net/ieee802154/mcr20a.c
+++ b/drivers/net/ieee802154/mcr20a.c
@@ -15,10 +15,11 @@
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/spi/spi.h>
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/skbuff.h>
 #include <linux/of_gpio.h>
 #include <linux/regmap.h>
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index b8f57e9b9379..1cd439bdf608 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -130,8 +130,9 @@
 #define MII_88E1318S_PHY_WOL_CTRL_CLEAR_WOL_STATUS              BIT(12)
 #define MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE     BIT(14)
 
-#define MII_88E1121_PHY_LED_CTRL        16
+#define MII_PHY_LED_CTRL                16
 #define MII_88E1121_PHY_LED_DEF         0x0030
+#define MII_88E1510_PHY_LED_DEF         0x1177
 
 #define MII_M1011_PHY_STATUS            0x11
 #define MII_M1011_PHY_STATUS_1000       0x8000
@@ -632,8 +633,40 @@ error:
         return err;
 }
 
+static void marvell_config_led(struct phy_device *phydev)
+{
+        u16 def_config;
+        int err;
+
+        switch (MARVELL_PHY_FAMILY_ID(phydev->phy_id)) {
+        /* Default PHY LED config: LED[0] .. Link, LED[1] .. Activity */
+        case MARVELL_PHY_FAMILY_ID(MARVELL_PHY_ID_88E1121R):
+        case MARVELL_PHY_FAMILY_ID(MARVELL_PHY_ID_88E1318S):
+                def_config = MII_88E1121_PHY_LED_DEF;
+                break;
+        /* Default PHY LED config:
+         * LED[0] .. 1000Mbps Link
+         * LED[1] .. 100Mbps Link
+         * LED[2] .. Blink, Activity
+         */
+        case MARVELL_PHY_FAMILY_ID(MARVELL_PHY_ID_88E1510):
+                def_config = MII_88E1510_PHY_LED_DEF;
+                break;
+        default:
+                return;
+        }
+
+        err = phy_write_paged(phydev, MII_MARVELL_LED_PAGE, MII_PHY_LED_CTRL,
+                              def_config);
+        if (err < 0)
+                pr_warn("Fail to config marvell phy LED.\n");
+}
+
 static int marvell_config_init(struct phy_device *phydev)
 {
+        /* Set defalut LED */
+        marvell_config_led(phydev);
+
         /* Set registers from marvell,reg-init DT property */
         return marvell_of_reg_init(phydev);
 }
@@ -813,21 +846,6 @@ static int m88e1111_config_init(struct phy_device *phydev)
         return genphy_soft_reset(phydev);
 }
 
-static int m88e1121_config_init(struct phy_device *phydev)
-{
-        int err;
-
-        /* Default PHY LED config: LED[0] .. Link, LED[1] .. Activity */
-        err = phy_write_paged(phydev, MII_MARVELL_LED_PAGE,
-                              MII_88E1121_PHY_LED_CTRL,
-                              MII_88E1121_PHY_LED_DEF);
-        if (err < 0)
-                return err;
-
-        /* Set marvell,reg-init configuration from device tree */
-        return marvell_config_init(phydev);
-}
-
 static int m88e1318_config_init(struct phy_device *phydev)
 {
         if (phy_interrupt_is_valid(phydev)) {
@@ -841,7 +859,7 @@ static int m88e1318_config_init(struct phy_device *phydev)
                         return err;
         }
 
-        return m88e1121_config_init(phydev);
+        return marvell_config_init(phydev);
 }
 
 static int m88e1510_config_init(struct phy_device *phydev)
@@ -2087,7 +2105,7 @@ static struct phy_driver marvell_drivers[] = {
                 .features = PHY_GBIT_FEATURES,
                 .flags = PHY_HAS_INTERRUPT,
                 .probe = &m88e1121_probe,
-                .config_init = &m88e1121_config_init,
+                .config_init = &marvell_config_init,
                 .config_aneg = &m88e1121_config_aneg,
                 .read_status = &marvell_read_status,
                 .ack_interrupt = &marvell_ack_interrupt,
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index bd0f339f69fd..b9f5f40a7ac1 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1724,11 +1724,8 @@ EXPORT_SYMBOL(genphy_loopback);
 
 static int __set_phy_supported(struct phy_device *phydev, u32 max_speed)
 {
-        /* The default values for phydev->supported are provided by the PHY
-         * driver "features" member, we want to reset to sane defaults first
-         * before supporting higher speeds.
-         */
-        phydev->supported &= PHY_DEFAULT_FEATURES;
+        phydev->supported &= ~(PHY_1000BT_FEATURES | PHY_100BT_FEATURES |
+                               PHY_10BT_FEATURES);
 
         switch (max_speed) {
         default:
diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
index d437f4f5ed52..740655261e5b 100644
--- a/drivers/net/phy/sfp-bus.c
+++ b/drivers/net/phy/sfp-bus.c
@@ -349,7 +349,6 @@ static int sfp_register_bus(struct sfp_bus *bus)
         }
         if (bus->started)
                 bus->socket_ops->start(bus->sfp);
-        bus->netdev->sfp_bus = bus;
         bus->registered = true;
         return 0;
 }
@@ -364,7 +363,6 @@ static void sfp_unregister_bus(struct sfp_bus *bus)
                 if (bus->phydev && ops && ops->disconnect_phy)
                         ops->disconnect_phy(bus->upstream);
         }
-        bus->netdev->sfp_bus = NULL;
         bus->registered = false;
 }
 
@@ -436,6 +434,14 @@ void sfp_upstream_stop(struct sfp_bus *bus)
 }
 EXPORT_SYMBOL_GPL(sfp_upstream_stop);
 
+static void sfp_upstream_clear(struct sfp_bus *bus)
+{
+        bus->upstream_ops = NULL;
+        bus->upstream = NULL;
+        bus->netdev->sfp_bus = NULL;
+        bus->netdev = NULL;
+}
+
 /**
  * sfp_register_upstream() - Register the neighbouring device
  * @fwnode: firmware node for the SFP bus
@@ -461,9 +467,13 @@ struct sfp_bus *sfp_register_upstream(struct fwnode_handle *fwnode,
                 bus->upstream_ops = ops;
                 bus->upstream = upstream;
                 bus->netdev = ndev;
+                ndev->sfp_bus = bus;
 
-                if (bus->sfp)
+                if (bus->sfp) {
                         ret = sfp_register_bus(bus);
+                        if (ret)
+                                sfp_upstream_clear(bus);
+                }
                 rtnl_unlock();
         }
 
@@ -488,8 +498,7 @@ void sfp_unregister_upstream(struct sfp_bus *bus)
         rtnl_lock();
         if (bus->sfp)
                 sfp_unregister_bus(bus);
-        bus->upstream = NULL;
-        bus->netdev = NULL;
+        sfp_upstream_clear(bus);
         rtnl_unlock();
 
         sfp_bus_put(bus);
@@ -561,6 +570,13 @@ void sfp_module_remove(struct sfp_bus *bus)
 }
 EXPORT_SYMBOL_GPL(sfp_module_remove);
 
+static void sfp_socket_clear(struct sfp_bus *bus)
+{
+        bus->sfp_dev = NULL;
+        bus->sfp = NULL;
+        bus->socket_ops = NULL;
+}
+
 struct sfp_bus *sfp_register_socket(struct device *dev, struct sfp *sfp,
                                     const struct sfp_socket_ops *ops)
 {
@@ -573,8 +589,11 @@ struct sfp_bus *sfp_register_socket(struct device *dev, struct sfp *sfp,
                 bus->sfp = sfp;
                 bus->socket_ops = ops;
 
-                if (bus->netdev)
+                if (bus->netdev) {
                         ret = sfp_register_bus(bus);
+                        if (ret)
+                                sfp_socket_clear(bus);
+                }
                 rtnl_unlock();
         }
 
@@ -592,9 +611,7 @@ void sfp_unregister_socket(struct sfp_bus *bus)
         rtnl_lock();
         if (bus->netdev)
                 sfp_unregister_bus(bus);
-        bus->sfp_dev = NULL;
-        bus->sfp = NULL;
-        bus->socket_ops = NULL;
+        sfp_socket_clear(bus);
         rtnl_unlock();
 
         sfp_bus_put(bus);
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index a192a017cc68..f5727baac84a 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1688,7 +1688,7 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun,
                 case XDP_TX:
                         get_page(alloc_frag->page);
                         alloc_frag->offset += buflen;
-                        if (tun_xdp_tx(tun->dev, &xdp))
+                        if (tun_xdp_tx(tun->dev, &xdp) < 0)
                                 goto err_redirect;
                         rcu_read_unlock();
                         local_bh_enable();
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index 3d4f7959dabb..b1b3d8f7e67d 100644
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -642,10 +642,12 @@ static void ax88772_restore_phy(struct usbnet *dev)
                                      priv->presvd_phy_advertise);
 
                 /* Restore BMCR */
+                if (priv->presvd_phy_bmcr & BMCR_ANENABLE)
+                        priv->presvd_phy_bmcr |= BMCR_ANRESTART;
+
                 asix_mdio_write_nopm(dev->net, dev->mii.phy_id, MII_BMCR,
                                      priv->presvd_phy_bmcr);
 
-                mii_nway_restart(&dev->mii);
                 priv->presvd_phy_advertise = 0;
                 priv->presvd_phy_bmcr = 0;
         }
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 2e4130746c40..ed10d49eb5e0 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -3344,6 +3344,7 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev)
         pkt_cnt = 0;
         count = 0;
         length = 0;
+        spin_lock_irqsave(&tqp->lock, flags);
         for (skb = tqp->next; pkt_cnt < tqp->qlen; skb = skb->next) {
                 if (skb_is_gso(skb)) {
                         if (pkt_cnt) {
@@ -3352,7 +3353,8 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev)
                         }
                         count = 1;
                         length = skb->len - TX_OVERHEAD;
-                        skb2 = skb_dequeue(tqp);
+                        __skb_unlink(skb, tqp);
+                        spin_unlock_irqrestore(&tqp->lock, flags);
                         goto gso_skb;
                 }
 
@@ -3361,6 +3363,7 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev)
                 skb_totallen = skb->len + roundup(skb_totallen, sizeof(u32));
                 pkt_cnt++;
         }
+        spin_unlock_irqrestore(&tqp->lock, flags);
 
         /* copy to a single skb */
         skb = alloc_skb(skb_totallen, GFP_ATOMIC);
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 8fac8e132c5b..38502809420b 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -1253,6 +1253,7 @@ static const struct usb_device_id products[] = {
         {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */
         {QMI_QUIRK_SET_DTR(0x2c7c, 0x0125, 4)}, /* Quectel EC25, EC20 R2.0  Mini PCIe */
         {QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)}, /* Quectel EC21 Mini PCIe */
+        {QMI_QUIRK_SET_DTR(0x2c7c, 0x0191, 4)}, /* Quectel EG91 */
         {QMI_FIXED_INTF(0x2c7c, 0x0296, 4)},    /* Quectel BG96 */
         {QMI_QUIRK_SET_DTR(0x2c7c, 0x0306, 4)}, /* Quectel EP06 Mini PCIe */
 
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index 5f565bd574da..48ba80a8ca5c 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -681,7 +681,7 @@ static void rtl8150_set_multicast(struct net_device *netdev)
                    (netdev->flags & IFF_ALLMULTI)) {
                 rx_creg &= 0xfffe;
                 rx_creg |= 0x0002;
-                dev_info(&netdev->dev, "%s: allmulti set\n", netdev->name);
+                dev_dbg(&netdev->dev, "%s: allmulti set\n", netdev->name);
         } else {
                 /* ~RX_MULTICAST, ~RX_PROMISCUOUS */
                 rx_creg &= 0x00fc;
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 7a6a1fe79309..05553d252446 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -82,6 +82,9 @@ static bool turbo_mode = true;
 module_param(turbo_mode, bool, 0644);
 MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
 
+static int smsc75xx_link_ok_nopm(struct usbnet *dev);
+static int smsc75xx_phy_gig_workaround(struct usbnet *dev);
+
 static int __must_check __smsc75xx_read_reg(struct usbnet *dev, u32 index,
                                             u32 *data, int in_pm)
 {
@@ -852,6 +855,9 @@ static int smsc75xx_phy_initialize(struct usbnet *dev)
                 return -EIO;
         }
 
+        /* phy workaround for gig link */
+        smsc75xx_phy_gig_workaround(dev);
+
         smsc75xx_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
                 ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP |
                 ADVERTISE_PAUSE_ASYM);
@@ -987,6 +993,62 @@ static int smsc75xx_wait_ready(struct usbnet *dev, int in_pm)
         return -EIO;
 }
 
+static int smsc75xx_phy_gig_workaround(struct usbnet *dev)
+{
+        struct mii_if_info *mii = &dev->mii;
+        int ret = 0, timeout = 0;
+        u32 buf, link_up = 0;
+
+        /* Set the phy in Gig loopback */
+        smsc75xx_mdio_write(dev->net, mii->phy_id, MII_BMCR, 0x4040);
+
+        /* Wait for the link up */
+        do {
+                link_up = smsc75xx_link_ok_nopm(dev);
+                usleep_range(10000, 20000);
+                timeout++;
+        } while ((!link_up) && (timeout < 1000));
+
+        if (timeout >= 1000) {
+                netdev_warn(dev->net, "Timeout waiting for PHY link up\n");
+                return -EIO;
+        }
+
+        /* phy reset */
+        ret = smsc75xx_read_reg(dev, PMT_CTL, &buf);
+        if (ret < 0) {
+                netdev_warn(dev->net, "Failed to read PMT_CTL: %d\n", ret);
+                return ret;
+        }
+
+        buf |= PMT_CTL_PHY_RST;
+
+        ret = smsc75xx_write_reg(dev, PMT_CTL, buf);
+        if (ret < 0) {
+                netdev_warn(dev->net, "Failed to write PMT_CTL: %d\n", ret);
+                return ret;
+        }
+
+        timeout = 0;
+        do {
+                usleep_range(10000, 20000);
+                ret = smsc75xx_read_reg(dev, PMT_CTL, &buf);
+                if (ret < 0) {
+                        netdev_warn(dev->net, "Failed to read PMT_CTL: %d\n",
+                                    ret);
+                        return ret;
+                }
+                timeout++;
+        } while ((buf & PMT_CTL_PHY_RST) && (timeout < 100));
+
+        if (timeout >= 100) {
+                netdev_warn(dev->net, "timeout waiting for PHY Reset\n");
+                return -EIO;
+        }
+
+        return 0;
+}
+
 static int smsc75xx_reset(struct usbnet *dev)
 {
         struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index e9c2fb318c03..836e0a47b94a 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -6058,8 +6058,19 @@ static void ath10k_sta_rc_update_wk(struct work_struct *wk)
                            ath10k_mac_max_vht_nss(vht_mcs_mask)));
 
         if (changed & IEEE80211_RC_BW_CHANGED) {
-                ath10k_dbg(ar, ATH10K_DBG_MAC, "mac update sta %pM peer bw %d\n",
-                           sta->addr, bw);
+                enum wmi_phy_mode mode;
+
+                mode = chan_to_phymode(&def);
+                ath10k_dbg(ar, ATH10K_DBG_MAC, "mac update sta %pM peer bw %d phymode %d\n",
+                                sta->addr, bw, mode);
+
+                err = ath10k_wmi_peer_set_param(ar, arvif->vdev_id, sta->addr,
+                                WMI_PEER_PHYMODE, mode);
+                if (err) {
+                        ath10k_warn(ar, "failed to update STA %pM peer phymode %d: %d\n",
+                                        sta->addr, mode, err);
+                        goto exit;
+                }
 
                 err = ath10k_wmi_peer_set_param(ar, arvif->vdev_id, sta->addr,
                                                 WMI_PEER_CHAN_WIDTH, bw);
@@ -6100,6 +6111,7 @@ static void ath10k_sta_rc_update_wk(struct work_struct *wk)
                                     sta->addr);
         }
 
+exit:
         mutex_unlock(&ar->conf_mutex);
 }
 
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index b48db54e9865..d68afb65402a 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -6144,6 +6144,7 @@ enum wmi_peer_param {
         WMI_PEER_NSS        = 0x5,
         WMI_PEER_USE_4ADDR  = 0x6,
         WMI_PEER_DEBUG      = 0xa,
+        WMI_PEER_PHYMODE    = 0xd,
         WMI_PEER_DUMMY_VAR  = 0xff, /* dummy parameter for STA PS workaround */
 };
 
diff --git a/drivers/net/wireless/ath/wcn36xx/testmode.c b/drivers/net/wireless/ath/wcn36xx/testmode.c
index 1279064a3b71..51a038022c8b 100644
--- a/drivers/net/wireless/ath/wcn36xx/testmode.c
+++ b/drivers/net/wireless/ath/wcn36xx/testmode.c
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index c99a191e8d69..a907d7b065fa 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -4296,6 +4296,13 @@ void brcmf_sdio_remove(struct brcmf_sdio *bus)
         brcmf_dbg(TRACE, "Enter\n");
 
         if (bus) {
+                /* Stop watchdog task */
+                if (bus->watchdog_tsk) {
+                        send_sig(SIGTERM, bus->watchdog_tsk, 1);
+                        kthread_stop(bus->watchdog_tsk);
+                        bus->watchdog_tsk = NULL;
+                }
+
                 /* De-register interrupt handler */
                 brcmf_sdiod_intr_unregister(bus->sdiodev);
 
diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c
index 6e3cf9817730..88f4c89f89ba 100644
--- a/drivers/net/wireless/marvell/mwifiex/usb.c
+++ b/drivers/net/wireless/marvell/mwifiex/usb.c
@@ -644,11 +644,6 @@ static void mwifiex_usb_disconnect(struct usb_interface *intf)
                                          MWIFIEX_FUNC_SHUTDOWN);
         }
 
-        if (adapter->workqueue)
-                flush_workqueue(adapter->workqueue);
-
-        mwifiex_usb_free(card);
-
         mwifiex_dbg(adapter, FATAL,
                     "%s: removing card\n", __func__);
         mwifiex_remove_card(adapter);
@@ -1356,6 +1351,8 @@ static void mwifiex_unregister_dev(struct mwifiex_adapter *adapter)
 {
         struct usb_card_rec *card = (struct usb_card_rec *)adapter->card;
 
+        mwifiex_usb_free(card);
+
         mwifiex_usb_cleanup_tx_aggr(adapter);
 
         card->adapter = NULL;
diff --git a/drivers/net/wireless/mediatek/mt7601u/phy.c b/drivers/net/wireless/mediatek/mt7601u/phy.c
index 9d2f9a776ef1..b804abd464ae 100644
--- a/drivers/net/wireless/mediatek/mt7601u/phy.c
+++ b/drivers/net/wireless/mediatek/mt7601u/phy.c
@@ -986,13 +986,15 @@ static void mt7601u_agc_tune(struct mt7601u_dev *dev)
          */
         spin_lock_bh(&dev->con_mon_lock);
         avg_rssi = ewma_rssi_read(&dev->avg_rssi);
-        WARN_ON_ONCE(avg_rssi == 0);
+        spin_unlock_bh(&dev->con_mon_lock);
+        if (avg_rssi == 0)
+                return;
+
         avg_rssi = -avg_rssi;
         if (avg_rssi <= -70)
                 val -= 0x20;
         else if (avg_rssi <= -60)
                 val -= 0x10;
-        spin_unlock_bh(&dev->con_mon_lock);
 
         if (val != mt7601u_bbp_rr(dev, 66))
                 mt7601u_bbp_wr(dev, 66, val);
diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
index 220e2b710208..ae0ca8006849 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
@@ -654,8 +654,7 @@ qtnf_disconnect(struct wiphy *wiphy, struct net_device *dev,
         vif = qtnf_mac_get_base_vif(mac);
         if (!vif) {
                 pr_err("MAC%u: primary VIF is not configured\n", mac->macid);
-                ret = -EFAULT;
-                goto out;
+                return -EFAULT;
         }
 
         if (vif->wdev.iftype != NL80211_IFTYPE_STATION) {
diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
index 39c817eddd78..54c9f6ab0c8c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -484,18 +484,21 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
 
 }
 
-void rtl_deinit_deferred_work(struct ieee80211_hw *hw)
+void rtl_deinit_deferred_work(struct ieee80211_hw *hw, bool ips_wq)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         del_timer_sync(&rtlpriv->works.watchdog_timer);
 
-        cancel_delayed_work(&rtlpriv->works.watchdog_wq);
-        cancel_delayed_work(&rtlpriv->works.ips_nic_off_wq);
-        cancel_delayed_work(&rtlpriv->works.ps_work);
-        cancel_delayed_work(&rtlpriv->works.ps_rfon_wq);
-        cancel_delayed_work(&rtlpriv->works.fwevt_wq);
-        cancel_delayed_work(&rtlpriv->works.c2hcmd_wq);
+        cancel_delayed_work_sync(&rtlpriv->works.watchdog_wq);
+        if (ips_wq)
+                cancel_delayed_work(&rtlpriv->works.ips_nic_off_wq);
+        else
+                cancel_delayed_work_sync(&rtlpriv->works.ips_nic_off_wq);
+        cancel_delayed_work_sync(&rtlpriv->works.ps_work);
+        cancel_delayed_work_sync(&rtlpriv->works.ps_rfon_wq);
+        cancel_delayed_work_sync(&rtlpriv->works.fwevt_wq);
+        cancel_delayed_work_sync(&rtlpriv->works.c2hcmd_wq);
 }
 EXPORT_SYMBOL_GPL(rtl_deinit_deferred_work);
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/base.h b/drivers/net/wireless/realtek/rtlwifi/base.h
index 912f205779c3..a7ae40eaa3cd 100644
--- a/drivers/net/wireless/realtek/rtlwifi/base.h
+++ b/drivers/net/wireless/realtek/rtlwifi/base.h
@@ -121,7 +121,7 @@ void rtl_init_rfkill(struct ieee80211_hw *hw);
 void rtl_deinit_rfkill(struct ieee80211_hw *hw);
 
 void rtl_watch_dog_timer_callback(struct timer_list *t);
-void rtl_deinit_deferred_work(struct ieee80211_hw *hw);
+void rtl_deinit_deferred_work(struct ieee80211_hw *hw, bool ips_wq);
 
 bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx);
 int rtlwifi_rate_mapping(struct ieee80211_hw *hw, bool isht,
diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
index cfea57efa7f4..4bf7967590ca 100644
--- a/drivers/net/wireless/realtek/rtlwifi/core.c
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
@@ -130,7 +130,6 @@ found_alt:
                        firmware->size);
                 rtlpriv->rtlhal.wowlan_fwsize = firmware->size;
         }
-        rtlpriv->rtlhal.fwsize = firmware->size;
         release_firmware(firmware);
 }
 
@@ -196,7 +195,7 @@ static void rtl_op_stop(struct ieee80211_hw *hw)
                 /* reset sec info */
                 rtl_cam_reset_sec_info(hw);
 
-                rtl_deinit_deferred_work(hw);
+                rtl_deinit_deferred_work(hw, false);
         }
         rtlpriv->intf_ops->adapter_stop(hw);
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c
index ae13bcfb3bf0..5d1fda16fc8c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/pci.c
+++ b/drivers/net/wireless/realtek/rtlwifi/pci.c
@@ -2377,7 +2377,7 @@ void rtl_pci_disconnect(struct pci_dev *pdev)
                 ieee80211_unregister_hw(hw);
                 rtlmac->mac80211_registered = 0;
         } else {
-                rtl_deinit_deferred_work(hw);
+                rtl_deinit_deferred_work(hw, false);
                 rtlpriv->intf_ops->adapter_stop(hw);
         }
         rtlpriv->cfg->ops->disable_interrupt(hw);
diff --git a/drivers/net/wireless/realtek/rtlwifi/ps.c b/drivers/net/wireless/realtek/rtlwifi/ps.c
index 71af24e2e051..479a4cfc245d 100644
--- a/drivers/net/wireless/realtek/rtlwifi/ps.c
+++ b/drivers/net/wireless/realtek/rtlwifi/ps.c
@@ -71,7 +71,7 @@ bool rtl_ps_disable_nic(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         /*<1> Stop all timer */
-        rtl_deinit_deferred_work(hw);
+        rtl_deinit_deferred_work(hw, true);
 
         /*<2> Disable Interrupt */
         rtlpriv->cfg->ops->disable_interrupt(hw);
@@ -292,7 +292,7 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw)
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         enum rf_pwrstate rtstate;
 
-        cancel_delayed_work(&rtlpriv->works.ips_nic_off_wq);
+        cancel_delayed_work_sync(&rtlpriv->works.ips_nic_off_wq);
 
         mutex_lock(&rtlpriv->locks.ips_mutex);
         if (ppsc->inactiveps) {
diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c
index f9faffc498bc..2ac5004d7a40 100644
--- a/drivers/net/wireless/realtek/rtlwifi/usb.c
+++ b/drivers/net/wireless/realtek/rtlwifi/usb.c
@@ -1132,7 +1132,7 @@ void rtl_usb_disconnect(struct usb_interface *intf)
                 ieee80211_unregister_hw(hw);
                 rtlmac->mac80211_registered = 0;
         } else {
-                rtl_deinit_deferred_work(hw);
+                rtl_deinit_deferred_work(hw, false);
                 rtlpriv->intf_ops->adapter_stop(hw);
         }
         /*deinit rfkill */
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 848f549164cd..466e3c8582f0 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -102,7 +102,7 @@ static u32 phandle_cache_mask;
  *   - the phandle lookup overhead reduction provided by the cache
  *     will likely be less
  */
-static void of_populate_phandle_cache(void)
+void of_populate_phandle_cache(void)
 {
         unsigned long flags;
         u32 cache_entries;
@@ -134,8 +134,7 @@ out:
         raw_spin_unlock_irqrestore(&devtree_lock, flags);
 }
 
-#ifndef CONFIG_MODULES
-static int __init of_free_phandle_cache(void)
+int of_free_phandle_cache(void)
 {
         unsigned long flags;
 
@@ -148,6 +147,7 @@ static int __init of_free_phandle_cache(void)
 
         return 0;
 }
+#if !defined(CONFIG_MODULES)
 late_initcall_sync(of_free_phandle_cache);
 #endif
 
diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h
index 891d780c076a..216175d11d3d 100644
--- a/drivers/of/of_private.h
+++ b/drivers/of/of_private.h
@@ -79,6 +79,8 @@ int of_resolve_phandles(struct device_node *tree);
 #if defined(CONFIG_OF_OVERLAY)
 void of_overlay_mutex_lock(void);
 void of_overlay_mutex_unlock(void);
+int of_free_phandle_cache(void);
+void of_populate_phandle_cache(void);
 #else
 static inline void of_overlay_mutex_lock(void) {};
 static inline void of_overlay_mutex_unlock(void) {};
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 7baa53e5b1d7..eda57ef12fd0 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -804,6 +804,8 @@ static int of_overlay_apply(const void *fdt, struct device_node *tree,
                 goto err_free_overlay_changeset;
         }
 
+        of_populate_phandle_cache();
+
         ret = __of_changeset_apply_notify(&ovcs->cset);
         if (ret)
                 pr_err("overlay changeset entry notify error %d\n", ret);
@@ -1046,8 +1048,17 @@ int of_overlay_remove(int *ovcs_id)
 
         list_del(&ovcs->ovcs_list);
 
+        /*
+         * Disable phandle cache.  Avoids race condition that would arise
+         * from removing cache entry when the associated node is deleted.
+         */
+        of_free_phandle_cache();
+
         ret_apply = 0;
         ret = __of_changeset_revert_entries(&ovcs->cset, &ret_apply);
+
+        of_populate_phandle_cache();
+
         if (ret) {
                 if (ret_apply)
                         devicetree_state_flags |= DTSF_REVERT_FAIL;
diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index 781aa03aeede..29a05759a294 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -363,7 +363,8 @@ int dw_pcie_host_init(struct pcie_port *pp)
         resource_list_for_each_entry_safe(win, tmp, &bridge->windows) {
                 switch (resource_type(win->res)) {
                 case IORESOURCE_IO:
-                        ret = pci_remap_iospace(win->res, pp->io_base);
+                        ret = devm_pci_remap_iospace(dev, win->res,
+                                                     pp->io_base);
                         if (ret) {
                                 dev_warn(dev, "Error %d: failed to map resource %pR\n",
                                          ret, win->res);
diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index d3172d5d3d35..0fae816fba39 100644
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -849,7 +849,7 @@ static int advk_pcie_parse_request_of_pci_ranges(struct advk_pcie *pcie)
                                              0, 0xF8000000, 0,
                                              lower_32_bits(res->start),
                                              OB_PCIE_IO);
-                        err = pci_remap_iospace(res, iobase);
+                        err = devm_pci_remap_iospace(dev, res, iobase);
                         if (err) {
                                 dev_warn(dev, "error %d: failed to map resource %pR\n",
                                          err, res);
diff --git a/drivers/pci/controller/pci-ftpci100.c b/drivers/pci/controller/pci-ftpci100.c
index 20bb2564a6b3..bf5ece5d9291 100644
--- a/drivers/pci/controller/pci-ftpci100.c
+++ b/drivers/pci/controller/pci-ftpci100.c
@@ -503,7 +503,7 @@ static int faraday_pci_probe(struct platform_device *pdev)
                                 dev_err(dev, "illegal IO mem size\n");
                                 return -EINVAL;
                         }
-                        ret = pci_remap_iospace(io, io_base);
+                        ret = devm_pci_remap_iospace(dev, io, io_base);
                         if (ret) {
                                 dev_warn(dev, "error %d: failed to map resource %pR\n",
                                          ret, io);
diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
index 6cc5036ac83c..f6325f1a89e8 100644
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@ -1073,6 +1073,7 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
         struct pci_bus *pbus;
         struct pci_dev *pdev;
         struct cpumask *dest;
+        unsigned long flags;
         struct compose_comp_ctxt comp;
         struct tran_int_desc *int_desc;
         struct {
@@ -1164,14 +1165,15 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
                  * the channel callback directly when channel->target_cpu is
                  * the current CPU. When the higher level interrupt code
                  * calls us with interrupt enabled, let's add the
-                 * local_bh_disable()/enable() to avoid race.
+                 * local_irq_save()/restore() to avoid race:
+                 * hv_pci_onchannelcallback() can also run in tasklet.
                  */
-                local_bh_disable();
+                local_irq_save(flags);
 
                 if (hbus->hdev->channel->target_cpu == smp_processor_id())
                         hv_pci_onchannelcallback(hbus);
 
-                local_bh_enable();
+                local_irq_restore(flags);
 
                 if (hpdev->state == hv_pcichild_ejecting) {
                         dev_err_once(&hbus->hdev->device,
diff --git a/drivers/pci/controller/pci-v3-semi.c b/drivers/pci/controller/pci-v3-semi.c
index 68b8bfbdb867..d219404bad92 100644
--- a/drivers/pci/controller/pci-v3-semi.c
+++ b/drivers/pci/controller/pci-v3-semi.c
@@ -537,7 +537,7 @@ static int v3_pci_setup_resource(struct v3_pci *v3,
                 v3->io_bus_addr = io->start - win->offset;
                 dev_dbg(dev, "I/O window %pR, bus addr %pap\n",
                         io, &v3->io_bus_addr);
-                ret = pci_remap_iospace(io, io_base);
+                ret = devm_pci_remap_iospace(dev, io, io_base);
                 if (ret) {
                         dev_warn(dev,
                                  "error %d: failed to map resource %pR\n",
diff --git a/drivers/pci/controller/pci-versatile.c b/drivers/pci/controller/pci-versatile.c
index 994f32061b32..f59ad2728c0b 100644
--- a/drivers/pci/controller/pci-versatile.c
+++ b/drivers/pci/controller/pci-versatile.c
@@ -82,7 +82,7 @@ static int versatile_pci_parse_request_of_pci_ranges(struct device *dev,
 
                 switch (resource_type(res)) {
                 case IORESOURCE_IO:
-                        err = pci_remap_iospace(res, iobase);
+                        err = devm_pci_remap_iospace(dev, res, iobase);
                         if (err) {
                                 dev_warn(dev, "error %d: failed to map resource %pR\n",
                                          err, res);
diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
index d854d67e873c..ffda3e8b4742 100644
--- a/drivers/pci/controller/pci-xgene.c
+++ b/drivers/pci/controller/pci-xgene.c
@@ -423,7 +423,7 @@ static int xgene_pcie_map_ranges(struct xgene_pcie_port *port,
                 case IORESOURCE_IO:
                         xgene_pcie_setup_ob_reg(port, res, OMR3BARL, io_base,
                                                 res->start - window->offset);
-                        ret = pci_remap_iospace(res, io_base);
+                        ret = devm_pci_remap_iospace(dev, res, io_base);
                         if (ret < 0)
                                 return ret;
                         break;
diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
index 0baabe30858f..861dda69f366 100644
--- a/drivers/pci/controller/pcie-mediatek.c
+++ b/drivers/pci/controller/pcie-mediatek.c
@@ -1109,7 +1109,7 @@ static int mtk_pcie_request_resources(struct mtk_pcie *pcie)
         if (err < 0)
                 return err;
 
-        pci_remap_iospace(&pcie->pio, pcie->io.start);
+        devm_pci_remap_iospace(dev, &pcie->pio, pcie->io.start);
 
         return 0;
 }
diff --git a/drivers/pci/endpoint/pci-epf-core.c b/drivers/pci/endpoint/pci-epf-core.c
index bf53fad636a5..825fa24427a3 100644
--- a/drivers/pci/endpoint/pci-epf-core.c
+++ b/drivers/pci/endpoint/pci-epf-core.c
@@ -137,25 +137,60 @@ void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar)
 }
 EXPORT_SYMBOL_GPL(pci_epf_alloc_space);
 
-/**
- * pci_epf_unregister_driver() - unregister the PCI EPF driver
- * @driver: the PCI EPF driver that has to be unregistered
- *
- * Invoke to unregister the PCI EPF driver.
- */
-void pci_epf_unregister_driver(struct pci_epf_driver *driver)
+static void pci_epf_remove_cfs(struct pci_epf_driver *driver)
 {
         struct config_group *group, *tmp;
 
+        if (!IS_ENABLED(CONFIG_PCI_ENDPOINT_CONFIGFS))
+                return;
+
         mutex_lock(&pci_epf_mutex);
         list_for_each_entry_safe(group, tmp, &driver->epf_group, group_entry)
                 pci_ep_cfs_remove_epf_group(group);
         list_del(&driver->epf_group);
         mutex_unlock(&pci_epf_mutex);
+}
+
+/**
+ * pci_epf_unregister_driver() - unregister the PCI EPF driver
+ * @driver: the PCI EPF driver that has to be unregistered
+ *
+ * Invoke to unregister the PCI EPF driver.
+ */
+void pci_epf_unregister_driver(struct pci_epf_driver *driver)
+{
+        pci_epf_remove_cfs(driver);
         driver_unregister(&driver->driver);
 }
 EXPORT_SYMBOL_GPL(pci_epf_unregister_driver);
 
+static int pci_epf_add_cfs(struct pci_epf_driver *driver)
+{
+        struct config_group *group;
+        const struct pci_epf_device_id *id;
+
+        if (!IS_ENABLED(CONFIG_PCI_ENDPOINT_CONFIGFS))
+                return 0;
+
+        INIT_LIST_HEAD(&driver->epf_group);
+
+        id = driver->id_table;
+        while (id->name[0]) {
+                group = pci_ep_cfs_add_epf_group(id->name);
+                if (IS_ERR(group)) {
+                        pci_epf_remove_cfs(driver);
+                        return PTR_ERR(group);
+                }
+
+                mutex_lock(&pci_epf_mutex);
+                list_add_tail(&group->group_entry, &driver->epf_group);
+                mutex_unlock(&pci_epf_mutex);
+                id++;
+        }
+
+        return 0;
+}
+
 /**
  * __pci_epf_register_driver() - register a new PCI EPF driver
  * @driver: structure representing PCI EPF driver
@@ -167,8 +202,6 @@ int __pci_epf_register_driver(struct pci_epf_driver *driver,
                               struct module *owner)
 {
         int ret;
-        struct config_group *group;
-        const struct pci_epf_device_id *id;
 
         if (!driver->ops)
                 return -EINVAL;
@@ -183,16 +216,7 @@ int __pci_epf_register_driver(struct pci_epf_driver *driver,
         if (ret)
                 return ret;
 
-        INIT_LIST_HEAD(&driver->epf_group);
-
-        id = driver->id_table;
-        while (id->name[0]) {
-                group = pci_ep_cfs_add_epf_group(id->name);
-                mutex_lock(&pci_epf_mutex);
-                list_add_tail(&group->group_entry, &driver->epf_group);
-                mutex_unlock(&pci_epf_mutex);
-                id++;
-        }
+        pci_epf_add_cfs(driver);
 
         return 0;
 }
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index d088c9147f10..69a60d6ebd73 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -612,7 +612,7 @@ int pci_parse_request_of_pci_ranges(struct device *dev,
 
                 switch (resource_type(res)) {
                 case IORESOURCE_IO:
-                        err = pci_remap_iospace(res, iobase);
+                        err = devm_pci_remap_iospace(dev, res, iobase);
                         if (err) {
                                 dev_warn(dev, "error %d: failed to map resource %pR\n",
                                          err, res);
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 97acba712e4e..316496e99da9 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -3579,6 +3579,44 @@ void pci_unmap_iospace(struct resource *res)
 }
 EXPORT_SYMBOL(pci_unmap_iospace);
 
+static void devm_pci_unmap_iospace(struct device *dev, void *ptr)
+{
+        struct resource **res = ptr;
+
+        pci_unmap_iospace(*res);
+}
+
+/**
+ * devm_pci_remap_iospace - Managed pci_remap_iospace()
+ * @dev: Generic device to remap IO address for
+ * @res: Resource describing the I/O space
+ * @phys_addr: physical address of range to be mapped
+ *
+ * Managed pci_remap_iospace().  Map is automatically unmapped on driver
+ * detach.
+ */
+int devm_pci_remap_iospace(struct device *dev, const struct resource *res,
+                           phys_addr_t phys_addr)
+{
+        const struct resource **ptr;
+        int error;
+
+        ptr = devres_alloc(devm_pci_unmap_iospace, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return -ENOMEM;
+
+        error = pci_remap_iospace(res, phys_addr);
+        if (error) {
+                devres_free(ptr);
+        } else  {
+                *ptr = res;
+                devres_add(dev, ptr);
+        }
+
+        return error;
+}
+EXPORT_SYMBOL(devm_pci_remap_iospace);
+
 /**
  * devm_pci_remap_cfgspace - Managed pci_remap_cfgspace()
  * @dev: Generic device to remap IO address for
diff --git a/drivers/pinctrl/bcm/pinctrl-nsp-mux.c b/drivers/pinctrl/bcm/pinctrl-nsp-mux.c
index 35c17653c694..87618a4e90e4 100644
--- a/drivers/pinctrl/bcm/pinctrl-nsp-mux.c
+++ b/drivers/pinctrl/bcm/pinctrl-nsp-mux.c
@@ -460,8 +460,8 @@ static int nsp_pinmux_enable(struct pinctrl_dev *pctrl_dev,
         const struct nsp_pin_function *func;
         const struct nsp_pin_group *grp;
 
-        if (grp_select > pinctrl->num_groups ||
-                func_select > pinctrl->num_functions)
+        if (grp_select >= pinctrl->num_groups ||
+            func_select >= pinctrl->num_functions)
                 return -EINVAL;
 
         func = &pinctrl->functions[func_select];
@@ -577,6 +577,8 @@ static int nsp_pinmux_probe(struct platform_device *pdev)
                 return PTR_ERR(pinctrl->base0);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        if (!res)
+                return -EINVAL;
         pinctrl->base1 = devm_ioremap_nocache(&pdev->dev, res->start,
                                               resource_size(res));
         if (!pinctrl->base1) {
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7622.c b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
index e3f1ab2290fc..4c4740ffeb9c 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7622.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
@@ -1424,7 +1424,7 @@ static struct pinctrl_desc mtk_desc = {
 
 static int mtk_gpio_get(struct gpio_chip *chip, unsigned int gpio)
 {
-        struct mtk_pinctrl *hw = dev_get_drvdata(chip->parent);
+        struct mtk_pinctrl *hw = gpiochip_get_data(chip);
         int value, err;
 
         err = mtk_hw_get_value(hw, gpio, PINCTRL_PIN_REG_DI, &value);
@@ -1436,7 +1436,7 @@ static int mtk_gpio_get(struct gpio_chip *chip, unsigned int gpio)
 
 static void mtk_gpio_set(struct gpio_chip *chip, unsigned int gpio, int value)
 {
-        struct mtk_pinctrl *hw = dev_get_drvdata(chip->parent);
+        struct mtk_pinctrl *hw = gpiochip_get_data(chip);
 
         mtk_hw_set_value(hw, gpio, PINCTRL_PIN_REG_DO, !!value);
 }
@@ -1508,11 +1508,20 @@ static int mtk_build_gpiochip(struct mtk_pinctrl *hw, struct device_node *np)
         if (ret < 0)
                 return ret;
 
-        ret = gpiochip_add_pin_range(chip, dev_name(hw->dev), 0, 0,
-                                     chip->ngpio);
-        if (ret < 0) {
-                gpiochip_remove(chip);
-                return ret;
+        /* Just for backward compatible for these old pinctrl nodes without
+         * "gpio-ranges" property. Otherwise, called directly from a
+         * DeviceTree-supported pinctrl driver is DEPRECATED.
+         * Please see Section 2.1 of
+         * Documentation/devicetree/bindings/gpio/gpio.txt on how to
+         * bind pinctrl and gpio drivers via the "gpio-ranges" property.
+         */
+        if (!of_find_property(np, "gpio-ranges", NULL)) {
+                ret = gpiochip_add_pin_range(chip, dev_name(hw->dev), 0, 0,
+                                             chip->ngpio);
+                if (ret < 0) {
+                        gpiochip_remove(chip);
+                        return ret;
+                }
         }
 
         return 0;
@@ -1695,15 +1704,16 @@ static int mtk_pinctrl_probe(struct platform_device *pdev)
         mtk_desc.custom_conf_items = mtk_conf_items;
 #endif
 
-        hw->pctrl = devm_pinctrl_register(&pdev->dev, &mtk_desc, hw);
-        if (IS_ERR(hw->pctrl))
-                return PTR_ERR(hw->pctrl);
+        err = devm_pinctrl_register_and_init(&pdev->dev, &mtk_desc, hw,
+                                             &hw->pctrl);
+        if (err)
+                return err;
 
         /* Setup groups descriptions per SoC types */
         err = mtk_build_groups(hw);
         if (err) {
                 dev_err(&pdev->dev, "Failed to build groups\n");
-                return 0;
+                return err;
         }
 
         /* Setup functions descriptions per SoC types */
@@ -1713,17 +1723,25 @@ static int mtk_pinctrl_probe(struct platform_device *pdev)
                 return err;
         }
 
-        err = mtk_build_gpiochip(hw, pdev->dev.of_node);
-        if (err) {
-                dev_err(&pdev->dev, "Failed to add gpio_chip\n");
+        /* For able to make pinctrl_claim_hogs, we must not enable pinctrl
+         * until all groups and functions are being added one.
+         */
+        err = pinctrl_enable(hw->pctrl);
+        if (err)
                 return err;
-        }
 
         err = mtk_build_eint(hw, pdev);
         if (err)
                 dev_warn(&pdev->dev,
                          "Failed to add EINT, but pinctrl still can work\n");
 
+        /* Build gpiochip should be after pinctrl_enable is done */
+        err = mtk_build_gpiochip(hw, pdev->dev.of_node);
+        if (err) {
+                dev_err(&pdev->dev, "Failed to add gpio_chip\n");
+                return err;
+        }
+
         platform_set_drvdata(pdev, hw);
 
         return 0;
diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c
index a1d7156d0a43..6a1b6058b991 100644
--- a/drivers/pinctrl/pinctrl-ingenic.c
+++ b/drivers/pinctrl/pinctrl-ingenic.c
@@ -536,7 +536,7 @@ static int ingenic_pinmux_gpio_set_direction(struct pinctrl_dev *pctldev,
                 ingenic_config_pin(jzpc, pin, JZ4770_GPIO_PAT1, input);
         } else {
                 ingenic_config_pin(jzpc, pin, JZ4740_GPIO_SELECT, false);
-                ingenic_config_pin(jzpc, pin, JZ4740_GPIO_DIR, input);
+                ingenic_config_pin(jzpc, pin, JZ4740_GPIO_DIR, !input);
                 ingenic_config_pin(jzpc, pin, JZ4740_GPIO_FUNC, false);
         }
 
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77970.c b/drivers/pinctrl/sh-pfc/pfc-r8a77970.c
index b02caf316711..eeb58b3bbc9a 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a77970.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a77970.c
@@ -21,15 +21,13 @@
 #include "core.h"
 #include "sh_pfc.h"
 
-#define CFG_FLAGS SH_PFC_PIN_CFG_DRIVE_STRENGTH
-
 #define CPU_ALL_PORT(fn, sfx)                                           \
-        PORT_GP_CFG_22(0, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
-        PORT_GP_CFG_28(1, fn, sfx, CFG_FLAGS),                          \
-        PORT_GP_CFG_17(2, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
-        PORT_GP_CFG_17(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
-        PORT_GP_CFG_6(4,  fn, sfx, CFG_FLAGS),                          \
-        PORT_GP_CFG_15(5, fn, sfx, CFG_FLAGS)
+        PORT_GP_CFG_22(0, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE),          \
+        PORT_GP_28(1, fn, sfx),                                         \
+        PORT_GP_CFG_17(2, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE),          \
+        PORT_GP_CFG_17(3, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE),          \
+        PORT_GP_6(4,  fn, sfx),                                         \
+        PORT_GP_15(5, fn, sfx)
 /*
  * F_() : just information
  * FM() : macro for FN_xxx / xxx_MARK
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index f1fa8612db40..06978c14c83b 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -2185,7 +2185,7 @@ static int __init dell_init(void)
                 dell_fill_request(&buffer, token->location, 0, 0, 0);
                 ret = dell_send_request(&buffer,
                                         CLASS_TOKEN_READ, SELECT_TOKEN_AC);
-                if (ret)
+                if (ret == 0)
                         max_intensity = buffer.output[3];
         }
 
diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c
index 547dbdac9d54..01b0e2bb3319 100644
--- a/drivers/ptp/ptp_chardev.c
+++ b/drivers/ptp/ptp_chardev.c
@@ -89,6 +89,7 @@ int ptp_set_pinfunc(struct ptp_clock *ptp, unsigned int pin,
         case PTP_PF_PHYSYNC:
                 if (chan != 0)
                         return -EINVAL;
+                break;
         default:
                 return -EINVAL;
         }
diff --git a/drivers/scsi/cxlflash/main.h b/drivers/scsi/cxlflash/main.h
index 2a3977823812..a39be94d110c 100644
--- a/drivers/scsi/cxlflash/main.h
+++ b/drivers/scsi/cxlflash/main.h
@@ -107,12 +107,12 @@ cxlflash_assign_ops(struct dev_dependent_vals *ddv)
 {
         const struct cxlflash_backend_ops *ops = NULL;
 
-#ifdef CONFIG_OCXL
+#ifdef CONFIG_OCXL_BASE
         if (ddv->flags & CXLFLASH_OCXL_DEV)
                 ops = &cxlflash_ocxl_ops;
 #endif
 
-#ifdef CONFIG_CXL
+#ifdef CONFIG_CXL_BASE
         if (!(ddv->flags & CXLFLASH_OCXL_DEV))
                 ops = &cxlflash_cxl_ops;
 #endif
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 15c7f3b6f35e..58bb70b886d7 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3440,11 +3440,11 @@ static void hpsa_get_enclosure_info(struct ctlr_info *h,
         struct ext_report_lun_entry *rle = &rlep->LUN[rle_index];
         u16 bmic_device_index = 0;
 
-        bmic_device_index = GET_BMIC_DRIVE_NUMBER(&rle->lunid[0]);
-
-        encl_dev->sas_address =
+        encl_dev->eli =
                 hpsa_get_enclosure_logical_identifier(h, scsi3addr);
 
+        bmic_device_index = GET_BMIC_DRIVE_NUMBER(&rle->lunid[0]);
+
         if (encl_dev->target == -1 || encl_dev->lun == -1) {
                 rc = IO_OK;
                 goto out;
@@ -9697,7 +9697,24 @@ hpsa_sas_get_linkerrors(struct sas_phy *phy)
 static int
 hpsa_sas_get_enclosure_identifier(struct sas_rphy *rphy, u64 *identifier)
 {
-        *identifier = rphy->identify.sas_address;
+        struct Scsi_Host *shost = phy_to_shost(rphy);
+        struct ctlr_info *h;
+        struct hpsa_scsi_dev_t *sd;
+
+        if (!shost)
+                return -ENXIO;
+
+        h = shost_to_hba(shost);
+
+        if (!h)
+                return -ENXIO;
+
+        sd = hpsa_find_device_by_sas_rphy(h, rphy);
+        if (!sd)
+                return -ENXIO;
+
+        *identifier = sd->eli;
+
         return 0;
 }
 
diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
index fb9f5e7f8209..59e023696fff 100644
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
@@ -68,6 +68,7 @@ struct hpsa_scsi_dev_t {
 #define RAID_CTLR_LUNID "\0\0\0\0\0\0\0\0"
         unsigned char device_id[16];    /* from inquiry pg. 0x83 */
         u64 sas_address;
+        u64 eli;                        /* from report diags. */
         unsigned char vendor[8];        /* bytes 8-15 of inquiry data */
         unsigned char model[16];        /* bytes 16-31 of inquiry data */
         unsigned char rev;              /* byte 2 of inquiry data */
diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
index 90394cef0f41..0a5dd5595dd3 100644
--- a/drivers/scsi/qedf/qedf_main.c
+++ b/drivers/scsi/qedf/qedf_main.c
@@ -3295,6 +3295,11 @@ static int __qedf_probe(struct pci_dev *pdev, int mode)
 
         init_completion(&qedf->flogi_compl);
 
+        status = qed_ops->common->update_drv_state(qedf->cdev, true);
+        if (status)
+                QEDF_ERR(&(qedf->dbg_ctx),
+                        "Failed to send drv state to MFW.\n");
+
         memset(&link_params, 0, sizeof(struct qed_link_params));
         link_params.link_up = true;
         status = qed_ops->common->set_link(qedf->cdev, &link_params);
@@ -3343,6 +3348,7 @@ static int qedf_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 static void __qedf_remove(struct pci_dev *pdev, int mode)
 {
         struct qedf_ctx *qedf;
+        int rc;
 
         if (!pdev) {
                 QEDF_ERR(NULL, "pdev is NULL.\n");
@@ -3437,6 +3443,12 @@ static void __qedf_remove(struct pci_dev *pdev, int mode)
                 qed_ops->common->set_power_state(qedf->cdev, PCI_D0);
                 pci_set_drvdata(pdev, NULL);
         }
+
+        rc = qed_ops->common->update_drv_state(qedf->cdev, false);
+        if (rc)
+                QEDF_ERR(&(qedf->dbg_ctx),
+                        "Failed to send drv state to MFW.\n");
+
         qed_ops->common->slowpath_stop(qedf->cdev);
         qed_ops->common->remove(qedf->cdev);
 
diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c
index cf274a79e77a..091ec1207bea 100644
--- a/drivers/scsi/qedi/qedi_main.c
+++ b/drivers/scsi/qedi/qedi_main.c
@@ -2273,6 +2273,7 @@ kset_free:
 static void __qedi_remove(struct pci_dev *pdev, int mode)
 {
         struct qedi_ctx *qedi = pci_get_drvdata(pdev);
+        int rval;
 
         if (qedi->tmf_thread) {
                 flush_workqueue(qedi->tmf_thread);
@@ -2302,6 +2303,10 @@ static void __qedi_remove(struct pci_dev *pdev, int mode)
         if (mode == QEDI_MODE_NORMAL)
                 qedi_free_iscsi_pf_param(qedi);
 
+        rval = qedi_ops->common->update_drv_state(qedi->cdev, false);
+        if (rval)
+                QEDI_ERR(&qedi->dbg_ctx, "Failed to send drv state to MFW\n");
+
         if (!test_bit(QEDI_IN_OFFLINE, &qedi->flags)) {
                 qedi_ops->common->slowpath_stop(qedi->cdev);
                 qedi_ops->common->remove(qedi->cdev);
@@ -2576,6 +2581,12 @@ static int __qedi_probe(struct pci_dev *pdev, int mode)
                 if (qedi_setup_boot_info(qedi))
                         QEDI_ERR(&qedi->dbg_ctx,
                                  "No iSCSI boot target configured\n");
+
+                rc = qedi_ops->common->update_drv_state(qedi->cdev, true);
+                if (rc)
+                        QEDI_ERR(&qedi->dbg_ctx,
+                                 "Failed to send drv state to MFW\n");
+
         }
 
         return 0;
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 9442e18aef6f..0f94b1d62d3f 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -361,6 +361,8 @@ struct ct_arg {
         dma_addr_t      rsp_dma;
         u32             req_size;
         u32             rsp_size;
+        u32             req_allocated_size;
+        u32             rsp_allocated_size;
         void            *req;
         void            *rsp;
         port_id_t       id;
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 4bc2b66b299f..2c35b0b2baa0 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -556,7 +556,7 @@ err2:
                 /* please ignore kernel warning. otherwise, we have mem leak. */
                 if (sp->u.iocb_cmd.u.ctarg.req) {
                         dma_free_coherent(&vha->hw->pdev->dev,
-                            sizeof(struct ct_sns_pkt),
+                            sp->u.iocb_cmd.u.ctarg.req_allocated_size,
                             sp->u.iocb_cmd.u.ctarg.req,
                             sp->u.iocb_cmd.u.ctarg.req_dma);
                         sp->u.iocb_cmd.u.ctarg.req = NULL;
@@ -564,7 +564,7 @@ err2:
 
                 if (sp->u.iocb_cmd.u.ctarg.rsp) {
                         dma_free_coherent(&vha->hw->pdev->dev,
-                            sizeof(struct ct_sns_pkt),
+                            sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
                             sp->u.iocb_cmd.u.ctarg.rsp,
                             sp->u.iocb_cmd.u.ctarg.rsp_dma);
                         sp->u.iocb_cmd.u.ctarg.rsp = NULL;
@@ -617,6 +617,7 @@ static int qla_async_rftid(scsi_qla_host_t *vha, port_id_t *d_id)
         sp->u.iocb_cmd.u.ctarg.req = dma_alloc_coherent(&vha->hw->pdev->dev,
             sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.req_dma,
             GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.req_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.req) {
                 ql_log(ql_log_warn, vha, 0xd041,
                     "%s: Failed to allocate ct_sns request.\n",
@@ -627,6 +628,7 @@ static int qla_async_rftid(scsi_qla_host_t *vha, port_id_t *d_id)
         sp->u.iocb_cmd.u.ctarg.rsp = dma_alloc_coherent(&vha->hw->pdev->dev,
             sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.rsp_dma,
             GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.rsp_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.rsp) {
                 ql_log(ql_log_warn, vha, 0xd042,
                     "%s: Failed to allocate ct_sns request.\n",
@@ -712,6 +714,7 @@ static int qla_async_rffid(scsi_qla_host_t *vha, port_id_t *d_id,
         sp->u.iocb_cmd.u.ctarg.req = dma_alloc_coherent(&vha->hw->pdev->dev,
             sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.req_dma,
             GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.req_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.req) {
                 ql_log(ql_log_warn, vha, 0xd041,
                     "%s: Failed to allocate ct_sns request.\n",
@@ -722,6 +725,7 @@ static int qla_async_rffid(scsi_qla_host_t *vha, port_id_t *d_id,
         sp->u.iocb_cmd.u.ctarg.rsp = dma_alloc_coherent(&vha->hw->pdev->dev,
             sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.rsp_dma,
             GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.rsp_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.rsp) {
                 ql_log(ql_log_warn, vha, 0xd042,
                     "%s: Failed to allocate ct_sns request.\n",
@@ -802,6 +806,7 @@ static int qla_async_rnnid(scsi_qla_host_t *vha, port_id_t *d_id,
         sp->u.iocb_cmd.u.ctarg.req = dma_alloc_coherent(&vha->hw->pdev->dev,
             sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.req_dma,
             GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.req_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.req) {
                 ql_log(ql_log_warn, vha, 0xd041,
                     "%s: Failed to allocate ct_sns request.\n",
@@ -812,6 +817,7 @@ static int qla_async_rnnid(scsi_qla_host_t *vha, port_id_t *d_id,
         sp->u.iocb_cmd.u.ctarg.rsp = dma_alloc_coherent(&vha->hw->pdev->dev,
             sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.rsp_dma,
             GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.rsp_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.rsp) {
                 ql_log(ql_log_warn, vha, 0xd042,
                     "%s: Failed to allocate ct_sns request.\n",
@@ -909,6 +915,7 @@ static int qla_async_rsnn_nn(scsi_qla_host_t *vha)
         sp->u.iocb_cmd.u.ctarg.req = dma_alloc_coherent(&vha->hw->pdev->dev,
             sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.req_dma,
             GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.req_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.req) {
                 ql_log(ql_log_warn, vha, 0xd041,
                     "%s: Failed to allocate ct_sns request.\n",
@@ -919,6 +926,7 @@ static int qla_async_rsnn_nn(scsi_qla_host_t *vha)
         sp->u.iocb_cmd.u.ctarg.rsp = dma_alloc_coherent(&vha->hw->pdev->dev,
             sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.rsp_dma,
             GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.rsp_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.rsp) {
                 ql_log(ql_log_warn, vha, 0xd042,
                     "%s: Failed to allocate ct_sns request.\n",
@@ -3388,14 +3396,14 @@ void qla24xx_sp_unmap(scsi_qla_host_t *vha, srb_t *sp)
 {
         if (sp->u.iocb_cmd.u.ctarg.req) {
                 dma_free_coherent(&vha->hw->pdev->dev,
-                        sizeof(struct ct_sns_pkt),
+                        sp->u.iocb_cmd.u.ctarg.req_allocated_size,
                         sp->u.iocb_cmd.u.ctarg.req,
                         sp->u.iocb_cmd.u.ctarg.req_dma);
                 sp->u.iocb_cmd.u.ctarg.req = NULL;
         }
         if (sp->u.iocb_cmd.u.ctarg.rsp) {
                 dma_free_coherent(&vha->hw->pdev->dev,
-                        sizeof(struct ct_sns_pkt),
+                        sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
                         sp->u.iocb_cmd.u.ctarg.rsp,
                         sp->u.iocb_cmd.u.ctarg.rsp_dma);
                 sp->u.iocb_cmd.u.ctarg.rsp = NULL;
@@ -3596,14 +3604,14 @@ static void qla2x00_async_gpnid_sp_done(void *s, int res)
                 /* please ignore kernel warning. otherwise, we have mem leak. */
                 if (sp->u.iocb_cmd.u.ctarg.req) {
                         dma_free_coherent(&vha->hw->pdev->dev,
-                                sizeof(struct ct_sns_pkt),
+                                sp->u.iocb_cmd.u.ctarg.req_allocated_size,
                                 sp->u.iocb_cmd.u.ctarg.req,
                                 sp->u.iocb_cmd.u.ctarg.req_dma);
                         sp->u.iocb_cmd.u.ctarg.req = NULL;
                 }
                 if (sp->u.iocb_cmd.u.ctarg.rsp) {
                         dma_free_coherent(&vha->hw->pdev->dev,
-                                sizeof(struct ct_sns_pkt),
+                                sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
                                 sp->u.iocb_cmd.u.ctarg.rsp,
                                 sp->u.iocb_cmd.u.ctarg.rsp_dma);
                         sp->u.iocb_cmd.u.ctarg.rsp = NULL;
@@ -3654,6 +3662,7 @@ int qla24xx_async_gpnid(scsi_qla_host_t *vha, port_id_t *id)
         sp->u.iocb_cmd.u.ctarg.req = dma_alloc_coherent(&vha->hw->pdev->dev,
                 sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.req_dma,
                 GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.req_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.req) {
                 ql_log(ql_log_warn, vha, 0xd041,
                     "Failed to allocate ct_sns request.\n");
@@ -3663,6 +3672,7 @@ int qla24xx_async_gpnid(scsi_qla_host_t *vha, port_id_t *id)
         sp->u.iocb_cmd.u.ctarg.rsp = dma_alloc_coherent(&vha->hw->pdev->dev,
                 sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.rsp_dma,
                 GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.rsp_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.rsp) {
                 ql_log(ql_log_warn, vha, 0xd042,
                     "Failed to allocate ct_sns request.\n");
@@ -4142,14 +4152,14 @@ static void qla2x00_async_gpnft_gnnft_sp_done(void *s, int res)
                          */
                         if (sp->u.iocb_cmd.u.ctarg.req) {
                                 dma_free_coherent(&vha->hw->pdev->dev,
-                                    sizeof(struct ct_sns_pkt),
+                                    sp->u.iocb_cmd.u.ctarg.req_allocated_size,
                                     sp->u.iocb_cmd.u.ctarg.req,
                                     sp->u.iocb_cmd.u.ctarg.req_dma);
                                 sp->u.iocb_cmd.u.ctarg.req = NULL;
                         }
                         if (sp->u.iocb_cmd.u.ctarg.rsp) {
                                 dma_free_coherent(&vha->hw->pdev->dev,
-                                    sizeof(struct ct_sns_pkt),
+                                    sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
                                     sp->u.iocb_cmd.u.ctarg.rsp,
                                     sp->u.iocb_cmd.u.ctarg.rsp_dma);
                                 sp->u.iocb_cmd.u.ctarg.rsp = NULL;
@@ -4179,14 +4189,14 @@ static void qla2x00_async_gpnft_gnnft_sp_done(void *s, int res)
                 /* please ignore kernel warning. Otherwise, we have mem leak. */
                 if (sp->u.iocb_cmd.u.ctarg.req) {
                         dma_free_coherent(&vha->hw->pdev->dev,
-                            sizeof(struct ct_sns_pkt),
+                            sp->u.iocb_cmd.u.ctarg.req_allocated_size,
                             sp->u.iocb_cmd.u.ctarg.req,
                             sp->u.iocb_cmd.u.ctarg.req_dma);
                         sp->u.iocb_cmd.u.ctarg.req = NULL;
                 }
                 if (sp->u.iocb_cmd.u.ctarg.rsp) {
                         dma_free_coherent(&vha->hw->pdev->dev,
-                            sizeof(struct ct_sns_pkt),
+                            sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
                             sp->u.iocb_cmd.u.ctarg.rsp,
                             sp->u.iocb_cmd.u.ctarg.rsp_dma);
                         sp->u.iocb_cmd.u.ctarg.rsp = NULL;
@@ -4281,14 +4291,14 @@ static int qla24xx_async_gnnft(scsi_qla_host_t *vha, struct srb *sp,
 done_free_sp:
         if (sp->u.iocb_cmd.u.ctarg.req) {
                 dma_free_coherent(&vha->hw->pdev->dev,
-                    sizeof(struct ct_sns_pkt),
+                    sp->u.iocb_cmd.u.ctarg.req_allocated_size,
                     sp->u.iocb_cmd.u.ctarg.req,
                     sp->u.iocb_cmd.u.ctarg.req_dma);
                 sp->u.iocb_cmd.u.ctarg.req = NULL;
         }
         if (sp->u.iocb_cmd.u.ctarg.rsp) {
                 dma_free_coherent(&vha->hw->pdev->dev,
-                    sizeof(struct ct_sns_pkt),
+                    sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
                     sp->u.iocb_cmd.u.ctarg.rsp,
                     sp->u.iocb_cmd.u.ctarg.rsp_dma);
                 sp->u.iocb_cmd.u.ctarg.rsp = NULL;
@@ -4349,6 +4359,7 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp)
                 sp->u.iocb_cmd.u.ctarg.req = dma_zalloc_coherent(
                         &vha->hw->pdev->dev, sizeof(struct ct_sns_pkt),
                         &sp->u.iocb_cmd.u.ctarg.req_dma, GFP_KERNEL);
+                sp->u.iocb_cmd.u.ctarg.req_allocated_size = sizeof(struct ct_sns_pkt);
                 if (!sp->u.iocb_cmd.u.ctarg.req) {
                         ql_log(ql_log_warn, vha, 0xffff,
                             "Failed to allocate ct_sns request.\n");
@@ -4366,6 +4377,7 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp)
                 sp->u.iocb_cmd.u.ctarg.rsp = dma_zalloc_coherent(
                         &vha->hw->pdev->dev, rspsz,
                         &sp->u.iocb_cmd.u.ctarg.rsp_dma, GFP_KERNEL);
+                sp->u.iocb_cmd.u.ctarg.rsp_allocated_size = sizeof(struct ct_sns_pkt);
                 if (!sp->u.iocb_cmd.u.ctarg.rsp) {
                         ql_log(ql_log_warn, vha, 0xffff,
                             "Failed to allocate ct_sns request.\n");
@@ -4425,14 +4437,14 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp)
 done_free_sp:
         if (sp->u.iocb_cmd.u.ctarg.req) {
                 dma_free_coherent(&vha->hw->pdev->dev,
-                    sizeof(struct ct_sns_pkt),
+                    sp->u.iocb_cmd.u.ctarg.req_allocated_size,
                     sp->u.iocb_cmd.u.ctarg.req,
                     sp->u.iocb_cmd.u.ctarg.req_dma);
                 sp->u.iocb_cmd.u.ctarg.req = NULL;
         }
         if (sp->u.iocb_cmd.u.ctarg.rsp) {
                 dma_free_coherent(&vha->hw->pdev->dev,
-                    sizeof(struct ct_sns_pkt),
+                    sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
                     sp->u.iocb_cmd.u.ctarg.rsp,
                     sp->u.iocb_cmd.u.ctarg.rsp_dma);
                 sp->u.iocb_cmd.u.ctarg.rsp = NULL;
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 7b675243bd16..db0e3279e07a 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -591,12 +591,14 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha,
                                 conflict_fcport =
                                         qla2x00_find_fcport_by_wwpn(vha,
                                             e->port_name, 0);
-                                ql_dbg(ql_dbg_disc, vha, 0x20e6,
-                                    "%s %d %8phC post del sess\n",
-                                    __func__, __LINE__,
-                                    conflict_fcport->port_name);
-                                qlt_schedule_sess_for_deletion
-                                        (conflict_fcport);
+                                if (conflict_fcport) {
+                                        qlt_schedule_sess_for_deletion
+                                                (conflict_fcport);
+                                        ql_dbg(ql_dbg_disc, vha, 0x20e6,
+                                            "%s %d %8phC post del sess\n",
+                                            __func__, __LINE__,
+                                            conflict_fcport->port_name);
+                                }
                         }
 
                         /* FW already picked this loop id for another fcport */
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index e881fce7477a..9f309e572be4 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3180,6 +3180,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
             "req->req_q_in=%p req->req_q_out=%p rsp->rsp_q_in=%p rsp->rsp_q_out=%p.\n",
             req->req_q_in, req->req_q_out, rsp->rsp_q_in, rsp->rsp_q_out);
 
+        ha->wq = alloc_workqueue("qla2xxx_wq", 0, 0);
+
         if (ha->isp_ops->initialize_adapter(base_vha)) {
                 ql_log(ql_log_fatal, base_vha, 0x00d6,
                     "Failed to initialize adapter - Adapter flags %x.\n",
@@ -3216,8 +3218,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
             host->can_queue, base_vha->req,
             base_vha->mgmt_svr_loop_id, host->sg_tablesize);
 
-        ha->wq = alloc_workqueue("qla2xxx_wq", 0, 0);
-
         if (ha->mqenable) {
                 bool mq = false;
                 bool startit = false;
diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c
index a14fef11776e..2bf3bf73886e 100644
--- a/drivers/scsi/sd_zbc.c
+++ b/drivers/scsi/sd_zbc.c
@@ -391,7 +391,8 @@ static int sd_zbc_check_capacity(struct scsi_disk *sdkp, unsigned char *buf)
  * Check that all zones of the device are equal. The last zone can however
  * be smaller. The zone size must also be a power of two number of LBAs.
  *
- * Returns the zone size in bytes upon success or an error code upon failure.
+ * Returns the zone size in number of blocks upon success or an error code
+ * upon failure.
  */
 static s64 sd_zbc_check_zone_size(struct scsi_disk *sdkp)
 {
@@ -401,7 +402,7 @@ static s64 sd_zbc_check_zone_size(struct scsi_disk *sdkp)
         unsigned char *rec;
         unsigned int buf_len;
         unsigned int list_length;
-        int ret;
+        s64 ret;
         u8 same;
 
         /* Get a buffer */
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index b423a309a6e0..125b58eff936 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -28,6 +28,7 @@
 #include <linux/uaccess.h>
 #include <linux/vfio.h>
 #include <linux/vgaarb.h>
+#include <linux/nospec.h>
 
 #include "vfio_pci_private.h"
 
@@ -727,6 +728,9 @@ static long vfio_pci_ioctl(void *device_data,
                         if (info.index >=
                             VFIO_PCI_NUM_REGIONS + vdev->num_regions)
                                 return -EINVAL;
+                        info.index = array_index_nospec(info.index,
+                                                        VFIO_PCI_NUM_REGIONS +
+                                                        vdev->num_regions);
 
                         i = info.index - VFIO_PCI_NUM_REGIONS;
 
diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c
index 759a5bdd40e1..7cd63b0c1a46 100644
--- a/drivers/vfio/vfio_iommu_spapr_tce.c
+++ b/drivers/vfio/vfio_iommu_spapr_tce.c
@@ -457,17 +457,17 @@ static void tce_iommu_unuse_page(struct tce_container *container,
 }
 
 static int tce_iommu_prereg_ua_to_hpa(struct tce_container *container,
-                unsigned long tce, unsigned long size,
+                unsigned long tce, unsigned long shift,
                 unsigned long *phpa, struct mm_iommu_table_group_mem_t **pmem)
 {
         long ret = 0;
         struct mm_iommu_table_group_mem_t *mem;
 
-        mem = mm_iommu_lookup(container->mm, tce, size);
+        mem = mm_iommu_lookup(container->mm, tce, 1ULL << shift);
         if (!mem)
                 return -EINVAL;
 
-        ret = mm_iommu_ua_to_hpa(mem, tce, phpa);
+        ret = mm_iommu_ua_to_hpa(mem, tce, shift, phpa);
         if (ret)
                 return -EINVAL;
 
@@ -487,7 +487,7 @@ static void tce_iommu_unuse_page_v2(struct tce_container *container,
         if (!pua)
                 return;
 
-        ret = tce_iommu_prereg_ua_to_hpa(container, *pua, IOMMU_PAGE_SIZE(tbl),
+        ret = tce_iommu_prereg_ua_to_hpa(container, *pua, tbl->it_page_shift,
                         &hpa, &mem);
         if (ret)
                 pr_debug("%s: tce %lx at #%lx was not cached, ret=%d\n",
@@ -611,7 +611,7 @@ static long tce_iommu_build_v2(struct tce_container *container,
                                 entry + i);
 
                 ret = tce_iommu_prereg_ua_to_hpa(container,
-                                tce, IOMMU_PAGE_SIZE(tbl), &hpa, &mem);
+                                tce, tbl->it_page_shift, &hpa, &mem);
                 if (ret)
                         break;
 
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index e55843f536bc..b3e45714d28f 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -4238,8 +4238,9 @@ int try_release_extent_mapping(struct page *page, gfp_t mask)
         struct extent_map *em;
         u64 start = page_offset(page);
         u64 end = start + PAGE_SIZE - 1;
-        struct extent_io_tree *tree = &BTRFS_I(page->mapping->host)->io_tree;
-        struct extent_map_tree *map = &BTRFS_I(page->mapping->host)->extent_tree;
+        struct btrfs_inode *btrfs_inode = BTRFS_I(page->mapping->host);
+        struct extent_io_tree *tree = &btrfs_inode->io_tree;
+        struct extent_map_tree *map = &btrfs_inode->extent_tree;
 
         if (gfpflags_allow_blocking(mask) &&
             page->mapping->host->i_size > SZ_16M) {
@@ -4262,6 +4263,8 @@ int try_release_extent_mapping(struct page *page, gfp_t mask)
                                             extent_map_end(em) - 1,
                                             EXTENT_LOCKED | EXTENT_WRITEBACK,
                                             0, NULL)) {
+                                set_bit(BTRFS_INODE_NEEDS_FULL_SYNC,
+                                        &btrfs_inode->runtime_flags);
                                 remove_extent_mapping(map, em);
                                 /* once for the rb tree */
                                 free_extent_map(em);
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 43ecbe620dea..b077544b5232 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -3327,11 +3327,13 @@ static void btrfs_cmp_data_free(struct cmp_pages *cmp)
                 if (pg) {
                         unlock_page(pg);
                         put_page(pg);
+                        cmp->src_pages[i] = NULL;
                 }
                 pg = cmp->dst_pages[i];
                 if (pg) {
                         unlock_page(pg);
                         put_page(pg);
+                        cmp->dst_pages[i] = NULL;
                 }
         }
 }
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 572306036477..6702896cdb8f 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -1151,11 +1151,6 @@ static int scrub_handle_errored_block(struct scrub_block *sblock_to_check)
                 return ret;
         }
 
-        if (sctx->is_dev_replace && !is_metadata && !have_csum) {
-                sblocks_for_recheck = NULL;
-                goto nodatasum_case;
-        }
-
         /*
          * read all mirrors one after the other. This includes to
          * re-read the extent or metadata block that failed (that was
@@ -1268,13 +1263,19 @@ static int scrub_handle_errored_block(struct scrub_block *sblock_to_check)
                 goto out;
         }
 
-        if (!is_metadata && !have_csum) {
+        /*
+         * NOTE: Even for nodatasum case, it's still possible that it's a
+         * compressed data extent, thus scrub_fixup_nodatasum(), which write
+         * inode page cache onto disk, could cause serious data corruption.
+         *
+         * So here we could only read from disk, and hope our recovery could
+         * reach disk before the newer write.
+         */
+        if (0 && !is_metadata && !have_csum) {
                 struct scrub_fixup_nodatasum *fixup_nodatasum;
 
                 WARN_ON(sctx->is_dev_replace);
 
-nodatasum_case:
-
                 /*
                  * !is_metadata and !have_csum, this means that the data
                  * might not be COWed, that it might be modified
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index e034ad9e23b4..1da162928d1a 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1146,6 +1146,7 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices,
 {
         int ret;
 
+        mutex_lock(&uuid_mutex);
         mutex_lock(&fs_devices->device_list_mutex);
         if (fs_devices->opened) {
                 fs_devices->opened++;
@@ -1155,6 +1156,7 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices,
                 ret = open_fs_devices(fs_devices, flags, holder);
         }
         mutex_unlock(&fs_devices->device_list_mutex);
+        mutex_unlock(&uuid_mutex);
 
         return ret;
 }
diff --git a/fs/exec.c b/fs/exec.c
index 2d4e0075bd24..72e961a62adb 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -290,7 +290,7 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
         struct vm_area_struct *vma = NULL;
         struct mm_struct *mm = bprm->mm;
 
-        bprm->vma = vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
+        bprm->vma = vma = vm_area_alloc(mm);
         if (!vma)
                 return -ENOMEM;
 
@@ -298,7 +298,6 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
                 err = -EINTR;
                 goto err_free;
         }
-        vma->vm_mm = mm;
 
         /*
          * Place the stack at the largest stack address the architecture
@@ -311,7 +310,6 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
         vma->vm_start = vma->vm_end - PAGE_SIZE;
         vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
         vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
-        INIT_LIST_HEAD(&vma->anon_vma_chain);
 
         err = insert_vm_struct(mm, vma);
         if (err)
@@ -326,7 +324,7 @@ err:
         up_write(&mm->mmap_sem);
 err_free:
         bprm->vma = NULL;
-        kmem_cache_free(vm_area_cachep, vma);
+        vm_area_free(vma);
         return err;
 }
 
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 065dc919a0ce..bfd589ea74c0 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -707,13 +707,21 @@ static void fat_set_state(struct super_block *sb,
         brelse(bh);
 }
 
+static void fat_reset_iocharset(struct fat_mount_options *opts)
+{
+        if (opts->iocharset != fat_default_iocharset) {
+                /* Note: opts->iocharset can be NULL here */
+                kfree(opts->iocharset);
+                opts->iocharset = fat_default_iocharset;
+        }
+}
+
 static void delayed_free(struct rcu_head *p)
 {
         struct msdos_sb_info *sbi = container_of(p, struct msdos_sb_info, rcu);
         unload_nls(sbi->nls_disk);
         unload_nls(sbi->nls_io);
-        if (sbi->options.iocharset != fat_default_iocharset)
-                kfree(sbi->options.iocharset);
+        fat_reset_iocharset(&sbi->options);
         kfree(sbi);
 }
 
@@ -1132,7 +1140,7 @@ static int parse_options(struct super_block *sb, char *options, int is_vfat,
         opts->fs_fmask = opts->fs_dmask = current_umask();
         opts->allow_utime = -1;
         opts->codepage = fat_default_codepage;
-        opts->iocharset = fat_default_iocharset;
+        fat_reset_iocharset(opts);
         if (is_vfat) {
                 opts->shortname = VFAT_SFN_DISPLAY_WINNT|VFAT_SFN_CREATE_WIN95;
                 opts->rodir = 0;
@@ -1289,8 +1297,7 @@ static int parse_options(struct super_block *sb, char *options, int is_vfat,
 
                 /* vfat specific */
                 case Opt_charset:
-                        if (opts->iocharset != fat_default_iocharset)
-                                kfree(opts->iocharset);
+                        fat_reset_iocharset(opts);
                         iocharset = match_strdup(&args[0]);
                         if (!iocharset)
                                 return -ENOMEM;
@@ -1881,8 +1888,7 @@ out_fail:
                 iput(fat_inode);
         unload_nls(sbi->nls_io);
         unload_nls(sbi->nls_disk);
-        if (sbi->options.iocharset != fat_default_iocharset)
-                kfree(sbi->options.iocharset);
+        fat_reset_iocharset(&sbi->options);
         sb->s_fs_info = NULL;
         kfree(sbi);
         return error;
diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h
index 79795c5fa7c3..d50c2f0a655a 100644
--- a/include/linux/bpf-cgroup.h
+++ b/include/linux/bpf-cgroup.h
@@ -2,6 +2,7 @@
 #ifndef _BPF_CGROUP_H
 #define _BPF_CGROUP_H
 
+#include <linux/errno.h>
 #include <linux/jump_label.h>
 #include <uapi/linux/bpf.h>
 
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 300baad62c88..c73dd7396886 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -765,8 +765,8 @@ static inline bool bpf_dump_raw_ok(void)
 struct bpf_prog *bpf_patch_insn_single(struct bpf_prog *prog, u32 off,
                                        const struct bpf_insn *patch, u32 len);
 
-static inline int __xdp_generic_ok_fwd_dev(struct sk_buff *skb,
-                                           struct net_device *fwd)
+static inline int xdp_ok_fwd_dev(const struct net_device *fwd,
+                                 unsigned int pktlen)
 {
         unsigned int len;
 
@@ -774,7 +774,7 @@ static inline int __xdp_generic_ok_fwd_dev(struct sk_buff *skb,
                 return -ENETDOWN;
 
         len = fwd->mtu + fwd->hard_header_len + VLAN_HLEN;
-        if (skb->len > len)
+        if (pktlen > len)
                 return -EMSGSIZE;
 
         return 0;
diff --git a/include/linux/fsl/guts.h b/include/linux/fsl/guts.h
index 3efa3b861d44..941b11811f85 100644
--- a/include/linux/fsl/guts.h
+++ b/include/linux/fsl/guts.h
@@ -16,6 +16,7 @@
 #define __FSL_GUTS_H__
 
 #include <linux/types.h>
+#include <linux/io.h>
 
 /**
  * Global Utility Registers.
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index 7843b98e1c6e..c20c7e197d07 100644
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -105,13 +105,13 @@ static inline bool br_vlan_enabled(const struct net_device *dev)
 
 static inline int br_vlan_get_pvid(const struct net_device *dev, u16 *p_pvid)
 {
-        return -1;
+        return -EINVAL;
 }
 
 static inline int br_vlan_get_info(const struct net_device *dev, u16 vid,
                                    struct bridge_vlan_info *p_vinfo)
 {
-        return -1;
+        return -EINVAL;
 }
 #endif
 
diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index f8231854b5d6..119f53941c12 100644
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -109,6 +109,8 @@ struct ip_mc_list {
 extern int ip_check_mc_rcu(struct in_device *dev, __be32 mc_addr, __be32 src_addr, u8 proto);
 extern int igmp_rcv(struct sk_buff *);
 extern int ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr);
+extern int ip_mc_join_group_ssm(struct sock *sk, struct ip_mreqn *imr,
+                                unsigned int mode);
 extern int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr);
 extern void ip_mc_drop_socket(struct sock *sk);
 extern int ip_mc_source(int add, int omode, struct sock *sk,
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 1df940196ab2..ef169d67df92 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -121,6 +121,7 @@
 #define ecap_srs(e)             ((e >> 31) & 0x1)
 #define ecap_ers(e)             ((e >> 30) & 0x1)
 #define ecap_prs(e)             ((e >> 29) & 0x1)
+#define ecap_broken_pasid(e)    ((e >> 28) & 0x1)
 #define ecap_dis(e)             ((e >> 27) & 0x1)
 #define ecap_nest(e)            ((e >> 26) & 0x1)
 #define ecap_mts(e)             ((e >> 25) & 0x1)
diff --git a/include/linux/marvell_phy.h b/include/linux/marvell_phy.h
index 4f5f8c21e283..1eb6f244588d 100644
--- a/include/linux/marvell_phy.h
+++ b/include/linux/marvell_phy.h
@@ -27,6 +27,8 @@
  */
 #define MARVELL_PHY_ID_88E6390          0x01410f90
 
+#define MARVELL_PHY_FAMILY_ID(id)       ((id) >> 4)
+
 /* struct phy_device dev_flags definitions */
 #define MARVELL_PHY_M1145_FLAGS_RESISTANCE      0x00000001
 #define MARVELL_PHY_M1118_DNS323_LEDS           0x00000002
diff --git a/include/linux/mm.h b/include/linux/mm.h
index a0fbb9ffe380..d3a3842316b8 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -155,7 +155,9 @@ extern int overcommit_kbytes_handler(struct ctl_table *, int, void __user *,
  * mmap() functions).
  */
 
-extern struct kmem_cache *vm_area_cachep;
+struct vm_area_struct *vm_area_alloc(struct mm_struct *);
+struct vm_area_struct *vm_area_dup(struct vm_area_struct *);
+void vm_area_free(struct vm_area_struct *);
 
 #ifndef CONFIG_MMU
 extern struct rb_root nommu_region_tree;
@@ -2132,7 +2134,7 @@ extern int __meminit __early_pfn_to_nid(unsigned long pfn,
                                         struct mminit_pfnnid_cache *state);
 #endif
 
-#ifdef CONFIG_HAVE_MEMBLOCK
+#if defined(CONFIG_HAVE_MEMBLOCK) && !defined(CONFIG_FLAT_NODE_MEM_MAP)
 void zero_resv_unavail(void);
 #else
 static inline void zero_resv_unavail(void) {}
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 340029b2fb38..abd5d5e17aee 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1240,6 +1240,8 @@ int pci_register_io_range(struct fwnode_handle *fwnode, phys_addr_t addr,
 unsigned long pci_address_to_pio(phys_addr_t addr);
 phys_addr_t pci_pio_to_address(unsigned long pio);
 int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr);
+int devm_pci_remap_iospace(struct device *dev, const struct resource *res,
+                           phys_addr_t phys_addr);
 void pci_unmap_iospace(struct resource *res);
 void __iomem *devm_pci_remap_cfgspace(struct device *dev,
                                       resource_size_t offset,
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 164cdedf6012..610a201126ee 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -630,6 +630,7 @@ typedef unsigned char *sk_buff_data_t;
  *      @hash: the packet hash
  *      @queue_mapping: Queue mapping for multiqueue devices
  *      @xmit_more: More SKBs are pending for this queue
+ *      @pfmemalloc: skbuff was allocated from PFMEMALLOC reserves
  *      @ndisc_nodetype: router type (from link layer)
  *      @ooo_okay: allow the mapping of a socket to a queue to be changed
  *      @l4_hash: indicate hash is a canonical 4-tuple hash over transport
@@ -735,7 +736,7 @@ struct sk_buff {
                                 peeked:1,
                                 head_frag:1,
                                 xmit_more:1,
-                                __unused:1; /* one bit hole */
+                                pfmemalloc:1;
 
         /* fields enclosed in headers_start/headers_end are copied
          * using a single memcpy() in __copy_skb_header()
@@ -754,31 +755,30 @@ struct sk_buff {
 
         __u8                    __pkt_type_offset[0];
         __u8                    pkt_type:3;
-        __u8                    pfmemalloc:1;
         __u8                    ignore_df:1;
-
         __u8                    nf_trace:1;
         __u8                    ip_summed:2;
         __u8                    ooo_okay:1;
+
         __u8                    l4_hash:1;
         __u8                    sw_hash:1;
         __u8                    wifi_acked_valid:1;
         __u8                    wifi_acked:1;
-
         __u8                    no_fcs:1;
         /* Indicates the inner headers are valid in the skbuff. */
         __u8                    encapsulation:1;
         __u8                    encap_hdr_csum:1;
         __u8                    csum_valid:1;
+
         __u8                    csum_complete_sw:1;
         __u8                    csum_level:2;
         __u8                    csum_not_inet:1;
-
         __u8                    dst_pending_confirm:1;
 #ifdef CONFIG_IPV6_NDISC_NODETYPE
         __u8                    ndisc_nodetype:2;
 #endif
         __u8                    ipvs_property:1;
+
         __u8                    inner_protocol_type:1;
         __u8                    remcsum_offload:1;
 #ifdef CONFIG_NET_SWITCHDEV
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 59656fc580df..7b9c82de11cc 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -66,6 +66,12 @@ static inline bool rt6_need_strict(const struct in6_addr *daddr)
                 (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL | IPV6_ADDR_LOOPBACK);
 }
 
+static inline bool rt6_qualify_for_ecmp(const struct fib6_info *f6i)
+{
+        return (f6i->fib6_flags & (RTF_GATEWAY|RTF_ADDRCONF|RTF_DYNAMIC)) ==
+               RTF_GATEWAY;
+}
+
 void ip6_route_input(struct sk_buff *skb);
 struct dst_entry *ip6_route_input_lookup(struct net *net,
                                          struct net_device *dev,
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 16475c269749..8f73be494503 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -355,14 +355,7 @@ struct ipv6_txoptions *ipv6_dup_options(struct sock *sk,
 struct ipv6_txoptions *ipv6_renew_options(struct sock *sk,
                                           struct ipv6_txoptions *opt,
                                           int newtype,
-                                          struct ipv6_opt_hdr __user *newopt,
-                                          int newoptlen);
-struct ipv6_txoptions *
-ipv6_renew_options_kern(struct sock *sk,
-                        struct ipv6_txoptions *opt,
-                        int newtype,
-                        struct ipv6_opt_hdr *newopt,
-                        int newoptlen);
+                                          struct ipv6_opt_hdr *newopt);
 struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,
                                           struct ipv6_txoptions *opt);
 
@@ -830,7 +823,7 @@ static inline __be32 ip6_make_flowlabel(struct net *net, struct sk_buff *skb,
          * to minimize possbility that any useful information to an
          * attacker is leaked. Only lower 20 bits are relevant.
          */
-        rol32(hash, 16);
+        hash = rol32(hash, 16);
 
         flowlabel = (__force __be32)hash & IPV6_FLOWLABEL_MASK;
 
@@ -1107,6 +1100,8 @@ void ipv6_sysctl_unregister(void);
 
 int ipv6_sock_mc_join(struct sock *sk, int ifindex,
                       const struct in6_addr *addr);
+int ipv6_sock_mc_join_ssm(struct sock *sk, int ifindex,
+                          const struct in6_addr *addr, unsigned int mode);
 int ipv6_sock_mc_drop(struct sock *sk, int ifindex,
                       const struct in6_addr *addr);
 #endif /* _NET_IPV6_H */
diff --git a/include/net/netfilter/nf_tables_core.h b/include/net/netfilter/nf_tables_core.h
index e0c0c2558ec4..a05134507e7b 100644
--- a/include/net/netfilter/nf_tables_core.h
+++ b/include/net/netfilter/nf_tables_core.h
@@ -65,4 +65,10 @@ extern const struct nft_expr_ops nft_payload_fast_ops;
 extern struct static_key_false nft_counters_enabled;
 extern struct static_key_false nft_trace_enabled;
 
+extern struct nft_set_type nft_set_rhash_type;
+extern struct nft_set_type nft_set_hash_type;
+extern struct nft_set_type nft_set_hash_fast_type;
+extern struct nft_set_type nft_set_rbtree_type;
+extern struct nft_set_type nft_set_bitmap_type;
+
 #endif /* _NET_NF_TABLES_CORE_H */
diff --git a/include/net/netfilter/nf_tproxy.h b/include/net/netfilter/nf_tproxy.h
index 9754a50ecde9..4cc64c8446eb 100644
--- a/include/net/netfilter/nf_tproxy.h
+++ b/include/net/netfilter/nf_tproxy.h
@@ -64,7 +64,7 @@ nf_tproxy_handle_time_wait4(struct net *net, struct sk_buff *skb,
  * belonging to established connections going through that one.
  */
 struct sock *
-nf_tproxy_get_sock_v4(struct net *net, struct sk_buff *skb, void *hp,
+nf_tproxy_get_sock_v4(struct net *net, struct sk_buff *skb,
                       const u8 protocol,
                       const __be32 saddr, const __be32 daddr,
                       const __be16 sport, const __be16 dport,
@@ -103,7 +103,7 @@ nf_tproxy_handle_time_wait6(struct sk_buff *skb, int tproto, int thoff,
                             struct sock *sk);
 
 struct sock *
-nf_tproxy_get_sock_v6(struct net *net, struct sk_buff *skb, int thoff, void *hp,
+nf_tproxy_get_sock_v6(struct net *net, struct sk_buff *skb, int thoff,
                       const u8 protocol,
                       const struct in6_addr *saddr, const struct in6_addr *daddr,
                       const __be16 sport, const __be16 dport,
diff --git a/include/net/tc_act/tc_csum.h b/include/net/tc_act/tc_csum.h
index 9470fd7e4350..32d2454c0479 100644
--- a/include/net/tc_act/tc_csum.h
+++ b/include/net/tc_act/tc_csum.h
@@ -7,7 +7,6 @@
 #include <linux/tc_act/tc_csum.h>
 
 struct tcf_csum_params {
-        int action;
         u32 update_flags;
         struct rcu_head rcu;
 };
diff --git a/include/net/tc_act/tc_tunnel_key.h b/include/net/tc_act/tc_tunnel_key.h
index efef0b4b1b2b..46b8c7f1c8d5 100644
--- a/include/net/tc_act/tc_tunnel_key.h
+++ b/include/net/tc_act/tc_tunnel_key.h
@@ -18,7 +18,6 @@
 struct tcf_tunnel_key_params {
         struct rcu_head         rcu;
         int                     tcft_action;
-        int                     action;
         struct metadata_dst     *tcft_enc_metadata;
 };
 
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 800582b5dd54..3482d13d655b 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -828,6 +828,10 @@ struct tcp_skb_cb {
 
 #define TCP_SKB_CB(__skb)       ((struct tcp_skb_cb *)&((__skb)->cb[0]))
 
+static inline void bpf_compute_data_end_sk_skb(struct sk_buff *skb)
+{
+        TCP_SKB_CB(skb)->bpf.data_end = skb->data + skb_headlen(skb);
+}
 
 #if IS_ENABLED(CONFIG_IPV6)
 /* This is the variant of inet6_iif() that must be used by TCP,
@@ -908,8 +912,6 @@ enum tcp_ca_event {
         CA_EVENT_LOSS,          /* loss timeout */
         CA_EVENT_ECN_NO_CE,     /* ECT set, but not CE marked */
         CA_EVENT_ECN_IS_CE,     /* received CE marked IP packet */
-        CA_EVENT_DELAYED_ACK,   /* Delayed ack is sent */
-        CA_EVENT_NON_DELAYED_ACK,
 };
 
 /* Information about inbound ACK, passed to cong_ops->in_ack_event() */
diff --git a/include/net/xdp_sock.h b/include/net/xdp_sock.h
index 9fe472f2ac95..7161856bcf9c 100644
--- a/include/net/xdp_sock.h
+++ b/include/net/xdp_sock.h
@@ -60,6 +60,10 @@ struct xdp_sock {
         bool zc;
         /* Protects multiple processes in the control path */
         struct mutex mutex;
+        /* Mutual exclusion of NAPI TX thread and sendmsg error paths
+         * in the SKB destructor callback.
+         */
+        spinlock_t tx_completion_lock;
         u64 rx_dropped;
 };
 
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index 4ca65b56084f..7363f18e65a5 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -226,7 +226,7 @@ enum tunable_id {
         ETHTOOL_TX_COPYBREAK,
         ETHTOOL_PFC_PREVENTION_TOUT, /* timeout in msecs */
         /*
-         * Add your fresh new tubale attribute above and remember to update
+         * Add your fresh new tunable attribute above and remember to update
          * tunable_strings[] in net/core/ethtool.c
          */
         __ETHTOOL_TUNABLE_COUNT,
diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index 29eb659aa77a..e3f6ed8a7064 100644
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -127,6 +127,10 @@ enum {
 
 #define TCP_CM_INQ              TCP_INQ
 
+#define TCP_REPAIR_ON           1
+#define TCP_REPAIR_OFF          0
+#define TCP_REPAIR_OFF_NO_WP    -1      /* Turn off without window probes */
+
 struct tcp_repair_opt {
         __u32   opt_code;
         __u32   opt_val;
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 2d49d18b793a..e016ac3afa24 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -991,16 +991,13 @@ static void btf_int_bits_seq_show(const struct btf *btf,
                                   void *data, u8 bits_offset,
                                   struct seq_file *m)
 {
+        u16 left_shift_bits, right_shift_bits;
         u32 int_data = btf_type_int(t);
         u16 nr_bits = BTF_INT_BITS(int_data);
         u16 total_bits_offset;
         u16 nr_copy_bytes;
         u16 nr_copy_bits;
-        u8 nr_upper_bits;
-        union {
-                u64 u64_num;
-                u8  u8_nums[8];
-        } print_num;
+        u64 print_num;
 
         total_bits_offset = bits_offset + BTF_INT_OFFSET(int_data);
         data += BITS_ROUNDDOWN_BYTES(total_bits_offset);
@@ -1008,21 +1005,20 @@ static void btf_int_bits_seq_show(const struct btf *btf,
         nr_copy_bits = nr_bits + bits_offset;
         nr_copy_bytes = BITS_ROUNDUP_BYTES(nr_copy_bits);
 
-        print_num.u64_num = 0;
-        memcpy(&print_num.u64_num, data, nr_copy_bytes);
+        print_num = 0;
+        memcpy(&print_num, data, nr_copy_bytes);
 
-        /* Ditch the higher order bits */
-        nr_upper_bits = BITS_PER_BYTE_MASKED(nr_copy_bits);
-        if (nr_upper_bits) {
-                /* We need to mask out some bits of the upper byte. */
-                u8 mask = (1 << nr_upper_bits) - 1;
+#ifdef __BIG_ENDIAN_BITFIELD
+        left_shift_bits = bits_offset;
+#else
+        left_shift_bits = BITS_PER_U64 - nr_copy_bits;
+#endif
+        right_shift_bits = BITS_PER_U64 - nr_bits;
 
-                print_num.u8_nums[nr_copy_bytes - 1] &= mask;
-        }
-
-        print_num.u64_num >>= bits_offset;
+        print_num <<= left_shift_bits;
+        print_num >>= right_shift_bits;
 
-        seq_printf(m, "0x%llx", print_num.u64_num);
+        seq_printf(m, "0x%llx", print_num);
 }
 
 static void btf_int_seq_show(const struct btf *btf, const struct btf_type *t,
diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
index 642c97f6d1b8..d361fc1e3bf3 100644
--- a/kernel/bpf/devmap.c
+++ b/kernel/bpf/devmap.c
@@ -334,10 +334,15 @@ int dev_map_enqueue(struct bpf_dtab_netdev *dst, struct xdp_buff *xdp,
 {
         struct net_device *dev = dst->dev;
         struct xdp_frame *xdpf;
+        int err;
 
         if (!dev->netdev_ops->ndo_xdp_xmit)
                 return -EOPNOTSUPP;
 
+        err = xdp_ok_fwd_dev(dev, xdp->data_end - xdp->data);
+        if (unlikely(err))
+                return err;
+
         xdpf = convert_to_xdp_frame(xdp);
         if (unlikely(!xdpf))
                 return -EOVERFLOW;
@@ -350,7 +355,7 @@ int dev_map_generic_redirect(struct bpf_dtab_netdev *dst, struct sk_buff *skb,
 {
         int err;
 
-        err = __xdp_generic_ok_fwd_dev(skb, dst->dev);
+        err = xdp_ok_fwd_dev(dst->dev, skb->len);
         if (unlikely(err))
                 return err;
         skb->dev = dst->dev;
diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c
index 3ca2198a6d22..513d9dfcf4ee 100644
--- a/kernel/bpf/hashtab.c
+++ b/kernel/bpf/hashtab.c
@@ -747,13 +747,15 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key,
                                  * old element will be freed immediately.
                                  * Otherwise return an error
                                  */
-                                atomic_dec(&htab->count);
-                                return ERR_PTR(-E2BIG);
+                                l_new = ERR_PTR(-E2BIG);
+                                goto dec_count;
                         }
                 l_new = kmalloc_node(htab->elem_size, GFP_ATOMIC | __GFP_NOWARN,
                                      htab->map.numa_node);
-                if (!l_new)
-                        return ERR_PTR(-ENOMEM);
+                if (!l_new) {
+                        l_new = ERR_PTR(-ENOMEM);
+                        goto dec_count;
+                }
         }
 
         memcpy(l_new->key, key, key_size);
@@ -766,7 +768,8 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key,
                                                   GFP_ATOMIC | __GFP_NOWARN);
                         if (!pptr) {
                                 kfree(l_new);
-                                return ERR_PTR(-ENOMEM);
+                                l_new = ERR_PTR(-ENOMEM);
+                                goto dec_count;
                         }
                 }
 
@@ -780,6 +783,9 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key,
 
         l_new->hash = hash;
         return l_new;
+dec_count:
+        atomic_dec(&htab->count);
+        return l_new;
 }
 
 static int check_flags(struct bpf_htab *htab, struct htab_elem *l_old,
diff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c
index cf7b6a6dbd1f..98fb7938beea 100644
--- a/kernel/bpf/sockmap.c
+++ b/kernel/bpf/sockmap.c
@@ -312,10 +312,12 @@ static void bpf_tcp_close(struct sock *sk, long timeout)
         struct smap_psock *psock;
         struct sock *osk;
 
+        lock_sock(sk);
         rcu_read_lock();
         psock = smap_psock_sk(sk);
         if (unlikely(!psock)) {
                 rcu_read_unlock();
+                release_sock(sk);
                 return sk->sk_prot->close(sk, timeout);
         }
 
@@ -371,6 +373,7 @@ static void bpf_tcp_close(struct sock *sk, long timeout)
                 e = psock_map_pop(sk, psock);
         }
         rcu_read_unlock();
+        release_sock(sk);
         close_fun(sk, timeout);
 }
 
@@ -568,7 +571,8 @@ static int free_sg(struct sock *sk, int start, struct sk_msg_buff *md)
         while (sg[i].length) {
                 free += sg[i].length;
                 sk_mem_uncharge(sk, sg[i].length);
-                put_page(sg_page(&sg[i]));
+                if (!md->skb)
+                        put_page(sg_page(&sg[i]));
                 sg[i].length = 0;
                 sg[i].page_link = 0;
                 sg[i].offset = 0;
@@ -577,6 +581,8 @@ static int free_sg(struct sock *sk, int start, struct sk_msg_buff *md)
                 if (i == MAX_SKB_FRAGS)
                         i = 0;
         }
+        if (md->skb)
+                consume_skb(md->skb);
 
         return free;
 }
@@ -1230,7 +1236,7 @@ static int smap_verdict_func(struct smap_psock *psock, struct sk_buff *skb)
          */
         TCP_SKB_CB(skb)->bpf.sk_redir = NULL;
         skb->sk = psock->sock;
-        bpf_compute_data_pointers(skb);
+        bpf_compute_data_end_sk_skb(skb);
         preempt_disable();
         rc = (*prog->bpf_func)(skb, prog->insnsi);
         preempt_enable();
@@ -1485,7 +1491,7 @@ static int smap_parse_func_strparser(struct strparser *strp,
          * any socket yet.
          */
         skb->sk = psock->sock;
-        bpf_compute_data_pointers(skb);
+        bpf_compute_data_end_sk_skb(skb);
         rc = (*prog->bpf_func)(skb, prog->insnsi);
         skb->sk = NULL;
         rcu_read_unlock();
@@ -1896,7 +1902,7 @@ static int __sock_map_ctx_update_elem(struct bpf_map *map,
                 e = kzalloc(sizeof(*e), GFP_ATOMIC | __GFP_NOWARN);
                 if (!e) {
                         err = -ENOMEM;
-                        goto out_progs;
+                        goto out_free;
                 }
         }
 
@@ -2069,7 +2075,13 @@ static int sock_map_update_elem(struct bpf_map *map,
                 return -EOPNOTSUPP;
         }
 
+        lock_sock(skops.sk);
+        preempt_disable();
+        rcu_read_lock();
         err = sock_map_ctx_update_elem(&skops, map, key, flags);
+        rcu_read_unlock();
+        preempt_enable();
+        release_sock(skops.sk);
         fput(socket->file);
         return err;
 }
@@ -2342,7 +2354,10 @@ static int sock_hash_ctx_update_elem(struct bpf_sock_ops_kern *skops,
         if (err)
                 goto err;
 
-        /* bpf_map_update_elem() can be called in_irq() */
+        /* psock is valid here because otherwise above *ctx_update_elem would
+         * have thrown an error. It is safe to skip error check.
+         */
+        psock = smap_psock_sk(sock);
         raw_spin_lock_bh(&b->lock);
         l_old = lookup_elem_raw(head, hash, key, key_size);
         if (l_old && map_flags == BPF_NOEXIST) {
@@ -2360,12 +2375,6 @@ static int sock_hash_ctx_update_elem(struct bpf_sock_ops_kern *skops,
                 goto bucket_err;
         }
 
-        psock = smap_psock_sk(sock);
-        if (unlikely(!psock)) {
-                err = -EINVAL;
-                goto bucket_err;
-        }
-
         rcu_assign_pointer(e->hash_link, l_new);
         rcu_assign_pointer(e->htab,
                            container_of(map, struct bpf_htab, map));
@@ -2388,12 +2397,10 @@ static int sock_hash_ctx_update_elem(struct bpf_sock_ops_kern *skops,
         raw_spin_unlock_bh(&b->lock);
         return 0;
 bucket_err:
+        smap_release_sock(psock, sock);
         raw_spin_unlock_bh(&b->lock);
 err:
         kfree(e);
-        psock = smap_psock_sk(sock);
-        if (psock)
-                smap_release_sock(psock, sock);
         return err;
 }
 
@@ -2415,7 +2422,13 @@ static int sock_hash_update_elem(struct bpf_map *map,
                 return -EINVAL;
         }
 
+        lock_sock(skops.sk);
+        preempt_disable();
+        rcu_read_lock();
         err = sock_hash_ctx_update_elem(&skops, map, key, flags);
+        rcu_read_unlock();
+        preempt_enable();
+        release_sock(skops.sk);
         fput(socket->file);
         return err;
 }
@@ -2472,10 +2485,8 @@ struct sock  *__sock_hash_lookup_elem(struct bpf_map *map, void *key)
         b = __select_bucket(htab, hash);
         head = &b->head;
 
-        raw_spin_lock_bh(&b->lock);
         l = lookup_elem_raw(head, hash, key, key_size);
         sk = l ? l->sk : NULL;
-        raw_spin_unlock_bh(&b->lock);
         return sk;
 }
 
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index d10ecd78105f..a31a1ba0f8ea 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -735,7 +735,9 @@ static int map_update_elem(union bpf_attr *attr)
         if (bpf_map_is_dev_bound(map)) {
                 err = bpf_map_offload_update_elem(map, key, value, attr->flags);
                 goto out;
-        } else if (map->map_type == BPF_MAP_TYPE_CPUMAP) {
+        } else if (map->map_type == BPF_MAP_TYPE_CPUMAP ||
+                   map->map_type == BPF_MAP_TYPE_SOCKHASH ||
+                   map->map_type == BPF_MAP_TYPE_SOCKMAP) {
                 err = map->ops->map_update_elem(map, key, value, attr->flags);
                 goto out;
         }
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 9e2bf834f13a..63aaac52a265 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -5430,6 +5430,10 @@ static int jit_subprogs(struct bpf_verifier_env *env)
                 if (insn->code != (BPF_JMP | BPF_CALL) ||
                     insn->src_reg != BPF_PSEUDO_CALL)
                         continue;
+                /* Upon error here we cannot fall back to interpreter but
+                 * need a hard reject of the program. Thus -EFAULT is
+                 * propagated in any case.
+                 */
                 subprog = find_subprog(env, i + insn->imm + 1);
                 if (subprog < 0) {
                         WARN_ONCE(1, "verifier bug. No program starts at insn %d\n",
@@ -5450,7 +5454,7 @@ static int jit_subprogs(struct bpf_verifier_env *env)
 
         func = kcalloc(env->subprog_cnt, sizeof(prog), GFP_KERNEL);
         if (!func)
-                return -ENOMEM;
+                goto out_undo_insn;
 
         for (i = 0; i < env->subprog_cnt; i++) {
                 subprog_start = subprog_end;
@@ -5515,7 +5519,7 @@ static int jit_subprogs(struct bpf_verifier_env *env)
                 tmp = bpf_int_jit_compile(func[i]);
                 if (tmp != func[i] || func[i]->bpf_func != old_bpf_func) {
                         verbose(env, "JIT doesn't support bpf-to-bpf calls\n");
-                        err = -EFAULT;
+                        err = -ENOTSUPP;
                         goto out_free;
                 }
                 cond_resched();
@@ -5552,6 +5556,7 @@ out_free:
                 if (func[i])
                         bpf_jit_free(func[i]);
         kfree(func);
+out_undo_insn:
         /* cleanup main prog to be interpreted */
         prog->jit_requested = 0;
         for (i = 0, insn = prog->insnsi; i < prog->len; i++, insn++) {
@@ -5578,6 +5583,8 @@ static int fixup_call_args(struct bpf_verifier_env *env)
                 err = jit_subprogs(env);
                 if (err == 0)
                         return 0;
+                if (err == -EFAULT)
+                        return err;
         }
 #ifndef CONFIG_BPF_JIT_ALWAYS_ON
         for (i = 0; i < prog->len; i++, insn++) {
diff --git a/kernel/fork.c b/kernel/fork.c
index 9440d61b925c..a191c05e757d 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -303,11 +303,38 @@ struct kmem_cache *files_cachep;
 struct kmem_cache *fs_cachep;
 
 /* SLAB cache for vm_area_struct structures */
-struct kmem_cache *vm_area_cachep;
+static struct kmem_cache *vm_area_cachep;
 
 /* SLAB cache for mm_struct structures (tsk->mm) */
 static struct kmem_cache *mm_cachep;
 
+struct vm_area_struct *vm_area_alloc(struct mm_struct *mm)
+{
+        struct vm_area_struct *vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
+
+        if (vma) {
+                vma->vm_mm = mm;
+                INIT_LIST_HEAD(&vma->anon_vma_chain);
+        }
+        return vma;
+}
+
+struct vm_area_struct *vm_area_dup(struct vm_area_struct *orig)
+{
+        struct vm_area_struct *new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
+
+        if (new) {
+                *new = *orig;
+                INIT_LIST_HEAD(&new->anon_vma_chain);
+        }
+        return new;
+}
+
+void vm_area_free(struct vm_area_struct *vma)
+{
+        kmem_cache_free(vm_area_cachep, vma);
+}
+
 static void account_kernel_stack(struct task_struct *tsk, int account)
 {
         void *stack = task_stack_page(tsk);
@@ -455,11 +482,9 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
                                 goto fail_nomem;
                         charge = len;
                 }
-                tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
+                tmp = vm_area_dup(mpnt);
                 if (!tmp)
                         goto fail_nomem;
-                *tmp = *mpnt;
-                INIT_LIST_HEAD(&tmp->anon_vma_chain);
                 retval = vma_dup_policy(mpnt, tmp);
                 if (retval)
                         goto fail_nomem_policy;
@@ -539,7 +564,7 @@ fail_uprobe_end:
 fail_nomem_anon_vma_fork:
         mpol_put(vma_policy(tmp));
 fail_nomem_policy:
-        kmem_cache_free(vm_area_cachep, tmp);
+        vm_area_free(tmp);
 fail_nomem:
         retval = -ENOMEM;
         vm_unacct_memory(charge);
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index fbfc3f1d368a..10c7b51c0d1f 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -2290,8 +2290,17 @@ static void switched_from_dl(struct rq *rq, struct task_struct *p)
         if (task_on_rq_queued(p) && p->dl.dl_runtime)
                 task_non_contending(p);
 
-        if (!task_on_rq_queued(p))
+        if (!task_on_rq_queued(p)) {
+                /*
+                 * Inactive timer is armed. However, p is leaving DEADLINE and
+                 * might migrate away from this rq while continuing to run on
+                 * some other class. We need to remove its contribution from
+                 * this rq running_bw now, or sub_rq_bw (below) will complain.
+                 */
+                if (p->dl.dl_non_contending)
+                        sub_running_bw(&p->dl, &rq->dl);
                 sub_rq_bw(&p->dl, &rq->dl);
+        }
 
         /*
          * We cannot use inactive_task_timer() to invoke sub_running_bw()
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 900dcfee542c..75ffc1d1a2e0 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -79,12 +79,16 @@ static void wakeup_softirqd(void)
 
 /*
  * If ksoftirqd is scheduled, we do not want to process pending softirqs
- * right now. Let ksoftirqd handle this at its own rate, to get fairness.
+ * right now. Let ksoftirqd handle this at its own rate, to get fairness,
+ * unless we're doing some of the synchronous softirqs.
  */
-static bool ksoftirqd_running(void)
+#define SOFTIRQ_NOW_MASK ((1 << HI_SOFTIRQ) | (1 << TASKLET_SOFTIRQ))
+static bool ksoftirqd_running(unsigned long pending)
 {
         struct task_struct *tsk = __this_cpu_read(ksoftirqd);
 
+        if (pending & SOFTIRQ_NOW_MASK)
+                return false;
         return tsk && (tsk->state == TASK_RUNNING);
 }
 
@@ -328,7 +332,7 @@ asmlinkage __visible void do_softirq(void)
 
         pending = local_softirq_pending();
 
-        if (pending && !ksoftirqd_running())
+        if (pending && !ksoftirqd_running(pending))
                 do_softirq_own_stack();
 
         local_irq_restore(flags);
@@ -355,7 +359,7 @@ void irq_enter(void)
 
 static inline void invoke_softirq(void)
 {
-        if (ksoftirqd_running())
+        if (ksoftirqd_running(local_softirq_pending()))
                 return;
 
         if (!force_irqthreads) {
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index f89014a2c238..1ff523dae6e2 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -270,7 +270,11 @@ unlock:
                 goto retry;
         }
 
-        wake_up_q(&wakeq);
+        if (!err) {
+                preempt_disable();
+                wake_up_q(&wakeq);
+                preempt_enable();
+        }
 
         return err;
 }
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 7e43cd54c84c..8be175df3075 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -596,15 +596,70 @@ static unsigned long memcpy_mcsafe_to_page(struct page *page, size_t offset,
         return ret;
 }
 
+static size_t copy_pipe_to_iter_mcsafe(const void *addr, size_t bytes,
+                                struct iov_iter *i)
+{
+        struct pipe_inode_info *pipe = i->pipe;
+        size_t n, off, xfer = 0;
+        int idx;
+
+        if (!sanity(i))
+                return 0;
+
+        bytes = n = push_pipe(i, bytes, &idx, &off);
+        if (unlikely(!n))
+                return 0;
+        for ( ; n; idx = next_idx(idx, pipe), off = 0) {
+                size_t chunk = min_t(size_t, n, PAGE_SIZE - off);
+                unsigned long rem;
+
+                rem = memcpy_mcsafe_to_page(pipe->bufs[idx].page, off, addr,
+                                chunk);
+                i->idx = idx;
+                i->iov_offset = off + chunk - rem;
+                xfer += chunk - rem;
+                if (rem)
+                        break;
+                n -= chunk;
+                addr += chunk;
+        }
+        i->count -= xfer;
+        return xfer;
+}
+
+/**
+ * _copy_to_iter_mcsafe - copy to user with source-read error exception handling
+ * @addr: source kernel address
+ * @bytes: total transfer length
+ * @iter: destination iterator
+ *
+ * The pmem driver arranges for filesystem-dax to use this facility via
+ * dax_copy_to_iter() for protecting read/write to persistent memory.
+ * Unless / until an architecture can guarantee identical performance
+ * between _copy_to_iter_mcsafe() and _copy_to_iter() it would be a
+ * performance regression to switch more users to the mcsafe version.
+ *
+ * Otherwise, the main differences between this and typical _copy_to_iter().
+ *
+ * * Typical tail/residue handling after a fault retries the copy
+ *   byte-by-byte until the fault happens again. Re-triggering machine
+ *   checks is potentially fatal so the implementation uses source
+ *   alignment and poison alignment assumptions to avoid re-triggering
+ *   hardware exceptions.
+ *
+ * * ITER_KVEC, ITER_PIPE, and ITER_BVEC can return short copies.
+ *   Compare to copy_to_iter() where only ITER_IOVEC attempts might return
+ *   a short copy.
+ *
+ * See MCSAFE_TEST for self-test.
+ */
 size_t _copy_to_iter_mcsafe(const void *addr, size_t bytes, struct iov_iter *i)
 {
         const char *from = addr;
         unsigned long rem, curr_addr, s_addr = (unsigned long) addr;
 
-        if (unlikely(i->type & ITER_PIPE)) {
-                WARN_ON(1);
-                return 0;
-        }
+        if (unlikely(i->type & ITER_PIPE))
+                return copy_pipe_to_iter_mcsafe(addr, bytes, i);
         if (iter_is_iovec(i))
                 might_fault();
         iterate_and_advance(i, bytes, v,
@@ -701,6 +756,20 @@ size_t _copy_from_iter_nocache(void *addr, size_t bytes, struct iov_iter *i)
 EXPORT_SYMBOL(_copy_from_iter_nocache);
 
 #ifdef CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE
+/**
+ * _copy_from_iter_flushcache - write destination through cpu cache
+ * @addr: destination kernel address
+ * @bytes: total transfer length
+ * @iter: source iterator
+ *
+ * The pmem driver arranges for filesystem-dax to use this facility via
+ * dax_copy_from_iter() for ensuring that writes to persistent memory
+ * are flushed through the CPU cache. It is differentiated from
+ * _copy_from_iter_nocache() in that guarantees all data is flushed for
+ * all iterator types. The _copy_from_iter_nocache() only attempts to
+ * bypass the cache for the ITER_IOVEC case, and on some archs may use
+ * instructions that strand dirty-data in the cache.
+ */
 size_t _copy_from_iter_flushcache(void *addr, size_t bytes, struct iov_iter *i)
 {
         char *to = addr;
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index 9427b5766134..e5c8586cf717 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -774,7 +774,7 @@ int rhashtable_walk_start_check(struct rhashtable_iter *iter)
                                 skip++;
                                 if (list == iter->list) {
                                         iter->p = p;
-                                        skip = skip;
+                                        iter->skip = skip;
                                         goto found;
                                 }
                         }
@@ -964,8 +964,16 @@ EXPORT_SYMBOL_GPL(rhashtable_walk_stop);
 
 static size_t rounded_hashtable_size(const struct rhashtable_params *params)
 {
-        return max(roundup_pow_of_two(params->nelem_hint * 4 / 3),
-                   (unsigned long)params->min_size);
+        size_t retsize;
+
+        if (params->nelem_hint)
+                retsize = max(roundup_pow_of_two(params->nelem_hint * 4 / 3),
+                              (unsigned long)params->min_size);
+        else
+                retsize = max(HASH_DEFAULT_SIZE,
+                              (unsigned long)params->min_size);
+
+        return retsize;
 }
 
 static u32 rhashtable_jhash2(const void *key, u32 length, u32 seed)
@@ -1022,8 +1030,6 @@ int rhashtable_init(struct rhashtable *ht,
         struct bucket_table *tbl;
         size_t size;
 
-        size = HASH_DEFAULT_SIZE;
-
         if ((!params->key_len && !params->obj_hashfn) ||
             (params->obj_hashfn && !params->obj_cmpfn))
                 return -EINVAL;
@@ -1050,8 +1056,7 @@ int rhashtable_init(struct rhashtable *ht,
 
         ht->p.min_size = max_t(u16, ht->p.min_size, HASH_MIN_SIZE);
 
-        if (params->nelem_hint)
-                size = rounded_hashtable_size(&ht->p);
+        size = rounded_hashtable_size(&ht->p);
 
         if (params->locks_mul)
                 ht->p.locks_mul = roundup_pow_of_two(params->locks_mul);
@@ -1143,13 +1148,14 @@ void rhashtable_free_and_destroy(struct rhashtable *ht,
                                  void (*free_fn)(void *ptr, void *arg),
                                  void *arg)
 {
-        struct bucket_table *tbl;
+        struct bucket_table *tbl, *next_tbl;
         unsigned int i;
 
         cancel_work_sync(&ht->run_work);
 
         mutex_lock(&ht->mutex);
         tbl = rht_dereference(ht->tbl, ht);
+restart:
         if (free_fn) {
                 for (i = 0; i < tbl->size; i++) {
                         struct rhash_head *pos, *next;
@@ -1166,7 +1172,12 @@ void rhashtable_free_and_destroy(struct rhashtable *ht,
                 }
         }
 
+        next_tbl = rht_dereference(tbl->future_tbl, ht);
         bucket_table_free(tbl);
+        if (next_tbl) {
+                tbl = next_tbl;
+                goto restart;
+        }
         mutex_unlock(&ht->mutex);
 }
 EXPORT_SYMBOL_GPL(rhashtable_free_and_destroy);
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 1cd7c1a57a14..25346bd99364 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2084,6 +2084,8 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,
                 if (vma_is_dax(vma))
                         return;
                 page = pmd_page(_pmd);
+                if (!PageDirty(page) && pmd_dirty(_pmd))
+                        set_page_dirty(page);
                 if (!PageReferenced(page) && pmd_young(_pmd))
                         SetPageReferenced(page);
                 page_remove_rmap(page, true);
diff --git a/mm/memblock.c b/mm/memblock.c
index 11e46f83e1ad..4b5d245fafc1 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -20,6 +20,7 @@
 #include <linux/kmemleak.h>
 #include <linux/seq_file.h>
 #include <linux/memblock.h>
+#include <linux/bootmem.h>
 
 #include <asm/sections.h>
 #include <linux/io.h>
@@ -1225,6 +1226,7 @@ phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, i
         return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);
 }
 
+#if defined(CONFIG_NO_BOOTMEM)
 /**
  * memblock_virt_alloc_internal - allocate boot memory block
  * @size: size of memory block to be allocated in bytes
@@ -1432,6 +1434,7 @@ void * __init memblock_virt_alloc_try_nid(
               (u64)max_addr);
         return NULL;
 }
+#endif
 
 /**
  * __memblock_free_early - free boot memory block
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index e6f0d5ef320a..8c0280b3143e 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -850,7 +850,7 @@ static void invalidate_reclaim_iterators(struct mem_cgroup *dead_memcg)
         int nid;
         int i;
 
-        while ((memcg = parent_mem_cgroup(memcg))) {
+        for (; memcg; memcg = parent_mem_cgroup(memcg)) {
                 for_each_node(nid) {
                         mz = mem_cgroup_nodeinfo(memcg, nid);
                         for (i = 0; i <= DEF_PRIORITY; i++) {
diff --git a/mm/mmap.c b/mm/mmap.c
index 5801b5f0a634..ff1944d8d458 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -182,7 +182,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
         if (vma->vm_file)
                 fput(vma->vm_file);
         mpol_put(vma_policy(vma));
-        kmem_cache_free(vm_area_cachep, vma);
+        vm_area_free(vma);
         return next;
 }
 
@@ -911,7 +911,7 @@ again:
                         anon_vma_merge(vma, next);
                 mm->map_count--;
                 mpol_put(vma_policy(next));
-                kmem_cache_free(vm_area_cachep, next);
+                vm_area_free(next);
                 /*
                  * In mprotect's case 6 (see comments on vma_merge),
                  * we must remove another next too. It would clutter
@@ -1729,19 +1729,17 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
          * specific mapper. the address has already been validated, but
          * not unmapped, but the maps are removed from the list.
          */
-        vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
+        vma = vm_area_alloc(mm);
         if (!vma) {
                 error = -ENOMEM;
                 goto unacct_error;
         }
 
-        vma->vm_mm = mm;
         vma->vm_start = addr;
         vma->vm_end = addr + len;
         vma->vm_flags = vm_flags;
         vma->vm_page_prot = vm_get_page_prot(vm_flags);
         vma->vm_pgoff = pgoff;
-        INIT_LIST_HEAD(&vma->anon_vma_chain);
 
         if (file) {
                 if (vm_flags & VM_DENYWRITE) {
@@ -1832,7 +1830,7 @@ allow_write_and_free_vma:
         if (vm_flags & VM_DENYWRITE)
                 allow_write_access(file);
 free_vma:
-        kmem_cache_free(vm_area_cachep, vma);
+        vm_area_free(vma);
 unacct_error:
         if (charged)
                 vm_unacct_memory(charged);
@@ -2620,15 +2618,10 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
                         return err;
         }
 
-        new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
+        new = vm_area_dup(vma);
         if (!new)
                 return -ENOMEM;
 
-        /* most fields are the same, copy all, and then fixup */
-        *new = *vma;
-
-        INIT_LIST_HEAD(&new->anon_vma_chain);
-
         if (new_below)
                 new->vm_end = addr;
         else {
@@ -2669,7 +2662,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
  out_free_mpol:
         mpol_put(vma_policy(new));
  out_free_vma:
-        kmem_cache_free(vm_area_cachep, new);
+        vm_area_free(new);
         return err;
 }
 
@@ -2984,14 +2977,12 @@ static int do_brk_flags(unsigned long addr, unsigned long len, unsigned long fla
         /*
          * create a vma struct for an anonymous mapping
          */
-        vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
+        vma = vm_area_alloc(mm);
         if (!vma) {
                 vm_unacct_memory(len >> PAGE_SHIFT);
                 return -ENOMEM;
         }
 
-        INIT_LIST_HEAD(&vma->anon_vma_chain);
-        vma->vm_mm = mm;
         vma->vm_start = addr;
         vma->vm_end = addr + len;
         vma->vm_pgoff = pgoff;
@@ -3202,16 +3193,14 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
                 }
                 *need_rmap_locks = (new_vma->vm_pgoff <= vma->vm_pgoff);
         } else {
-                new_vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
+                new_vma = vm_area_dup(vma);
                 if (!new_vma)
                         goto out;
-                *new_vma = *vma;
                 new_vma->vm_start = addr;
                 new_vma->vm_end = addr + len;
                 new_vma->vm_pgoff = pgoff;
                 if (vma_dup_policy(vma, new_vma))
                         goto out_free_vma;
-                INIT_LIST_HEAD(&new_vma->anon_vma_chain);
                 if (anon_vma_clone(new_vma, vma))
                         goto out_free_mempol;
                 if (new_vma->vm_file)
@@ -3226,7 +3215,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
 out_free_mempol:
         mpol_put(vma_policy(new_vma));
 out_free_vma:
-        kmem_cache_free(vm_area_cachep, new_vma);
+        vm_area_free(new_vma);
 out:
         return NULL;
 }
@@ -3350,12 +3339,10 @@ static struct vm_area_struct *__install_special_mapping(
         int ret;
         struct vm_area_struct *vma;
 
-        vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
+        vma = vm_area_alloc(mm);
         if (unlikely(vma == NULL))
                 return ERR_PTR(-ENOMEM);
 
-        INIT_LIST_HEAD(&vma->anon_vma_chain);
-        vma->vm_mm = mm;
         vma->vm_start = addr;
         vma->vm_end = addr + len;
 
@@ -3376,7 +3363,7 @@ static struct vm_area_struct *__install_special_mapping(
         return vma;
 
 out:
-        kmem_cache_free(vm_area_cachep, vma);
+        vm_area_free(vma);
         return ERR_PTR(ret);
 }
 
diff --git a/mm/nommu.c b/mm/nommu.c
index 4452d8bd9ae4..1d22fdbf7d7c 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -769,7 +769,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
         if (vma->vm_file)
                 fput(vma->vm_file);
         put_nommu_region(vma->vm_region);
-        kmem_cache_free(vm_area_cachep, vma);
+        vm_area_free(vma);
 }
 
 /*
@@ -1204,7 +1204,7 @@ unsigned long do_mmap(struct file *file,
         if (!region)
                 goto error_getting_region;
 
-        vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
+        vma = vm_area_alloc(current->mm);
         if (!vma)
                 goto error_getting_vma;
 
@@ -1212,7 +1212,6 @@ unsigned long do_mmap(struct file *file,
         region->vm_flags = vm_flags;
         region->vm_pgoff = pgoff;
 
-        INIT_LIST_HEAD(&vma->anon_vma_chain);
         vma->vm_flags = vm_flags;
         vma->vm_pgoff = pgoff;
 
@@ -1368,7 +1367,7 @@ error:
         kmem_cache_free(vm_region_jar, region);
         if (vma->vm_file)
                 fput(vma->vm_file);
-        kmem_cache_free(vm_area_cachep, vma);
+        vm_area_free(vma);
         return ret;
 
 sharing_violation:
@@ -1469,14 +1468,13 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
         if (!region)
                 return -ENOMEM;
 
-        new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
+        new = vm_area_dup(vma);
         if (!new) {
                 kmem_cache_free(vm_region_jar, region);
                 return -ENOMEM;
         }
 
         /* most fields are the same, copy all, and then fixup */
-        *new = *vma;
         *region = *vma->vm_region;
         new->vm_region = region;
 
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 5d800d61ddb7..a790ef4be74e 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6383,7 +6383,7 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size,
         free_area_init_core(pgdat);
 }
 
-#ifdef CONFIG_HAVE_MEMBLOCK
+#if defined(CONFIG_HAVE_MEMBLOCK) && !defined(CONFIG_FLAT_NODE_MEM_MAP)
 /*
  * Only struct pages that are backed by physical memory are zeroed and
  * initialized by going through __init_single_page(). But, there are some
@@ -6421,7 +6421,7 @@ void __paginginit zero_resv_unavail(void)
         if (pgcnt)
                 pr_info("Reserved but unavailable: %lld pages", pgcnt);
 }
-#endif /* CONFIG_HAVE_MEMBLOCK */
+#endif /* CONFIG_HAVE_MEMBLOCK && !CONFIG_FLAT_NODE_MEM_MAP */
 
 #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
 
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index be09a9883825..73bf6a93a3cf 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -2732,7 +2732,7 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
 {
         struct batadv_neigh_ifinfo *router_ifinfo = NULL;
         struct batadv_neigh_node *router;
-        struct batadv_gw_node *curr_gw;
+        struct batadv_gw_node *curr_gw = NULL;
         int ret = 0;
         void *hdr;
 
@@ -2780,6 +2780,8 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
         ret = 0;
 
 out:
+        if (curr_gw)
+                batadv_gw_node_put(curr_gw);
         if (router_ifinfo)
                 batadv_neigh_ifinfo_put(router_ifinfo);
         if (router)
diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
index ec93337ee259..6baec4e68898 100644
--- a/net/batman-adv/bat_v.c
+++ b/net/batman-adv/bat_v.c
@@ -927,7 +927,7 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
 {
         struct batadv_neigh_ifinfo *router_ifinfo = NULL;
         struct batadv_neigh_node *router;
-        struct batadv_gw_node *curr_gw;
+        struct batadv_gw_node *curr_gw = NULL;
         int ret = 0;
         void *hdr;
 
@@ -995,6 +995,8 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
         ret = 0;
 
 out:
+        if (curr_gw)
+                batadv_gw_node_put(curr_gw);
         if (router_ifinfo)
                 batadv_neigh_ifinfo_put(router_ifinfo);
         if (router)
diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c
index 4229b01ac7b5..87479c60670e 100644
--- a/net/batman-adv/debugfs.c
+++ b/net/batman-adv/debugfs.c
@@ -19,6 +19,7 @@
 #include "debugfs.h"
 #include "main.h"
 
+#include <linux/dcache.h>
 #include <linux/debugfs.h>
 #include <linux/err.h>
 #include <linux/errno.h>
@@ -344,6 +345,25 @@ out:
 }
 
 /**
+ * batadv_debugfs_rename_hardif() - Fix debugfs path for renamed hardif
+ * @hard_iface: hard interface which was renamed
+ */
+void batadv_debugfs_rename_hardif(struct batadv_hard_iface *hard_iface)
+{
+        const char *name = hard_iface->net_dev->name;
+        struct dentry *dir;
+        struct dentry *d;
+
+        dir = hard_iface->debug_dir;
+        if (!dir)
+                return;
+
+        d = debugfs_rename(dir->d_parent, dir, dir->d_parent, name);
+        if (!d)
+                pr_err("Can't rename debugfs dir to %s\n", name);
+}
+
+/**
  * batadv_debugfs_del_hardif() - delete the base directory for a hard interface
  *  in debugfs.
  * @hard_iface: hard interface which is deleted.
@@ -414,6 +434,26 @@ out:
 }
 
 /**
+ * batadv_debugfs_rename_meshif() - Fix debugfs path for renamed softif
+ * @dev: net_device which was renamed
+ */
+void batadv_debugfs_rename_meshif(struct net_device *dev)
+{
+        struct batadv_priv *bat_priv = netdev_priv(dev);
+        const char *name = dev->name;
+        struct dentry *dir;
+        struct dentry *d;
+
+        dir = bat_priv->debug_dir;
+        if (!dir)
+                return;
+
+        d = debugfs_rename(dir->d_parent, dir, dir->d_parent, name);
+        if (!d)
+                pr_err("Can't rename debugfs dir to %s\n", name);
+}
+
+/**
  * batadv_debugfs_del_meshif() - Remove interface dependent debugfs entries
  * @dev: netdev struct of the soft interface
  */
diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h
index 37b069698b04..08a592ffbee5 100644
--- a/net/batman-adv/debugfs.h
+++ b/net/batman-adv/debugfs.h
@@ -30,8 +30,10 @@ struct net_device;
 void batadv_debugfs_init(void);
 void batadv_debugfs_destroy(void);
 int batadv_debugfs_add_meshif(struct net_device *dev);
+void batadv_debugfs_rename_meshif(struct net_device *dev);
 void batadv_debugfs_del_meshif(struct net_device *dev);
 int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface);
+void batadv_debugfs_rename_hardif(struct batadv_hard_iface *hard_iface);
 void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface);
 
 #else
@@ -49,6 +51,10 @@ static inline int batadv_debugfs_add_meshif(struct net_device *dev)
         return 0;
 }
 
+static inline void batadv_debugfs_rename_meshif(struct net_device *dev)
+{
+}
+
 static inline void batadv_debugfs_del_meshif(struct net_device *dev)
 {
 }
@@ -60,6 +66,11 @@ int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface)
 }
 
 static inline
+void batadv_debugfs_rename_hardif(struct batadv_hard_iface *hard_iface)
+{
+}
+
+static inline
 void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface)
 {
 }
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index c405d15befd6..2f0d42f2f913 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -989,6 +989,32 @@ void batadv_hardif_remove_interfaces(void)
         rtnl_unlock();
 }
 
+/**
+ * batadv_hard_if_event_softif() - Handle events for soft interfaces
+ * @event: NETDEV_* event to handle
+ * @net_dev: net_device which generated an event
+ *
+ * Return: NOTIFY_* result
+ */
+static int batadv_hard_if_event_softif(unsigned long event,
+                                       struct net_device *net_dev)
+{
+        struct batadv_priv *bat_priv;
+
+        switch (event) {
+        case NETDEV_REGISTER:
+                batadv_sysfs_add_meshif(net_dev);
+                bat_priv = netdev_priv(net_dev);
+                batadv_softif_create_vlan(bat_priv, BATADV_NO_FLAGS);
+                break;
+        case NETDEV_CHANGENAME:
+                batadv_debugfs_rename_meshif(net_dev);
+                break;
+        }
+
+        return NOTIFY_DONE;
+}
+
 static int batadv_hard_if_event(struct notifier_block *this,
                                 unsigned long event, void *ptr)
 {
@@ -997,12 +1023,8 @@ static int batadv_hard_if_event(struct notifier_block *this,
         struct batadv_hard_iface *primary_if = NULL;
         struct batadv_priv *bat_priv;
 
-        if (batadv_softif_is_valid(net_dev) && event == NETDEV_REGISTER) {
-                batadv_sysfs_add_meshif(net_dev);
-                bat_priv = netdev_priv(net_dev);
-                batadv_softif_create_vlan(bat_priv, BATADV_NO_FLAGS);
-                return NOTIFY_DONE;
-        }
+        if (batadv_softif_is_valid(net_dev))
+                return batadv_hard_if_event_softif(event, net_dev);
 
         hard_iface = batadv_hardif_get_by_netdev(net_dev);
         if (!hard_iface && (event == NETDEV_REGISTER ||
@@ -1051,6 +1073,9 @@ static int batadv_hard_if_event(struct notifier_block *this,
                 if (batadv_is_wifi_hardif(hard_iface))
                         hard_iface->num_bcasts = BATADV_NUM_BCASTS_WIRELESS;
                 break;
+        case NETDEV_CHANGENAME:
+                batadv_debugfs_rename_hardif(hard_iface);
+                break;
         default:
                 break;
         }
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 3986551397ca..12a2b7d21376 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -1705,7 +1705,9 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv,
                 ether_addr_copy(common->addr, tt_addr);
                 common->vid = vid;
 
-                common->flags = flags;
+                if (!is_multicast_ether_addr(common->addr))
+                        common->flags = flags & (~BATADV_TT_SYNC_MASK);
+
                 tt_global_entry->roam_at = 0;
                 /* node must store current time in case of roaming. This is
                  * needed to purge this entry out on timeout (if nobody claims
@@ -1768,7 +1770,8 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv,
                  * TT_CLIENT_TEMP, therefore they have to be copied in the
                  * client entry
                  */
-                common->flags |= flags & (~BATADV_TT_SYNC_MASK);
+                if (!is_multicast_ether_addr(common->addr))
+                        common->flags |= flags & (~BATADV_TT_SYNC_MASK);
 
                 /* If there is the BATADV_TT_CLIENT_ROAM flag set, there is only
                  * one originator left in the list and we previously received a
diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c
index 68c3578343b4..22a78eedf4b1 100644
--- a/net/bpf/test_run.c
+++ b/net/bpf/test_run.c
@@ -96,6 +96,7 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,
         u32 size = kattr->test.data_size_in;
         u32 repeat = kattr->test.repeat;
         u32 retval, duration;
+        int hh_len = ETH_HLEN;
         struct sk_buff *skb;
         void *data;
         int ret;
@@ -131,12 +132,22 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,
         skb_reset_network_header(skb);
 
         if (is_l2)
-                __skb_push(skb, ETH_HLEN);
+                __skb_push(skb, hh_len);
         if (is_direct_pkt_access)
                 bpf_compute_data_pointers(skb);
         retval = bpf_test_run(prog, skb, repeat, &duration);
-        if (!is_l2)
-                __skb_push(skb, ETH_HLEN);
+        if (!is_l2) {
+                if (skb_headroom(skb) < hh_len) {
+                        int nhead = HH_DATA_ALIGN(hh_len - skb_headroom(skb));
+
+                        if (pskb_expand_head(skb, nhead, 0, GFP_USER)) {
+                                kfree_skb(skb);
+                                return -ENOMEM;
+                        }
+                }
+                memset(__skb_push(skb, hh_len), 0, hh_len);
+        }
+
         size = skb->len;
         /* bpf program can never convert linear skb to non-linear */
         if (WARN_ON_ONCE(skb_is_nonlinear(skb)))
diff --git a/net/core/filter.c b/net/core/filter.c
index 0ca6907d7efe..06da770f543f 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -459,11 +459,21 @@ static bool convert_bpf_ld_abs(struct sock_filter *fp, struct bpf_insn **insnp)
              (!unaligned_ok && offset >= 0 &&
               offset + ip_align >= 0 &&
               offset + ip_align % size == 0))) {
+                bool ldx_off_ok = offset <= S16_MAX;
+
                 *insn++ = BPF_MOV64_REG(BPF_REG_TMP, BPF_REG_H);
                 *insn++ = BPF_ALU64_IMM(BPF_SUB, BPF_REG_TMP, offset);
-                *insn++ = BPF_JMP_IMM(BPF_JSLT, BPF_REG_TMP, size, 2 + endian);
-                *insn++ = BPF_LDX_MEM(BPF_SIZE(fp->code), BPF_REG_A, BPF_REG_D,
-                                      offset);
+                *insn++ = BPF_JMP_IMM(BPF_JSLT, BPF_REG_TMP,
+                                      size, 2 + endian + (!ldx_off_ok * 2));
+                if (ldx_off_ok) {
+                        *insn++ = BPF_LDX_MEM(BPF_SIZE(fp->code), BPF_REG_A,
+                                              BPF_REG_D, offset);
+                } else {
+                        *insn++ = BPF_MOV64_REG(BPF_REG_TMP, BPF_REG_D);
+                        *insn++ = BPF_ALU64_IMM(BPF_ADD, BPF_REG_TMP, offset);
+                        *insn++ = BPF_LDX_MEM(BPF_SIZE(fp->code), BPF_REG_A,
+                                              BPF_REG_TMP, 0);
+                }
                 if (endian)
                         *insn++ = BPF_ENDIAN(BPF_FROM_BE, BPF_REG_A, size * 8);
                 *insn++ = BPF_JMP_A(8);
@@ -1762,6 +1772,37 @@ static const struct bpf_func_proto bpf_skb_pull_data_proto = {
         .arg2_type      = ARG_ANYTHING,
 };
 
+static inline int sk_skb_try_make_writable(struct sk_buff *skb,
+                                           unsigned int write_len)
+{
+        int err = __bpf_try_make_writable(skb, write_len);
+
+        bpf_compute_data_end_sk_skb(skb);
+        return err;
+}
+
+BPF_CALL_2(sk_skb_pull_data, struct sk_buff *, skb, u32, len)
+{
+        /* Idea is the following: should the needed direct read/write
+         * test fail during runtime, we can pull in more data and redo
+         * again, since implicitly, we invalidate previous checks here.
+         *
+         * Or, since we know how much we need to make read/writeable,
+         * this can be done once at the program beginning for direct
+         * access case. By this we overcome limitations of only current
+         * headroom being accessible.
+         */
+        return sk_skb_try_make_writable(skb, len ? : skb_headlen(skb));
+}
+
+static const struct bpf_func_proto sk_skb_pull_data_proto = {
+        .func           = sk_skb_pull_data,
+        .gpl_only       = false,
+        .ret_type       = RET_INTEGER,
+        .arg1_type      = ARG_PTR_TO_CTX,
+        .arg2_type      = ARG_ANYTHING,
+};
+
 BPF_CALL_5(bpf_l3_csum_replace, struct sk_buff *, skb, u32, offset,
            u64, from, u64, to, u64, flags)
 {
@@ -2779,7 +2820,8 @@ static int bpf_skb_net_shrink(struct sk_buff *skb, u32 len_diff)
 
 static u32 __bpf_skb_max_len(const struct sk_buff *skb)
 {
-        return skb->dev->mtu + skb->dev->hard_header_len;
+        return skb->dev ? skb->dev->mtu + skb->dev->hard_header_len :
+                          SKB_MAX_ALLOC;
 }
 
 static int bpf_skb_adjust_net(struct sk_buff *skb, s32 len_diff)
@@ -2863,8 +2905,8 @@ static int bpf_skb_trim_rcsum(struct sk_buff *skb, unsigned int new_len)
         return __skb_trim_rcsum(skb, new_len);
 }
 
-BPF_CALL_3(bpf_skb_change_tail, struct sk_buff *, skb, u32, new_len,
-           u64, flags)
+static inline int __bpf_skb_change_tail(struct sk_buff *skb, u32 new_len,
+                                        u64 flags)
 {
         u32 max_len = __bpf_skb_max_len(skb);
         u32 min_len = __bpf_skb_min_len(skb);
@@ -2900,6 +2942,13 @@ BPF_CALL_3(bpf_skb_change_tail, struct sk_buff *, skb, u32, new_len,
                 if (!ret && skb_is_gso(skb))
                         skb_gso_reset(skb);
         }
+        return ret;
+}
+
+BPF_CALL_3(bpf_skb_change_tail, struct sk_buff *, skb, u32, new_len,
+           u64, flags)
+{
+        int ret = __bpf_skb_change_tail(skb, new_len, flags);
 
         bpf_compute_data_pointers(skb);
         return ret;
@@ -2914,9 +2963,27 @@ static const struct bpf_func_proto bpf_skb_change_tail_proto = {
         .arg3_type      = ARG_ANYTHING,
 };
 
-BPF_CALL_3(bpf_skb_change_head, struct sk_buff *, skb, u32, head_room,
+BPF_CALL_3(sk_skb_change_tail, struct sk_buff *, skb, u32, new_len,
            u64, flags)
 {
+        int ret = __bpf_skb_change_tail(skb, new_len, flags);
+
+        bpf_compute_data_end_sk_skb(skb);
+        return ret;
+}
+
+static const struct bpf_func_proto sk_skb_change_tail_proto = {
+        .func           = sk_skb_change_tail,
+        .gpl_only       = false,
+        .ret_type       = RET_INTEGER,
+        .arg1_type      = ARG_PTR_TO_CTX,
+        .arg2_type      = ARG_ANYTHING,
+        .arg3_type      = ARG_ANYTHING,
+};
+
+static inline int __bpf_skb_change_head(struct sk_buff *skb, u32 head_room,
+                                        u64 flags)
+{
         u32 max_len = __bpf_skb_max_len(skb);
         u32 new_len = skb->len + head_room;
         int ret;
@@ -2941,8 +3008,16 @@ BPF_CALL_3(bpf_skb_change_head, struct sk_buff *, skb, u32, head_room,
                 skb_reset_mac_header(skb);
         }
 
+        return ret;
+}
+
+BPF_CALL_3(bpf_skb_change_head, struct sk_buff *, skb, u32, head_room,
+           u64, flags)
+{
+        int ret = __bpf_skb_change_head(skb, head_room, flags);
+
         bpf_compute_data_pointers(skb);
-        return 0;
+        return ret;
 }
 
 static const struct bpf_func_proto bpf_skb_change_head_proto = {
@@ -2954,6 +3029,23 @@ static const struct bpf_func_proto bpf_skb_change_head_proto = {
         .arg3_type      = ARG_ANYTHING,
 };
 
+BPF_CALL_3(sk_skb_change_head, struct sk_buff *, skb, u32, head_room,
+           u64, flags)
+{
+        int ret = __bpf_skb_change_head(skb, head_room, flags);
+
+        bpf_compute_data_end_sk_skb(skb);
+        return ret;
+}
+
+static const struct bpf_func_proto sk_skb_change_head_proto = {
+        .func           = sk_skb_change_head,
+        .gpl_only       = false,
+        .ret_type       = RET_INTEGER,
+        .arg1_type      = ARG_PTR_TO_CTX,
+        .arg2_type      = ARG_ANYTHING,
+        .arg3_type      = ARG_ANYTHING,
+};
 static unsigned long xdp_get_metalen(const struct xdp_buff *xdp)
 {
         return xdp_data_meta_unsupported(xdp) ? 0 :
@@ -3046,12 +3138,16 @@ static int __bpf_tx_xdp(struct net_device *dev,
                         u32 index)
 {
         struct xdp_frame *xdpf;
-        int sent;
+        int err, sent;
 
         if (!dev->netdev_ops->ndo_xdp_xmit) {
                 return -EOPNOTSUPP;
         }
 
+        err = xdp_ok_fwd_dev(dev, xdp->data_end - xdp->data);
+        if (unlikely(err))
+                return err;
+
         xdpf = convert_to_xdp_frame(xdp);
         if (unlikely(!xdpf))
                 return -EOVERFLOW;
@@ -3285,7 +3381,8 @@ int xdp_do_generic_redirect(struct net_device *dev, struct sk_buff *skb,
                 goto err;
         }
 
-        if (unlikely((err = __xdp_generic_ok_fwd_dev(skb, fwd))))
+        err = xdp_ok_fwd_dev(fwd, skb->len);
+        if (unlikely(err))
                 goto err;
 
         skb->dev = fwd;
@@ -4439,10 +4536,10 @@ static const struct bpf_func_proto bpf_lwt_push_encap_proto = {
         .arg4_type      = ARG_CONST_SIZE
 };
 
+#if IS_ENABLED(CONFIG_IPV6_SEG6_BPF)
 BPF_CALL_4(bpf_lwt_seg6_store_bytes, struct sk_buff *, skb, u32, offset,
            const void *, from, u32, len)
 {
-#if IS_ENABLED(CONFIG_IPV6_SEG6_BPF)
         struct seg6_bpf_srh_state *srh_state =
                 this_cpu_ptr(&seg6_bpf_srh_states);
         void *srh_tlvs, *srh_end, *ptr;
@@ -4468,9 +4565,6 @@ BPF_CALL_4(bpf_lwt_seg6_store_bytes, struct sk_buff *, skb, u32, offset,
 
         memcpy(skb->data + offset, from, len);
         return 0;
-#else /* CONFIG_IPV6_SEG6_BPF */
-        return -EOPNOTSUPP;
-#endif
 }
 
 static const struct bpf_func_proto bpf_lwt_seg6_store_bytes_proto = {
@@ -4486,7 +4580,6 @@ static const struct bpf_func_proto bpf_lwt_seg6_store_bytes_proto = {
 BPF_CALL_4(bpf_lwt_seg6_action, struct sk_buff *, skb,
            u32, action, void *, param, u32, param_len)
 {
-#if IS_ENABLED(CONFIG_IPV6_SEG6_BPF)
         struct seg6_bpf_srh_state *srh_state =
                 this_cpu_ptr(&seg6_bpf_srh_states);
         struct ipv6_sr_hdr *srh;
@@ -4534,9 +4627,6 @@ BPF_CALL_4(bpf_lwt_seg6_action, struct sk_buff *, skb,
         default:
                 return -EINVAL;
         }
-#else /* CONFIG_IPV6_SEG6_BPF */
-        return -EOPNOTSUPP;
-#endif
 }
 
 static const struct bpf_func_proto bpf_lwt_seg6_action_proto = {
@@ -4552,7 +4642,6 @@ static const struct bpf_func_proto bpf_lwt_seg6_action_proto = {
 BPF_CALL_3(bpf_lwt_seg6_adjust_srh, struct sk_buff *, skb, u32, offset,
            s32, len)
 {
-#if IS_ENABLED(CONFIG_IPV6_SEG6_BPF)
         struct seg6_bpf_srh_state *srh_state =
                 this_cpu_ptr(&seg6_bpf_srh_states);
         void *srh_end, *srh_tlvs, *ptr;
@@ -4596,9 +4685,6 @@ BPF_CALL_3(bpf_lwt_seg6_adjust_srh, struct sk_buff *, skb, u32, offset,
         srh_state->hdrlen += len;
         srh_state->valid = 0;
         return 0;
-#else /* CONFIG_IPV6_SEG6_BPF */
-        return -EOPNOTSUPP;
-#endif
 }
 
 static const struct bpf_func_proto bpf_lwt_seg6_adjust_srh_proto = {
@@ -4609,6 +4695,7 @@ static const struct bpf_func_proto bpf_lwt_seg6_adjust_srh_proto = {
         .arg2_type      = ARG_ANYTHING,
         .arg3_type      = ARG_ANYTHING,
 };
+#endif /* CONFIG_IPV6_SEG6_BPF */
 
 bool bpf_helper_changes_pkt_data(void *func)
 {
@@ -4617,9 +4704,12 @@ bool bpf_helper_changes_pkt_data(void *func)
             func == bpf_skb_store_bytes ||
             func == bpf_skb_change_proto ||
             func == bpf_skb_change_head ||
+            func == sk_skb_change_head ||
             func == bpf_skb_change_tail ||
+            func == sk_skb_change_tail ||
             func == bpf_skb_adjust_room ||
             func == bpf_skb_pull_data ||
+            func == sk_skb_pull_data ||
             func == bpf_clone_redirect ||
             func == bpf_l3_csum_replace ||
             func == bpf_l4_csum_replace ||
@@ -4627,11 +4717,12 @@ bool bpf_helper_changes_pkt_data(void *func)
             func == bpf_xdp_adjust_meta ||
             func == bpf_msg_pull_data ||
             func == bpf_xdp_adjust_tail ||
-            func == bpf_lwt_push_encap ||
+#if IS_ENABLED(CONFIG_IPV6_SEG6_BPF)
             func == bpf_lwt_seg6_store_bytes ||
             func == bpf_lwt_seg6_adjust_srh ||
-            func == bpf_lwt_seg6_action
-            )
+            func == bpf_lwt_seg6_action ||
+#endif
+            func == bpf_lwt_push_encap)
                 return true;
 
         return false;
@@ -4871,11 +4962,11 @@ sk_skb_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
         case BPF_FUNC_skb_load_bytes:
                 return &bpf_skb_load_bytes_proto;
         case BPF_FUNC_skb_pull_data:
-                return &bpf_skb_pull_data_proto;
+                return &sk_skb_pull_data_proto;
         case BPF_FUNC_skb_change_tail:
-                return &bpf_skb_change_tail_proto;
+                return &sk_skb_change_tail_proto;
         case BPF_FUNC_skb_change_head:
-                return &bpf_skb_change_head_proto;
+                return &sk_skb_change_head_proto;
         case BPF_FUNC_get_socket_cookie:
                 return &bpf_get_socket_cookie_proto;
         case BPF_FUNC_get_socket_uid:
@@ -4966,12 +5057,14 @@ static const struct bpf_func_proto *
 lwt_seg6local_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
 {
         switch (func_id) {
+#if IS_ENABLED(CONFIG_IPV6_SEG6_BPF)
         case BPF_FUNC_lwt_seg6_store_bytes:
                 return &bpf_lwt_seg6_store_bytes_proto;
         case BPF_FUNC_lwt_seg6_action:
                 return &bpf_lwt_seg6_action_proto;
         case BPF_FUNC_lwt_seg6_adjust_srh:
                 return &bpf_lwt_seg6_adjust_srh_proto;
+#endif
         default:
                 return lwt_out_func_proto(func_id, prog);
         }
diff --git a/net/core/gen_stats.c b/net/core/gen_stats.c
index b2b2323bdc84..188d693cb251 100644
--- a/net/core/gen_stats.c
+++ b/net/core/gen_stats.c
@@ -77,8 +77,20 @@ gnet_stats_start_copy_compat(struct sk_buff *skb, int type, int tc_stats_type,
                 d->lock = lock;
                 spin_lock_bh(lock);
         }
-        if (d->tail)
-                return gnet_stats_copy(d, type, NULL, 0, padattr);
+        if (d->tail) {
+                int ret = gnet_stats_copy(d, type, NULL, 0, padattr);
+
+                /* The initial attribute added in gnet_stats_copy() may be
+                 * preceded by a padding attribute, in which case d->tail will
+                 * end up pointing at the padding instead of the real attribute.
+                 * Fix this so gnet_stats_finish_copy() adjusts the length of
+                 * the right attribute.
+                 */
+                if (ret == 0 && d->tail->nla_type == padattr)
+                        d->tail = (struct nlattr *)((char *)d->tail +
+                                                    NLA_ALIGN(d->tail->nla_len));
+                return ret;
+        }
 
         return 0;
 }
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index eba8dae22c25..8e51f8555e11 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -858,6 +858,7 @@ static struct sk_buff *__skb_clone(struct sk_buff *n, struct sk_buff *skb)
         n->cloned = 1;
         n->nohdr = 0;
         n->peeked = 0;
+        C(pfmemalloc);
         n->destructor = NULL;
         C(tail);
         C(end);
diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c
index 40c851693f77..0c9478b91fa5 100644
--- a/net/dns_resolver/dns_key.c
+++ b/net/dns_resolver/dns_key.c
@@ -86,35 +86,39 @@ dns_resolver_preparse(struct key_preparsed_payload *prep)
                 opt++;
                 kdebug("options: '%s'", opt);
                 do {
+                        int opt_len, opt_nlen;
                         const char *eq;
-                        int opt_len, opt_nlen, opt_vlen, tmp;
+                        char optval[128];
 
                         next_opt = memchr(opt, '#', end - opt) ?: end;
                         opt_len = next_opt - opt;
-                        if (opt_len <= 0 || opt_len > 128) {
+                        if (opt_len <= 0 || opt_len > sizeof(optval)) {
                                 pr_warn_ratelimited("Invalid option length (%d) for dns_resolver key\n",
                                                     opt_len);
                                 return -EINVAL;
                         }
 
-                        eq = memchr(opt, '=', opt_len) ?: end;
-                        opt_nlen = eq - opt;
-                        eq++;
-                        opt_vlen = next_opt - eq; /* will be -1 if no value */
+                        eq = memchr(opt, '=', opt_len);
+                        if (eq) {
+                                opt_nlen = eq - opt;
+                                eq++;
+                                memcpy(optval, eq, next_opt - eq);
+                                optval[next_opt - eq] = '\0';
+                        } else {
+                                opt_nlen = opt_len;
+                                optval[0] = '\0';
+                        }
 
-                        tmp = opt_vlen >= 0 ? opt_vlen : 0;
-                        kdebug("option '%*.*s' val '%*.*s'",
-                               opt_nlen, opt_nlen, opt, tmp, tmp, eq);
+                        kdebug("option '%*.*s' val '%s'",
+                               opt_nlen, opt_nlen, opt, optval);
 
                         /* see if it's an error number representing a DNS error
                          * that's to be recorded as the result in this key */
                         if (opt_nlen == sizeof(DNS_ERRORNO_OPTION) - 1 &&
                             memcmp(opt, DNS_ERRORNO_OPTION, opt_nlen) == 0) {
                                 kdebug("dns error number option");
-                                if (opt_vlen <= 0)
-                                        goto bad_option_value;
 
-                                ret = kstrtoul(eq, 10, &derrno);
+                                ret = kstrtoul(optval, 10, &derrno);
                                 if (ret < 0)
                                         goto bad_option_value;
 
diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c
index 275449b0d633..3297e7fa9945 100644
--- a/net/ieee802154/6lowpan/core.c
+++ b/net/ieee802154/6lowpan/core.c
@@ -90,12 +90,18 @@ static int lowpan_neigh_construct(struct net_device *dev, struct neighbour *n)
         return 0;
 }
 
+static int lowpan_get_iflink(const struct net_device *dev)
+{
+        return lowpan_802154_dev(dev)->wdev->ifindex;
+}
+
 static const struct net_device_ops lowpan_netdev_ops = {
         .ndo_init               = lowpan_dev_init,
         .ndo_start_xmit         = lowpan_xmit,
         .ndo_open               = lowpan_open,
         .ndo_stop               = lowpan_stop,
         .ndo_neigh_construct    = lowpan_neigh_construct,
+        .ndo_get_iflink         = lowpan_get_iflink,
 };
 
 static void lowpan_setup(struct net_device *ldev)
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index b21833651394..e46cdd310e5f 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -300,6 +300,7 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb)
         if (!ipv4_is_zeronet(ip_hdr(skb)->saddr)) {
                 struct flowi4 fl4 = {
                         .flowi4_iif = LOOPBACK_IFINDEX,
+                        .flowi4_oif = l3mdev_master_ifindex_rcu(dev),
                         .daddr = ip_hdr(skb)->saddr,
                         .flowi4_tos = RT_TOS(ip_hdr(skb)->tos),
                         .flowi4_scope = scope,
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 85b617b655bc..b3c899a630a0 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -1200,13 +1200,14 @@ static void igmpv3_del_delrec(struct in_device *in_dev, struct ip_mc_list *im)
         spin_lock_bh(&im->lock);
         if (pmc) {
                 im->interface = pmc->interface;
-                im->crcount = in_dev->mr_qrv ?: net->ipv4.sysctl_igmp_qrv;
                 im->sfmode = pmc->sfmode;
                 if (pmc->sfmode == MCAST_INCLUDE) {
                         im->tomb = pmc->tomb;
                         im->sources = pmc->sources;
                         for (psf = im->sources; psf; psf = psf->sf_next)
-                                psf->sf_crcount = im->crcount;
+                                psf->sf_crcount = in_dev->mr_qrv ?: net->ipv4.sysctl_igmp_qrv;
+                } else {
+                        im->crcount = in_dev->mr_qrv ?: net->ipv4.sysctl_igmp_qrv;
                 }
                 in_dev_put(pmc->interface);
                 kfree(pmc);
@@ -1288,7 +1289,7 @@ static void igmp_group_dropped(struct ip_mc_list *im)
 #endif
 }
 
-static void igmp_group_added(struct ip_mc_list *im)
+static void igmp_group_added(struct ip_mc_list *im, unsigned int mode)
 {
         struct in_device *in_dev = im->interface;
 #ifdef CONFIG_IP_MULTICAST
@@ -1316,7 +1317,13 @@ static void igmp_group_added(struct ip_mc_list *im)
         }
         /* else, v3 */
 
-        im->crcount = in_dev->mr_qrv ?: net->ipv4.sysctl_igmp_qrv;
+        /* Based on RFC3376 5.1, for newly added INCLUDE SSM, we should
+         * not send filter-mode change record as the mode should be from
+         * IN() to IN(A).
+         */
+        if (mode == MCAST_EXCLUDE)
+                im->crcount = in_dev->mr_qrv ?: net->ipv4.sysctl_igmp_qrv;
+
         igmp_ifc_event(in_dev);
 #endif
 }
@@ -1381,8 +1388,7 @@ static void ip_mc_hash_remove(struct in_device *in_dev,
 /*
  *      A socket has joined a multicast group on device dev.
  */
-
-void ip_mc_inc_group(struct in_device *in_dev, __be32 addr)
+void __ip_mc_inc_group(struct in_device *in_dev, __be32 addr, unsigned int mode)
 {
         struct ip_mc_list *im;
 #ifdef CONFIG_IP_MULTICAST
@@ -1394,7 +1400,7 @@ void ip_mc_inc_group(struct in_device *in_dev, __be32 addr)
         for_each_pmc_rtnl(in_dev, im) {
                 if (im->multiaddr == addr) {
                         im->users++;
-                        ip_mc_add_src(in_dev, &addr, MCAST_EXCLUDE, 0, NULL, 0);
+                        ip_mc_add_src(in_dev, &addr, mode, 0, NULL, 0);
                         goto out;
                 }
         }
@@ -1408,8 +1414,8 @@ void ip_mc_inc_group(struct in_device *in_dev, __be32 addr)
         in_dev_hold(in_dev);
         im->multiaddr = addr;
         /* initial mode is (EX, empty) */
-        im->sfmode = MCAST_EXCLUDE;
-        im->sfcount[MCAST_EXCLUDE] = 1;
+        im->sfmode = mode;
+        im->sfcount[mode] = 1;
         refcount_set(&im->refcnt, 1);
         spin_lock_init(&im->lock);
 #ifdef CONFIG_IP_MULTICAST
@@ -1426,12 +1432,17 @@ void ip_mc_inc_group(struct in_device *in_dev, __be32 addr)
 #ifdef CONFIG_IP_MULTICAST
         igmpv3_del_delrec(in_dev, im);
 #endif
-        igmp_group_added(im);
+        igmp_group_added(im, mode);
         if (!in_dev->dead)
                 ip_rt_multicast_event(in_dev);
 out:
         return;
 }
+
+void ip_mc_inc_group(struct in_device *in_dev, __be32 addr)
+{
+        __ip_mc_inc_group(in_dev, addr, MCAST_EXCLUDE);
+}
 EXPORT_SYMBOL(ip_mc_inc_group);
 
 static int ip_mc_check_iphdr(struct sk_buff *skb)
@@ -1688,7 +1699,7 @@ void ip_mc_remap(struct in_device *in_dev)
 #ifdef CONFIG_IP_MULTICAST
                 igmpv3_del_delrec(in_dev, pmc);
 #endif
-                igmp_group_added(pmc);
+                igmp_group_added(pmc, pmc->sfmode);
         }
 }
 
@@ -1751,7 +1762,7 @@ void ip_mc_up(struct in_device *in_dev)
 #ifdef CONFIG_IP_MULTICAST
                 igmpv3_del_delrec(in_dev, pmc);
 #endif
-                igmp_group_added(pmc);
+                igmp_group_added(pmc, pmc->sfmode);
         }
 }
 
@@ -2130,8 +2141,8 @@ static void ip_mc_clear_src(struct ip_mc_list *pmc)
 
 /* Join a multicast group
  */
-
-int ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr)
+static int __ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr,
+                              unsigned int mode)
 {
         __be32 addr = imr->imr_multiaddr.s_addr;
         struct ip_mc_socklist *iml, *i;
@@ -2172,15 +2183,30 @@ int ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr)
         memcpy(&iml->multi, imr, sizeof(*imr));
         iml->next_rcu = inet->mc_list;
         iml->sflist = NULL;
-        iml->sfmode = MCAST_EXCLUDE;
+        iml->sfmode = mode;
         rcu_assign_pointer(inet->mc_list, iml);
-        ip_mc_inc_group(in_dev, addr);
+        __ip_mc_inc_group(in_dev, addr, mode);
         err = 0;
 done:
         return err;
 }
+
+/* Join ASM (Any-Source Multicast) group
+ */
+int ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr)
+{
+        return __ip_mc_join_group(sk, imr, MCAST_EXCLUDE);
+}
 EXPORT_SYMBOL(ip_mc_join_group);
 
+/* Join SSM (Source-Specific Multicast) group
+ */
+int ip_mc_join_group_ssm(struct sock *sk, struct ip_mreqn *imr,
+                         unsigned int mode)
+{
+        return __ip_mc_join_group(sk, imr, mode);
+}
+
 static int ip_mc_leave_src(struct sock *sk, struct ip_mc_socklist *iml,
                            struct in_device *in_dev)
 {
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index c9e35b81d093..1e4cf3ab560f 100644
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -90,7 +90,7 @@ static void inet_frags_free_cb(void *ptr, void *arg)
 
 void inet_frags_exit_net(struct netns_frags *nf)
 {
-        nf->low_thresh = 0; /* prevent creation of new frags */
+        nf->high_thresh = 0; /* prevent creation of new frags */
 
         rhashtable_free_and_destroy(&nf->rhashtable, inet_frags_free_cb, NULL);
 }
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index fc32fdbeefa6..64c76dcf7386 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -984,7 +984,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                         mreq.imr_multiaddr.s_addr = mreqs.imr_multiaddr;
                         mreq.imr_address.s_addr = mreqs.imr_interface;
                         mreq.imr_ifindex = 0;
-                        err = ip_mc_join_group(sk, &mreq);
+                        err = ip_mc_join_group_ssm(sk, &mreq, MCAST_INCLUDE);
                         if (err && err != -EADDRINUSE)
                                 break;
                         omode = MCAST_INCLUDE;
@@ -1061,7 +1061,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                         mreq.imr_multiaddr = psin->sin_addr;
                         mreq.imr_address.s_addr = 0;
                         mreq.imr_ifindex = greqs.gsr_interface;
-                        err = ip_mc_join_group(sk, &mreq);
+                        err = ip_mc_join_group_ssm(sk, &mreq, MCAST_INCLUDE);
                         if (err && err != -EADDRINUSE)
                                 break;
                         greqs.gsr_interface = mreq.imr_ifindex;
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index ca0dad90803a..e77872c93c20 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -1898,6 +1898,7 @@ static struct xt_match ipt_builtin_mt[] __read_mostly = {
                 .checkentry = icmp_checkentry,
                 .proto      = IPPROTO_ICMP,
                 .family     = NFPROTO_IPV4,
+                .me         = THIS_MODULE,
         },
 };
 
diff --git a/net/ipv4/netfilter/nf_tproxy_ipv4.c b/net/ipv4/netfilter/nf_tproxy_ipv4.c
index 805e83ec3ad9..164714104965 100644
--- a/net/ipv4/netfilter/nf_tproxy_ipv4.c
+++ b/net/ipv4/netfilter/nf_tproxy_ipv4.c
@@ -37,7 +37,7 @@ nf_tproxy_handle_time_wait4(struct net *net, struct sk_buff *skb,
                  * to a listener socket if there's one */
                 struct sock *sk2;
 
-                sk2 = nf_tproxy_get_sock_v4(net, skb, hp, iph->protocol,
+                sk2 = nf_tproxy_get_sock_v4(net, skb, iph->protocol,
                                             iph->saddr, laddr ? laddr : iph->daddr,
                                             hp->source, lport ? lport : hp->dest,
                                             skb->dev, NF_TPROXY_LOOKUP_LISTENER);
@@ -71,7 +71,7 @@ __be32 nf_tproxy_laddr4(struct sk_buff *skb, __be32 user_laddr, __be32 daddr)
 EXPORT_SYMBOL_GPL(nf_tproxy_laddr4);
 
 struct sock *
-nf_tproxy_get_sock_v4(struct net *net, struct sk_buff *skb, void *hp,
+nf_tproxy_get_sock_v4(struct net *net, struct sk_buff *skb,
                       const u8 protocol,
                       const __be32 saddr, const __be32 daddr,
                       const __be16 sport, const __be16 dport,
@@ -79,16 +79,21 @@ nf_tproxy_get_sock_v4(struct net *net, struct sk_buff *skb, void *hp,
                       const enum nf_tproxy_lookup_t lookup_type)
 {
         struct sock *sk;
-        struct tcphdr *tcph;
 
         switch (protocol) {
-        case IPPROTO_TCP:
+        case IPPROTO_TCP: {
+                struct tcphdr _hdr, *hp;
+
+                hp = skb_header_pointer(skb, ip_hdrlen(skb),
+                                        sizeof(struct tcphdr), &_hdr);
+                if (hp == NULL)
+                        return NULL;
+
                 switch (lookup_type) {
                 case NF_TPROXY_LOOKUP_LISTENER:
-                        tcph = hp;
                         sk = inet_lookup_listener(net, &tcp_hashinfo, skb,
                                                     ip_hdrlen(skb) +
-                                                      __tcp_hdrlen(tcph),
+                                                      __tcp_hdrlen(hp),
                                                     saddr, sport,
                                                     daddr, dport,
                                                     in->ifindex, 0);
@@ -110,6 +115,7 @@ nf_tproxy_get_sock_v4(struct net *net, struct sk_buff *skb, void *hp,
                         BUG();
                 }
                 break;
+                }
         case IPPROTO_UDP:
                 sk = udp4_lib_lookup(net, saddr, sport, daddr, dport,
                                      in->ifindex);
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index af0a857d8352..5fa335fd3852 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -189,8 +189,9 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
         if (write && ret == 0) {
                 low = make_kgid(user_ns, urange[0]);
                 high = make_kgid(user_ns, urange[1]);
-                if (!gid_valid(low) || !gid_valid(high) ||
-                    (urange[1] < urange[0]) || gid_lt(high, low)) {
+                if (!gid_valid(low) || !gid_valid(high))
+                        return -EINVAL;
+                if (urange[1] < urange[0] || gid_lt(high, low)) {
                         low = make_kgid(&init_user_ns, 1);
                         high = make_kgid(&init_user_ns, 0);
                 }
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index e7b53d2a971f..4491faf83f4f 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1998,7 +1998,7 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,
                          * shouldn't happen.
                          */
                         if (WARN(before(*seq, TCP_SKB_CB(skb)->seq),
-                                 "recvmsg bug: copied %X seq %X rcvnxt %X fl %X\n",
+                                 "TCP recvmsg seq # bug: copied %X, seq %X, rcvnxt %X, fl %X\n",
                                  *seq, TCP_SKB_CB(skb)->seq, tp->rcv_nxt,
                                  flags))
                                 break;
@@ -2013,7 +2013,7 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,
                         if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN)
                                 goto found_fin_ok;
                         WARN(!(flags & MSG_PEEK),
-                             "recvmsg bug 2: copied %X seq %X rcvnxt %X fl %X\n",
+                             "TCP recvmsg seq # bug 2: copied %X, seq %X, rcvnxt %X, fl %X\n",
                              *seq, TCP_SKB_CB(skb)->seq, tp->rcv_nxt, flags);
                 }
 
@@ -2562,6 +2562,8 @@ int tcp_disconnect(struct sock *sk, int flags)
 
         tcp_clear_xmit_timers(sk);
         __skb_queue_purge(&sk->sk_receive_queue);
+        tp->copied_seq = tp->rcv_nxt;
+        tp->urg_data = 0;
         tcp_write_queue_purge(sk);
         tcp_fastopen_active_disable_ofo_check(sk);
         skb_rbtree_purge(&tp->out_of_order_queue);
@@ -2821,14 +2823,17 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
         case TCP_REPAIR:
                 if (!tcp_can_repair_sock(sk))
                         err = -EPERM;
-                else if (val == 1) {
+                else if (val == TCP_REPAIR_ON) {
                         tp->repair = 1;
                         sk->sk_reuse = SK_FORCE_REUSE;
                         tp->repair_queue = TCP_NO_QUEUE;
-                } else if (val == 0) {
+                } else if (val == TCP_REPAIR_OFF) {
                         tp->repair = 0;
                         sk->sk_reuse = SK_NO_REUSE;
                         tcp_send_window_probe(sk);
+                } else if (val == TCP_REPAIR_OFF_NO_WP) {
+                        tp->repair = 0;
+                        sk->sk_reuse = SK_NO_REUSE;
                 } else
                         err = -EINVAL;
 
@@ -3720,8 +3725,7 @@ int tcp_abort(struct sock *sk, int err)
                         struct request_sock *req = inet_reqsk(sk);
 
                         local_bh_disable();
-                        inet_csk_reqsk_queue_drop_and_put(req->rsk_listener,
-                                                          req);
+                        inet_csk_reqsk_queue_drop(req->rsk_listener, req);
                         local_bh_enable();
                         return 0;
                 }
diff --git a/net/ipv4/tcp_dctcp.c b/net/ipv4/tcp_dctcp.c
index 5f5e5936760e..5869f89ca656 100644
--- a/net/ipv4/tcp_dctcp.c
+++ b/net/ipv4/tcp_dctcp.c
@@ -55,7 +55,6 @@ struct dctcp {
         u32 dctcp_alpha;
         u32 next_seq;
         u32 ce_state;
-        u32 delayed_ack_reserved;
         u32 loss_cwnd;
 };
 
@@ -96,7 +95,6 @@ static void dctcp_init(struct sock *sk)
 
                 ca->dctcp_alpha = min(dctcp_alpha_on_init, DCTCP_MAX_ALPHA);
 
-                ca->delayed_ack_reserved = 0;
                 ca->loss_cwnd = 0;
                 ca->ce_state = 0;
 
@@ -134,7 +132,8 @@ static void dctcp_ce_state_0_to_1(struct sock *sk)
         /* State has changed from CE=0 to CE=1 and delayed
          * ACK has not sent yet.
          */
-        if (!ca->ce_state && ca->delayed_ack_reserved) {
+        if (!ca->ce_state &&
+            inet_csk(sk)->icsk_ack.pending & ICSK_ACK_TIMER) {
                 u32 tmp_rcv_nxt;
 
                 /* Save current rcv_nxt. */
@@ -164,7 +163,8 @@ static void dctcp_ce_state_1_to_0(struct sock *sk)
         /* State has changed from CE=1 to CE=0 and delayed
          * ACK has not sent yet.
          */
-        if (ca->ce_state && ca->delayed_ack_reserved) {
+        if (ca->ce_state &&
+            inet_csk(sk)->icsk_ack.pending & ICSK_ACK_TIMER) {
                 u32 tmp_rcv_nxt;
 
                 /* Save current rcv_nxt. */
@@ -248,25 +248,6 @@ static void dctcp_state(struct sock *sk, u8 new_state)
         }
 }
 
-static void dctcp_update_ack_reserved(struct sock *sk, enum tcp_ca_event ev)
-{
-        struct dctcp *ca = inet_csk_ca(sk);
-
-        switch (ev) {
-        case CA_EVENT_DELAYED_ACK:
-                if (!ca->delayed_ack_reserved)
-                        ca->delayed_ack_reserved = 1;
-                break;
-        case CA_EVENT_NON_DELAYED_ACK:
-                if (ca->delayed_ack_reserved)
-                        ca->delayed_ack_reserved = 0;
-                break;
-        default:
-                /* Don't care for the rest. */
-                break;
-        }
-}
-
 static void dctcp_cwnd_event(struct sock *sk, enum tcp_ca_event ev)
 {
         switch (ev) {
@@ -276,10 +257,6 @@ static void dctcp_cwnd_event(struct sock *sk, enum tcp_ca_event ev)
         case CA_EVENT_ECN_NO_CE:
                 dctcp_ce_state_1_to_0(sk);
                 break;
-        case CA_EVENT_DELAYED_ACK:
-        case CA_EVENT_NON_DELAYED_ACK:
-                dctcp_update_ack_reserved(sk, ev);
-                break;
         default:
                 /* Don't care for the rest. */
                 break;
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index bea17f1e8302..3b2711e33e4c 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -156,11 +156,24 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp)
          */
         if (tcptw->tw_ts_recent_stamp &&
             (!twp || (reuse && get_seconds() - tcptw->tw_ts_recent_stamp > 1))) {
-                tp->write_seq = tcptw->tw_snd_nxt + 65535 + 2;
-                if (tp->write_seq == 0)
-                        tp->write_seq = 1;
-                tp->rx_opt.ts_recent       = tcptw->tw_ts_recent;
-                tp->rx_opt.ts_recent_stamp = tcptw->tw_ts_recent_stamp;
+                /* In case of repair and re-using TIME-WAIT sockets we still
+                 * want to be sure that it is safe as above but honor the
+                 * sequence numbers and time stamps set as part of the repair
+                 * process.
+                 *
+                 * Without this check re-using a TIME-WAIT socket with TCP
+                 * repair would accumulate a -1 on the repair assigned
+                 * sequence number. The first time it is reused the sequence
+                 * is -1, the second time -2, etc. This fixes that issue
+                 * without appearing to create any others.
+                 */
+                if (likely(!tp->repair)) {
+                        tp->write_seq = tcptw->tw_snd_nxt + 65535 + 2;
+                        if (tp->write_seq == 0)
+                                tp->write_seq = 1;
+                        tp->rx_opt.ts_recent       = tcptw->tw_ts_recent;
+                        tp->rx_opt.ts_recent_stamp = tcptw->tw_ts_recent_stamp;
+                }
                 sock_hold(sktw);
                 return 1;
         }
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 8e08b409c71e..00e5a300ddb9 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -3523,8 +3523,6 @@ void tcp_send_delayed_ack(struct sock *sk)
         int ato = icsk->icsk_ack.ato;
         unsigned long timeout;
 
-        tcp_ca_event(sk, CA_EVENT_DELAYED_ACK);
-
         if (ato > TCP_DELACK_MIN) {
                 const struct tcp_sock *tp = tcp_sk(sk);
                 int max_ato = HZ / 2;
@@ -3581,8 +3579,6 @@ void tcp_send_ack(struct sock *sk)
         if (sk->sk_state == TCP_CLOSE)
                 return;
 
-        tcp_ca_event(sk, CA_EVENT_NON_DELAYED_ACK);
-
         /* We are not putting this on the write queue, so
          * tcp_transmit_skb() will set the ownership to this
          * sock.
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 0eff75525da1..b3885ca22d6f 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -108,6 +108,7 @@ config IPV6_MIP6
 config IPV6_ILA
         tristate "IPv6: Identifier Locator Addressing (ILA)"
         depends on NETFILTER
+        select DST_CACHE
         select LWTUNNEL
         ---help---
           Support for IPv6 Identifier Locator Addressing (ILA).
diff --git a/net/ipv6/calipso.c b/net/ipv6/calipso.c
index 1323b9679cf7..1c0bb9fb76e6 100644
--- a/net/ipv6/calipso.c
+++ b/net/ipv6/calipso.c
@@ -799,8 +799,7 @@ static int calipso_opt_update(struct sock *sk, struct ipv6_opt_hdr *hop)
 {
         struct ipv6_txoptions *old = txopt_get(inet6_sk(sk)), *txopts;
 
-        txopts = ipv6_renew_options_kern(sk, old, IPV6_HOPOPTS,
-                                         hop, hop ? ipv6_optlen(hop) : 0);
+        txopts = ipv6_renew_options(sk, old, IPV6_HOPOPTS, hop);
         txopt_put(old);
         if (IS_ERR(txopts))
                 return PTR_ERR(txopts);
@@ -1222,8 +1221,7 @@ static int calipso_req_setattr(struct request_sock *req,
         if (IS_ERR(new))
                 return PTR_ERR(new);
 
-        txopts = ipv6_renew_options_kern(sk, req_inet->ipv6_opt, IPV6_HOPOPTS,
-                                         new, new ? ipv6_optlen(new) : 0);
+        txopts = ipv6_renew_options(sk, req_inet->ipv6_opt, IPV6_HOPOPTS, new);
 
         kfree(new);
 
@@ -1260,8 +1258,7 @@ static void calipso_req_delattr(struct request_sock *req)
         if (calipso_opt_del(req_inet->ipv6_opt->hopopt, &new))
                 return; /* Nothing to do */
 
-        txopts = ipv6_renew_options_kern(sk, req_inet->ipv6_opt, IPV6_HOPOPTS,
-                                         new, new ? ipv6_optlen(new) : 0);
+        txopts = ipv6_renew_options(sk, req_inet->ipv6_opt, IPV6_HOPOPTS, new);
 
         if (!IS_ERR(txopts)) {
                 txopts = xchg(&req_inet->ipv6_opt, txopts);
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index 5bc2bf3733ab..20291c2036fc 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -1015,29 +1015,21 @@ ipv6_dup_options(struct sock *sk, struct ipv6_txoptions *opt)
 }
 EXPORT_SYMBOL_GPL(ipv6_dup_options);
 
-static int ipv6_renew_option(void *ohdr,
-                             struct ipv6_opt_hdr __user *newopt, int newoptlen,
-                             int inherit,
-                             struct ipv6_opt_hdr **hdr,
-                             char **p)
+static void ipv6_renew_option(int renewtype,
+                              struct ipv6_opt_hdr **dest,
+                              struct ipv6_opt_hdr *old,
+                              struct ipv6_opt_hdr *new,
+                              int newtype, char **p)
 {
-        if (inherit) {
-                if (ohdr) {
-                        memcpy(*p, ohdr, ipv6_optlen((struct ipv6_opt_hdr *)ohdr));
-                        *hdr = (struct ipv6_opt_hdr *)*p;
-                        *p += CMSG_ALIGN(ipv6_optlen(*hdr));
-                }
-        } else {
-                if (newopt) {
-                        if (copy_from_user(*p, newopt, newoptlen))
-                                return -EFAULT;
-                        *hdr = (struct ipv6_opt_hdr *)*p;
-                        if (ipv6_optlen(*hdr) > newoptlen)
-                                return -EINVAL;
-                        *p += CMSG_ALIGN(newoptlen);
-                }
-        }
-        return 0;
+        struct ipv6_opt_hdr *src;
+
+        src = (renewtype == newtype ? new : old);
+        if (!src)
+                return;
+
+        memcpy(*p, src, ipv6_optlen(src));
+        *dest = (struct ipv6_opt_hdr *)*p;
+        *p += CMSG_ALIGN(ipv6_optlen(*dest));
 }
 
 /**
@@ -1063,13 +1055,11 @@ static int ipv6_renew_option(void *ohdr,
  */
 struct ipv6_txoptions *
 ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
-                   int newtype,
-                   struct ipv6_opt_hdr __user *newopt, int newoptlen)
+                   int newtype, struct ipv6_opt_hdr *newopt)
 {
         int tot_len = 0;
         char *p;
         struct ipv6_txoptions *opt2;
-        int err;
 
         if (opt) {
                 if (newtype != IPV6_HOPOPTS && opt->hopopt)
@@ -1082,8 +1072,8 @@ ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
                         tot_len += CMSG_ALIGN(ipv6_optlen(opt->dst1opt));
         }
 
-        if (newopt && newoptlen)
-                tot_len += CMSG_ALIGN(newoptlen);
+        if (newopt)
+                tot_len += CMSG_ALIGN(ipv6_optlen(newopt));
 
         if (!tot_len)
                 return NULL;
@@ -1098,29 +1088,19 @@ ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
         opt2->tot_len = tot_len;
         p = (char *)(opt2 + 1);
 
-        err = ipv6_renew_option(opt ? opt->hopopt : NULL, newopt, newoptlen,
-                                newtype != IPV6_HOPOPTS,
-                                &opt2->hopopt, &p);
-        if (err)
-                goto out;
-
-        err = ipv6_renew_option(opt ? opt->dst0opt : NULL, newopt, newoptlen,
-                                newtype != IPV6_RTHDRDSTOPTS,
-                                &opt2->dst0opt, &p);
-        if (err)
-                goto out;
-
-        err = ipv6_renew_option(opt ? opt->srcrt : NULL, newopt, newoptlen,
-                                newtype != IPV6_RTHDR,
-                                (struct ipv6_opt_hdr **)&opt2->srcrt, &p);
-        if (err)
-                goto out;
-
-        err = ipv6_renew_option(opt ? opt->dst1opt : NULL, newopt, newoptlen,
-                                newtype != IPV6_DSTOPTS,
-                                &opt2->dst1opt, &p);
-        if (err)
-                goto out;
+        ipv6_renew_option(IPV6_HOPOPTS, &opt2->hopopt,
+                          (opt ? opt->hopopt : NULL),
+                          newopt, newtype, &p);
+        ipv6_renew_option(IPV6_RTHDRDSTOPTS, &opt2->dst0opt,
+                          (opt ? opt->dst0opt : NULL),
+                          newopt, newtype, &p);
+        ipv6_renew_option(IPV6_RTHDR,
+                          (struct ipv6_opt_hdr **)&opt2->srcrt,
+                          (opt ? (struct ipv6_opt_hdr *)opt->srcrt : NULL),
+                          newopt, newtype, &p);
+        ipv6_renew_option(IPV6_DSTOPTS, &opt2->dst1opt,
+                          (opt ? opt->dst1opt : NULL),
+                          newopt, newtype, &p);
 
         opt2->opt_nflen = (opt2->hopopt ? ipv6_optlen(opt2->hopopt) : 0) +
                           (opt2->dst0opt ? ipv6_optlen(opt2->dst0opt) : 0) +
@@ -1128,37 +1108,6 @@ ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
         opt2->opt_flen = (opt2->dst1opt ? ipv6_optlen(opt2->dst1opt) : 0);
 
         return opt2;
-out:
-        sock_kfree_s(sk, opt2, opt2->tot_len);
-        return ERR_PTR(err);
-}
-
-/**
- * ipv6_renew_options_kern - replace a specific ext hdr with a new one.
- *
- * @sk: sock from which to allocate memory
- * @opt: original options
- * @newtype: option type to replace in @opt
- * @newopt: new option of type @newtype to replace (kernel-mem)
- * @newoptlen: length of @newopt
- *
- * See ipv6_renew_options().  The difference is that @newopt is
- * kernel memory, rather than user memory.
- */
-struct ipv6_txoptions *
-ipv6_renew_options_kern(struct sock *sk, struct ipv6_txoptions *opt,
-                        int newtype, struct ipv6_opt_hdr *newopt,
-                        int newoptlen)
-{
-        struct ipv6_txoptions *ret_val;
-        const mm_segment_t old_fs = get_fs();
-
-        set_fs(KERNEL_DS);
-        ret_val = ipv6_renew_options(sk, opt, newtype,
-                                     (struct ipv6_opt_hdr __user *)newopt,
-                                     newoptlen);
-        set_fs(old_fs);
-        return ret_val;
 }
 
 struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 1fb2f3118d60..d212738e9d10 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -935,20 +935,19 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct fib6_info *rt,
 {
         struct fib6_info *leaf = rcu_dereference_protected(fn->leaf,
                                     lockdep_is_held(&rt->fib6_table->tb6_lock));
-        enum fib_event_type event = FIB_EVENT_ENTRY_ADD;
-        struct fib6_info *iter = NULL, *match = NULL;
+        struct fib6_info *iter = NULL;
         struct fib6_info __rcu **ins;
+        struct fib6_info __rcu **fallback_ins = NULL;
         int replace = (info->nlh &&
                        (info->nlh->nlmsg_flags & NLM_F_REPLACE));
-        int append = (info->nlh &&
-                       (info->nlh->nlmsg_flags & NLM_F_APPEND));
         int add = (!info->nlh ||
                    (info->nlh->nlmsg_flags & NLM_F_CREATE));
         int found = 0;
+        bool rt_can_ecmp = rt6_qualify_for_ecmp(rt);
         u16 nlflags = NLM_F_EXCL;
         int err;
 
-        if (append)
+        if (info->nlh && (info->nlh->nlmsg_flags & NLM_F_APPEND))
                 nlflags |= NLM_F_APPEND;
 
         ins = &fn->leaf;
@@ -970,8 +969,13 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct fib6_info *rt,
 
                         nlflags &= ~NLM_F_EXCL;
                         if (replace) {
-                                found++;
-                                break;
+                                if (rt_can_ecmp == rt6_qualify_for_ecmp(iter)) {
+                                        found++;
+                                        break;
+                                }
+                                if (rt_can_ecmp)
+                                        fallback_ins = fallback_ins ?: ins;
+                                goto next_iter;
                         }
 
                         if (rt6_duplicate_nexthop(iter, rt)) {
@@ -986,51 +990,71 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct fib6_info *rt,
                                 fib6_metric_set(iter, RTAX_MTU, rt->fib6_pmtu);
                                 return -EEXIST;
                         }
-
-                        /* first route that matches */
-                        if (!match)
-                                match = iter;
+                        /* If we have the same destination and the same metric,
+                         * but not the same gateway, then the route we try to
+                         * add is sibling to this route, increment our counter
+                         * of siblings, and later we will add our route to the
+                         * list.
+                         * Only static routes (which don't have flag
+                         * RTF_EXPIRES) are used for ECMPv6.
+                         *
+                         * To avoid long list, we only had siblings if the
+                         * route have a gateway.
+                         */
+                        if (rt_can_ecmp &&
+                            rt6_qualify_for_ecmp(iter))
+                                rt->fib6_nsiblings++;
                 }
 
                 if (iter->fib6_metric > rt->fib6_metric)
                         break;
 
+next_iter:
                 ins = &iter->fib6_next;
         }
 
+        if (fallback_ins && !found) {
+                /* No ECMP-able route found, replace first non-ECMP one */
+                ins = fallback_ins;
+                iter = rcu_dereference_protected(*ins,
+                                    lockdep_is_held(&rt->fib6_table->tb6_lock));
+                found++;
+        }
+
         /* Reset round-robin state, if necessary */
         if (ins == &fn->leaf)
                 fn->rr_ptr = NULL;
 
         /* Link this route to others same route. */
-        if (append && match) {
+        if (rt->fib6_nsiblings) {
+                unsigned int fib6_nsiblings;
                 struct fib6_info *sibling, *temp_sibling;
 
-                if (rt->fib6_flags & RTF_REJECT) {
-                        NL_SET_ERR_MSG(extack,
-                                       "Can not append a REJECT route");
-                        return -EINVAL;
-                } else if (match->fib6_flags & RTF_REJECT) {
-                        NL_SET_ERR_MSG(extack,
-                                       "Can not append to a REJECT route");
-                        return -EINVAL;
+                /* Find the first route that have the same metric */
+                sibling = leaf;
+                while (sibling) {
+                        if (sibling->fib6_metric == rt->fib6_metric &&
+                            rt6_qualify_for_ecmp(sibling)) {
+                                list_add_tail(&rt->fib6_siblings,
+                                              &sibling->fib6_siblings);
+                                break;
+                        }
+                        sibling = rcu_dereference_protected(sibling->fib6_next,
+                                    lockdep_is_held(&rt->fib6_table->tb6_lock));
                 }
-                event = FIB_EVENT_ENTRY_APPEND;
-                rt->fib6_nsiblings = match->fib6_nsiblings;
-                list_add_tail(&rt->fib6_siblings, &match->fib6_siblings);
-                match->fib6_nsiblings++;
-
                 /* For each sibling in the list, increment the counter of
                  * siblings. BUG() if counters does not match, list of siblings
                  * is broken!
                  */
+                fib6_nsiblings = 0;
                 list_for_each_entry_safe(sibling, temp_sibling,
-                                         &match->fib6_siblings, fib6_siblings) {
+                                         &rt->fib6_siblings, fib6_siblings) {
                         sibling->fib6_nsiblings++;
-                        BUG_ON(sibling->fib6_nsiblings != match->fib6_nsiblings);
+                        BUG_ON(sibling->fib6_nsiblings != rt->fib6_nsiblings);
+                        fib6_nsiblings++;
                 }
-
-                rt6_multipath_rebalance(match);
+                BUG_ON(fib6_nsiblings != rt->fib6_nsiblings);
+                rt6_multipath_rebalance(temp_sibling);
         }
 
         /*
@@ -1043,8 +1067,9 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct fib6_info *rt,
 add:
                 nlflags |= NLM_F_CREATE;
 
-                err = call_fib6_entry_notifiers(info->nl_net, event, rt,
-                                                extack);
+                err = call_fib6_entry_notifiers(info->nl_net,
+                                                FIB_EVENT_ENTRY_ADD,
+                                                rt, extack);
                 if (err)
                         return err;
 
@@ -1062,7 +1087,7 @@ add:
                 }
 
         } else {
-                struct fib6_info *tmp;
+                int nsiblings;
 
                 if (!found) {
                         if (add)
@@ -1077,57 +1102,48 @@ add:
                 if (err)
                         return err;
 
-                /* if route being replaced has siblings, set tmp to
-                 * last one, otherwise tmp is current route. this is
-                 * used to set fib6_next for new route
-                 */
-                if (iter->fib6_nsiblings)
-                        tmp = list_last_entry(&iter->fib6_siblings,
-                                              struct fib6_info,
-                                              fib6_siblings);
-                else
-                        tmp = iter;
-
-                /* insert new route */
                 atomic_inc(&rt->fib6_ref);
                 rcu_assign_pointer(rt->fib6_node, fn);
-                rt->fib6_next = tmp->fib6_next;
+                rt->fib6_next = iter->fib6_next;
                 rcu_assign_pointer(*ins, rt);
-
                 if (!info->skip_notify)
                         inet6_rt_notify(RTM_NEWROUTE, rt, info, NLM_F_REPLACE);
                 if (!(fn->fn_flags & RTN_RTINFO)) {
                         info->nl_net->ipv6.rt6_stats->fib_route_nodes++;
                         fn->fn_flags |= RTN_RTINFO;
                 }
+                nsiblings = iter->fib6_nsiblings;
+                iter->fib6_node = NULL;
+                fib6_purge_rt(iter, fn, info->nl_net);
+                if (rcu_access_pointer(fn->rr_ptr) == iter)
+                        fn->rr_ptr = NULL;
+                fib6_info_release(iter);
 
-                /* delete old route */
-                rt = iter;
-
-                if (rt->fib6_nsiblings) {
-                        struct fib6_info *tmp;
-
+                if (nsiblings) {
                         /* Replacing an ECMP route, remove all siblings */
-                        list_for_each_entry_safe(iter, tmp, &rt->fib6_siblings,
-                                                 fib6_siblings) {
-                                iter->fib6_node = NULL;
-                                fib6_purge_rt(iter, fn, info->nl_net);
-                                if (rcu_access_pointer(fn->rr_ptr) == iter)
-                                        fn->rr_ptr = NULL;
-                                fib6_info_release(iter);
-
-                                rt->fib6_nsiblings--;
-                                info->nl_net->ipv6.rt6_stats->fib_rt_entries--;
+                        ins = &rt->fib6_next;
+                        iter = rcu_dereference_protected(*ins,
+                                    lockdep_is_held(&rt->fib6_table->tb6_lock));
+                        while (iter) {
+                                if (iter->fib6_metric > rt->fib6_metric)
+                                        break;
+                                if (rt6_qualify_for_ecmp(iter)) {
+                                        *ins = iter->fib6_next;
+                                        iter->fib6_node = NULL;
+                                        fib6_purge_rt(iter, fn, info->nl_net);
+                                        if (rcu_access_pointer(fn->rr_ptr) == iter)
+                                                fn->rr_ptr = NULL;
+                                        fib6_info_release(iter);
+                                        nsiblings--;
+                                        info->nl_net->ipv6.rt6_stats->fib_rt_entries--;
+                                } else {
+                                        ins = &iter->fib6_next;
+                                }
+                                iter = rcu_dereference_protected(*ins,
+                                        lockdep_is_held(&rt->fib6_table->tb6_lock));
                         }
+                        WARN_ON(nsiblings != 0);
                 }
-
-                WARN_ON(rt->fib6_nsiblings != 0);
-
-                rt->fib6_node = NULL;
-                fib6_purge_rt(rt, fn, info->nl_net);
-                if (rcu_access_pointer(fn->rr_ptr) == rt)
-                        fn->rr_ptr = NULL;
-                fib6_info_release(rt);
         }
 
         return 0;
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index c8cf2fdbb13b..cd2cfb04e5d8 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -927,7 +927,6 @@ tx_err:
 static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb,
                                          struct net_device *dev)
 {
-        struct ipv6hdr *ipv6h = ipv6_hdr(skb);
         struct ip6_tnl *t = netdev_priv(dev);
         struct dst_entry *dst = skb_dst(skb);
         struct net_device_stats *stats;
@@ -1010,6 +1009,8 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb,
                         goto tx_err;
                 }
         } else {
+                struct ipv6hdr *ipv6h = ipv6_hdr(skb);
+
                 switch (skb->protocol) {
                 case htons(ETH_P_IP):
                         memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 4d780c7f0130..568ca4187cd1 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -398,6 +398,12 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
         case IPV6_DSTOPTS:
         {
                 struct ipv6_txoptions *opt;
+                struct ipv6_opt_hdr *new = NULL;
+
+                /* hop-by-hop / destination options are privileged option */
+                retv = -EPERM;
+                if (optname != IPV6_RTHDR && !ns_capable(net->user_ns, CAP_NET_RAW))
+                        break;
 
                 /* remove any sticky options header with a zero option
                  * length, per RFC3542.
@@ -409,17 +415,22 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
                 else if (optlen < sizeof(struct ipv6_opt_hdr) ||
                          optlen & 0x7 || optlen > 8 * 255)
                         goto e_inval;
-
-                /* hop-by-hop / destination options are privileged option */
-                retv = -EPERM;
-                if (optname != IPV6_RTHDR && !ns_capable(net->user_ns, CAP_NET_RAW))
-                        break;
+                else {
+                        new = memdup_user(optval, optlen);
+                        if (IS_ERR(new)) {
+                                retv = PTR_ERR(new);
+                                break;
+                        }
+                        if (unlikely(ipv6_optlen(new) > optlen)) {
+                                kfree(new);
+                                goto e_inval;
+                        }
+                }
 
                 opt = rcu_dereference_protected(np->opt,
                                                 lockdep_sock_is_held(sk));
-                opt = ipv6_renew_options(sk, opt, optname,
-                                         (struct ipv6_opt_hdr __user *)optval,
-                                         optlen);
+                opt = ipv6_renew_options(sk, opt, optname, new);
+                kfree(new);
                 if (IS_ERR(opt)) {
                         retv = PTR_ERR(opt);
                         break;
@@ -718,8 +729,9 @@ done:
                         struct sockaddr_in6 *psin6;
 
                         psin6 = (struct sockaddr_in6 *)&greqs.gsr_group;
-                        retv = ipv6_sock_mc_join(sk, greqs.gsr_interface,
-                                                 &psin6->sin6_addr);
+                        retv = ipv6_sock_mc_join_ssm(sk, greqs.gsr_interface,
+                                                     &psin6->sin6_addr,
+                                                     MCAST_INCLUDE);
                         /* prior join w/ different source is ok */
                         if (retv && retv != -EADDRINUSE)
                                 break;
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index c0c74088f2af..2699be7202be 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -95,6 +95,8 @@ static int ip6_mc_add_src(struct inet6_dev *idev, const struct in6_addr *pmca,
                           int delta);
 static int ip6_mc_leave_src(struct sock *sk, struct ipv6_mc_socklist *iml,
                             struct inet6_dev *idev);
+static int __ipv6_dev_mc_inc(struct net_device *dev,
+                             const struct in6_addr *addr, unsigned int mode);
 
 #define MLD_QRV_DEFAULT         2
 /* RFC3810, 9.2. Query Interval */
@@ -132,7 +134,8 @@ static int unsolicited_report_interval(struct inet6_dev *idev)
         return iv > 0 ? iv : 1;
 }
 
-int ipv6_sock_mc_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
+static int __ipv6_sock_mc_join(struct sock *sk, int ifindex,
+                               const struct in6_addr *addr, unsigned int mode)
 {
         struct net_device *dev = NULL;
         struct ipv6_mc_socklist *mc_lst;
@@ -179,7 +182,7 @@ int ipv6_sock_mc_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
         }
 
         mc_lst->ifindex = dev->ifindex;
-        mc_lst->sfmode = MCAST_EXCLUDE;
+        mc_lst->sfmode = mode;
         rwlock_init(&mc_lst->sflock);
         mc_lst->sflist = NULL;
 
@@ -187,7 +190,7 @@ int ipv6_sock_mc_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
          *      now add/increase the group membership on the device
          */
 
-        err = ipv6_dev_mc_inc(dev, addr);
+        err = __ipv6_dev_mc_inc(dev, addr, mode);
 
         if (err) {
                 sock_kfree_s(sk, mc_lst, sizeof(*mc_lst));
@@ -199,8 +202,19 @@ int ipv6_sock_mc_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
 
         return 0;
 }
+
+int ipv6_sock_mc_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
+{
+        return __ipv6_sock_mc_join(sk, ifindex, addr, MCAST_EXCLUDE);
+}
 EXPORT_SYMBOL(ipv6_sock_mc_join);
 
+int ipv6_sock_mc_join_ssm(struct sock *sk, int ifindex,
+                          const struct in6_addr *addr, unsigned int mode)
+{
+        return __ipv6_sock_mc_join(sk, ifindex, addr, mode);
+}
+
 /*
  *      socket leave on multicast group
  */
@@ -646,7 +660,7 @@ bool inet6_mc_check(struct sock *sk, const struct in6_addr *mc_addr,
         return rv;
 }
 
-static void igmp6_group_added(struct ifmcaddr6 *mc)
+static void igmp6_group_added(struct ifmcaddr6 *mc, unsigned int mode)
 {
         struct net_device *dev = mc->idev->dev;
         char buf[MAX_ADDR_LEN];
@@ -672,7 +686,13 @@ static void igmp6_group_added(struct ifmcaddr6 *mc)
         }
         /* else v2 */
 
-        mc->mca_crcount = mc->idev->mc_qrv;
+        /* Based on RFC3810 6.1, for newly added INCLUDE SSM, we
+         * should not send filter-mode change record as the mode
+         * should be from IN() to IN(A).
+         */
+        if (mode == MCAST_EXCLUDE)
+                mc->mca_crcount = mc->idev->mc_qrv;
+
         mld_ifc_event(mc->idev);
 }
 
@@ -770,13 +790,14 @@ static void mld_del_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im)
         spin_lock_bh(&im->mca_lock);
         if (pmc) {
                 im->idev = pmc->idev;
-                im->mca_crcount = idev->mc_qrv;
                 im->mca_sfmode = pmc->mca_sfmode;
                 if (pmc->mca_sfmode == MCAST_INCLUDE) {
                         im->mca_tomb = pmc->mca_tomb;
                         im->mca_sources = pmc->mca_sources;
                         for (psf = im->mca_sources; psf; psf = psf->sf_next)
-                                psf->sf_crcount = im->mca_crcount;
+                                psf->sf_crcount = idev->mc_qrv;
+                } else {
+                        im->mca_crcount = idev->mc_qrv;
                 }
                 in6_dev_put(pmc->idev);
                 kfree(pmc);
@@ -831,7 +852,8 @@ static void ma_put(struct ifmcaddr6 *mc)
 }
 
 static struct ifmcaddr6 *mca_alloc(struct inet6_dev *idev,
-                                   const struct in6_addr *addr)
+                                   const struct in6_addr *addr,
+                                   unsigned int mode)
 {
         struct ifmcaddr6 *mc;
 
@@ -849,9 +871,8 @@ static struct ifmcaddr6 *mca_alloc(struct inet6_dev *idev,
         refcount_set(&mc->mca_refcnt, 1);
         spin_lock_init(&mc->mca_lock);
 
-        /* initial mode is (EX, empty) */
-        mc->mca_sfmode = MCAST_EXCLUDE;
-        mc->mca_sfcount[MCAST_EXCLUDE] = 1;
+        mc->mca_sfmode = mode;
+        mc->mca_sfcount[mode] = 1;
 
         if (ipv6_addr_is_ll_all_nodes(&mc->mca_addr) ||
             IPV6_ADDR_MC_SCOPE(&mc->mca_addr) < IPV6_ADDR_SCOPE_LINKLOCAL)
@@ -863,7 +884,8 @@ static struct ifmcaddr6 *mca_alloc(struct inet6_dev *idev,
 /*
  *      device multicast group inc (add if not found)
  */
-int ipv6_dev_mc_inc(struct net_device *dev, const struct in6_addr *addr)
+static int __ipv6_dev_mc_inc(struct net_device *dev,
+                             const struct in6_addr *addr, unsigned int mode)
 {
         struct ifmcaddr6 *mc;
         struct inet6_dev *idev;
@@ -887,14 +909,13 @@ int ipv6_dev_mc_inc(struct net_device *dev, const struct in6_addr *addr)
                 if (ipv6_addr_equal(&mc->mca_addr, addr)) {
                         mc->mca_users++;
                         write_unlock_bh(&idev->lock);
-                        ip6_mc_add_src(idev, &mc->mca_addr, MCAST_EXCLUDE, 0,
-                                NULL, 0);
+                        ip6_mc_add_src(idev, &mc->mca_addr, mode, 0, NULL, 0);
                         in6_dev_put(idev);
                         return 0;
                 }
         }
 
-        mc = mca_alloc(idev, addr);
+        mc = mca_alloc(idev, addr, mode);
         if (!mc) {
                 write_unlock_bh(&idev->lock);
                 in6_dev_put(idev);
@@ -911,11 +932,16 @@ int ipv6_dev_mc_inc(struct net_device *dev, const struct in6_addr *addr)
         write_unlock_bh(&idev->lock);
 
         mld_del_delrec(idev, mc);
-        igmp6_group_added(mc);
+        igmp6_group_added(mc, mode);
         ma_put(mc);
         return 0;
 }
 
+int ipv6_dev_mc_inc(struct net_device *dev, const struct in6_addr *addr)
+{
+        return __ipv6_dev_mc_inc(dev, addr, MCAST_EXCLUDE);
+}
+
 /*
  *      device multicast group del
  */
@@ -1751,7 +1777,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc,
 
                 psf_next = psf->sf_next;
 
-                if (!is_in(pmc, psf, type, gdeleted, sdeleted)) {
+                if (!is_in(pmc, psf, type, gdeleted, sdeleted) && !crsend) {
                         psf_prev = psf;
                         continue;
                 }
@@ -2066,7 +2092,7 @@ static void mld_send_initial_cr(struct inet6_dev *idev)
                 if (pmc->mca_sfcount[MCAST_EXCLUDE])
                         type = MLD2_CHANGE_TO_EXCLUDE;
                 else
-                        type = MLD2_CHANGE_TO_INCLUDE;
+                        type = MLD2_ALLOW_NEW_SOURCES;
                 skb = add_grec(skb, pmc, type, 0, 0, 1);
                 spin_unlock_bh(&pmc->mca_lock);
         }
@@ -2546,7 +2572,7 @@ void ipv6_mc_up(struct inet6_dev *idev)
         ipv6_mc_reset(idev);
         for (i = idev->mc_list; i; i = i->next) {
                 mld_del_delrec(idev, i);
-                igmp6_group_added(i);
+                igmp6_group_added(i, i->mca_sfmode);
         }
         read_unlock_bh(&idev->lock);
 }
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index e640d2f3c55c..0ec273997d1d 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -811,7 +811,7 @@ static void ndisc_recv_ns(struct sk_buff *skb)
                         return;
                 }
         }
-        if (ndopts.nd_opts_nonce)
+        if (ndopts.nd_opts_nonce && ndopts.nd_opts_nonce->nd_opt_len == 1)
                 memcpy(&nonce, (u8 *)(ndopts.nd_opts_nonce + 1), 6);
 
         inc = ipv6_addr_is_multicast(daddr);
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 7eab959734bc..daf2e9e9193d 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -1909,6 +1909,7 @@ static struct xt_match ip6t_builtin_mt[] __read_mostly = {
                 .checkentry = icmp6_checkentry,
                 .proto      = IPPROTO_ICMPV6,
                 .family     = NFPROTO_IPV6,
+                .me         = THIS_MODULE,
         },
 };
 
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index a452d99c9f52..e4d9e6976d3c 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -585,6 +585,8 @@ int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user)
             fq->q.meat == fq->q.len &&
             nf_ct_frag6_reasm(fq, skb, dev))
                 ret = 0;
+        else
+                skb_dst_drop(skb);
 
 out_unlock:
         spin_unlock_bh(&fq->q.lock);
diff --git a/net/ipv6/netfilter/nf_tproxy_ipv6.c b/net/ipv6/netfilter/nf_tproxy_ipv6.c
index bf1d6c421e3b..5dfd33af6451 100644
--- a/net/ipv6/netfilter/nf_tproxy_ipv6.c
+++ b/net/ipv6/netfilter/nf_tproxy_ipv6.c
@@ -55,7 +55,7 @@ nf_tproxy_handle_time_wait6(struct sk_buff *skb, int tproto, int thoff,
                  * to a listener socket if there's one */
                 struct sock *sk2;
 
-                sk2 = nf_tproxy_get_sock_v6(net, skb, thoff, hp, tproto,
+                sk2 = nf_tproxy_get_sock_v6(net, skb, thoff, tproto,
                                             &iph->saddr,
                                             nf_tproxy_laddr6(skb, laddr, &iph->daddr),
                                             hp->source,
@@ -72,7 +72,7 @@ nf_tproxy_handle_time_wait6(struct sk_buff *skb, int tproto, int thoff,
 EXPORT_SYMBOL_GPL(nf_tproxy_handle_time_wait6);
 
 struct sock *
-nf_tproxy_get_sock_v6(struct net *net, struct sk_buff *skb, int thoff, void *hp,
+nf_tproxy_get_sock_v6(struct net *net, struct sk_buff *skb, int thoff,
                       const u8 protocol,
                       const struct in6_addr *saddr, const struct in6_addr *daddr,
                       const __be16 sport, const __be16 dport,
@@ -80,15 +80,20 @@ nf_tproxy_get_sock_v6(struct net *net, struct sk_buff *skb, int thoff, void *hp,
                       const enum nf_tproxy_lookup_t lookup_type)
 {
         struct sock *sk;
-        struct tcphdr *tcph;
 
         switch (protocol) {
-        case IPPROTO_TCP:
+        case IPPROTO_TCP: {
+                struct tcphdr _hdr, *hp;
+
+                hp = skb_header_pointer(skb, thoff,
+                                        sizeof(struct tcphdr), &_hdr);
+                if (hp == NULL)
+                        return NULL;
+
                 switch (lookup_type) {
                 case NF_TPROXY_LOOKUP_LISTENER:
-                        tcph = hp;
                         sk = inet6_lookup_listener(net, &tcp_hashinfo, skb,
-                                                   thoff + __tcp_hdrlen(tcph),
+                                                   thoff + __tcp_hdrlen(hp),
                                                    saddr, sport,
                                                    daddr, ntohs(dport),
                                                    in->ifindex, 0);
@@ -110,6 +115,7 @@ nf_tproxy_get_sock_v6(struct net *net, struct sk_buff *skb, int thoff, void *hp,
                         BUG();
                 }
                 break;
+                }
         case IPPROTO_UDP:
                 sk = udp6_lib_lookup(net, saddr, sport, daddr, dport,
                                      in->ifindex);
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 86a0e4333d42..2ce0bd17de4f 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -3842,7 +3842,7 @@ static struct fib6_info *rt6_multipath_first_sibling(const struct fib6_info *rt)
                         lockdep_is_held(&rt->fib6_table->tb6_lock));
         while (iter) {
                 if (iter->fib6_metric == rt->fib6_metric &&
-                    iter->fib6_nsiblings)
+                    rt6_qualify_for_ecmp(iter))
                         return iter;
                 iter = rcu_dereference_protected(iter->fib6_next,
                                 lockdep_is_held(&rt->fib6_table->tb6_lock));
@@ -4388,6 +4388,13 @@ static int ip6_route_multipath_add(struct fib6_config *cfg,
                         rt = NULL;
                         goto cleanup;
                 }
+                if (!rt6_qualify_for_ecmp(rt)) {
+                        err = -EINVAL;
+                        NL_SET_ERR_MSG(extack,
+                                       "Device only routes can not be added for IPv6 using the multipath API.");
+                        fib6_info_release(rt);
+                        goto cleanup;
+                }
 
                 rt->fib6_nh.nh_weight = rtnh->rtnh_hops + 1;
 
@@ -4439,7 +4446,6 @@ static int ip6_route_multipath_add(struct fib6_config *cfg,
                  */
                 cfg->fc_nlinfo.nlh->nlmsg_flags &= ~(NLM_F_EXCL |
                                                      NLM_F_REPLACE);
-                cfg->fc_nlinfo.nlh->nlmsg_flags |= NLM_F_APPEND;
                 nhn++;
         }
 
diff --git a/net/ipv6/seg6_iptunnel.c b/net/ipv6/seg6_iptunnel.c
index 19ccf0dc996c..a8854dd3e9c5 100644
--- a/net/ipv6/seg6_iptunnel.c
+++ b/net/ipv6/seg6_iptunnel.c
@@ -101,7 +101,7 @@ static __be32 seg6_make_flowlabel(struct net *net, struct sk_buff *skb,
 
         if (do_flowlabel > 0) {
                 hash = skb_get_hash(skb);
-                rol32(hash, 16);
+                hash = rol32(hash, 16);
                 flowlabel = (__force __be32)hash & IPV6_FLOWLABEL_MASK;
         } else if (!do_flowlabel && skb->protocol == htons(ETH_P_IPV6)) {
                 flowlabel = ip6_flowlabel(inner_hdr);
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index dbd7d1fad277..f0a1c536ef15 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -460,6 +460,13 @@ config NF_TABLES
 
 if NF_TABLES
 
+config NF_TABLES_SET
+        tristate "Netfilter nf_tables set infrastructure"
+        help
+          This option enables the nf_tables set infrastructure that allows to
+          look up for elements in a set and to build one-way mappings between
+          matchings and actions.
+
 config NF_TABLES_INET
         depends on IPV6
         select NF_TABLES_IPV4
@@ -493,24 +500,6 @@ config NFT_FLOW_OFFLOAD
           This option adds the "flow_offload" expression that you can use to
           choose what flows are placed into the hardware.
 
-config NFT_SET_RBTREE
-        tristate "Netfilter nf_tables rbtree set module"
-        help
-          This option adds the "rbtree" set type (Red Black tree) that is used
-          to build interval-based sets.
-
-config NFT_SET_HASH
-        tristate "Netfilter nf_tables hash set module"
-        help
-          This option adds the "hash" set type that is used to build one-way
-          mappings between matchings and actions.
-
-config NFT_SET_BITMAP
-        tristate "Netfilter nf_tables bitmap set module"
-        help
-          This option adds the "bitmap" set type that is used to build sets
-          whose keys are smaller or equal to 16 bits.
-
 config NFT_COUNTER
         tristate "Netfilter nf_tables counter module"
         help
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
index 44449389e527..8a76dced974d 100644
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -78,7 +78,11 @@ nf_tables-objs := nf_tables_core.o nf_tables_api.o nft_chain_filter.o \
                   nft_bitwise.o nft_byteorder.o nft_payload.o nft_lookup.o \
                   nft_dynset.o nft_meta.o nft_rt.o nft_exthdr.o
 
+nf_tables_set-objs := nf_tables_set_core.o \
+                      nft_set_hash.o nft_set_bitmap.o nft_set_rbtree.o
+
 obj-$(CONFIG_NF_TABLES)         += nf_tables.o
+obj-$(CONFIG_NF_TABLES_SET)     += nf_tables_set.o
 obj-$(CONFIG_NFT_COMPAT)        += nft_compat.o
 obj-$(CONFIG_NFT_CONNLIMIT)     += nft_connlimit.o
 obj-$(CONFIG_NFT_NUMGEN)        += nft_numgen.o
@@ -91,9 +95,6 @@ obj-$(CONFIG_NFT_QUEUE)		+= nft_queue.o
 obj-$(CONFIG_NFT_QUOTA)         += nft_quota.o
 obj-$(CONFIG_NFT_REJECT)        += nft_reject.o
 obj-$(CONFIG_NFT_REJECT_INET)   += nft_reject_inet.o
-obj-$(CONFIG_NFT_SET_RBTREE)    += nft_set_rbtree.o
-obj-$(CONFIG_NFT_SET_HASH)      += nft_set_hash.o
-obj-$(CONFIG_NFT_SET_BITMAP)    += nft_set_bitmap.o
 obj-$(CONFIG_NFT_COUNTER)       += nft_counter.o
 obj-$(CONFIG_NFT_LOG)           += nft_log.o
 obj-$(CONFIG_NFT_MASQ)          += nft_masq.o
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 3465da2a98bd..3d5280425027 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -2043,7 +2043,7 @@ int nf_conntrack_set_hashsize(const char *val, const struct kernel_param *kp)
                 return -EOPNOTSUPP;
 
         /* On boot, we can set this without any fancy locking. */
-        if (!nf_conntrack_htable_size)
+        if (!nf_conntrack_hash)
                 return param_set_uint(val, kp);
 
         rc = kstrtouint(val, 0, &hashsize);
diff --git a/net/netfilter/nf_tables_set_core.c b/net/netfilter/nf_tables_set_core.c
new file mode 100644
index 000000000000..814789644bd3
--- /dev/null
+++ b/net/netfilter/nf_tables_set_core.c
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <net/netfilter/nf_tables_core.h>
+
+static int __init nf_tables_set_module_init(void)
+{
+        nft_register_set(&nft_set_hash_fast_type);
+        nft_register_set(&nft_set_hash_type);
+        nft_register_set(&nft_set_rhash_type);
+        nft_register_set(&nft_set_bitmap_type);
+        nft_register_set(&nft_set_rbtree_type);
+
+        return 0;
+}
+
+static void __exit nf_tables_set_module_exit(void)
+{
+        nft_unregister_set(&nft_set_rbtree_type);
+        nft_unregister_set(&nft_set_bitmap_type);
+        nft_unregister_set(&nft_set_rhash_type);
+        nft_unregister_set(&nft_set_hash_type);
+        nft_unregister_set(&nft_set_hash_fast_type);
+}
+
+module_init(nf_tables_set_module_init);
+module_exit(nf_tables_set_module_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_NFT_SET();
diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
index 8d1ff654e5af..32535eea51b2 100644
--- a/net/netfilter/nft_compat.c
+++ b/net/netfilter/nft_compat.c
@@ -832,10 +832,18 @@ nft_target_select_ops(const struct nft_ctx *ctx,
         rev = ntohl(nla_get_be32(tb[NFTA_TARGET_REV]));
         family = ctx->family;
 
+        if (strcmp(tg_name, XT_ERROR_TARGET) == 0 ||
+            strcmp(tg_name, XT_STANDARD_TARGET) == 0 ||
+            strcmp(tg_name, "standard") == 0)
+                return ERR_PTR(-EINVAL);
+
         /* Re-use the existing target if it's already loaded. */
         list_for_each_entry(nft_target, &nft_target_list, head) {
                 struct xt_target *target = nft_target->ops.data;
 
+                if (!target->target)
+                        continue;
+
                 if (nft_target_cmp(target, tg_name, rev, family))
                         return &nft_target->ops;
         }
@@ -844,6 +852,11 @@ nft_target_select_ops(const struct nft_ctx *ctx,
         if (IS_ERR(target))
                 return ERR_PTR(-ENOENT);
 
+        if (!target->target) {
+                err = -EINVAL;
+                goto err;
+        }
+
         if (target->targetsize > nla_len(tb[NFTA_TARGET_INFO])) {
                 err = -EINVAL;
                 goto err;
diff --git a/net/netfilter/nft_set_bitmap.c b/net/netfilter/nft_set_bitmap.c
index d6626e01c7ee..128bc16f52dd 100644
--- a/net/netfilter/nft_set_bitmap.c
+++ b/net/netfilter/nft_set_bitmap.c
@@ -296,7 +296,7 @@ static bool nft_bitmap_estimate(const struct nft_set_desc *desc, u32 features,
         return true;
 }
 
-static struct nft_set_type nft_bitmap_type __read_mostly = {
+struct nft_set_type nft_set_bitmap_type __read_mostly = {
         .owner          = THIS_MODULE,
         .ops            = {
                 .privsize       = nft_bitmap_privsize,
@@ -314,20 +314,3 @@ static struct nft_set_type nft_bitmap_type __read_mostly = {
                 .get            = nft_bitmap_get,
         },
 };
-
-static int __init nft_bitmap_module_init(void)
-{
-        return nft_register_set(&nft_bitmap_type);
-}
-
-static void __exit nft_bitmap_module_exit(void)
-{
-        nft_unregister_set(&nft_bitmap_type);
-}
-
-module_init(nft_bitmap_module_init);
-module_exit(nft_bitmap_module_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Pablo Neira Ayuso <pablo@netfilter.org>");
-MODULE_ALIAS_NFT_SET();
diff --git a/net/netfilter/nft_set_hash.c b/net/netfilter/nft_set_hash.c
index 6f9a1365a09f..72ef35b51cac 100644
--- a/net/netfilter/nft_set_hash.c
+++ b/net/netfilter/nft_set_hash.c
@@ -654,7 +654,7 @@ static bool nft_hash_fast_estimate(const struct nft_set_desc *desc, u32 features
         return true;
 }
 
-static struct nft_set_type nft_rhash_type __read_mostly = {
+struct nft_set_type nft_set_rhash_type __read_mostly = {
         .owner          = THIS_MODULE,
         .features       = NFT_SET_MAP | NFT_SET_OBJECT |
                           NFT_SET_TIMEOUT | NFT_SET_EVAL,
@@ -677,7 +677,7 @@ static struct nft_set_type nft_rhash_type __read_mostly = {
         },
 };
 
-static struct nft_set_type nft_hash_type __read_mostly = {
+struct nft_set_type nft_set_hash_type __read_mostly = {
         .owner          = THIS_MODULE,
         .features       = NFT_SET_MAP | NFT_SET_OBJECT,
         .ops            = {
@@ -697,7 +697,7 @@ static struct nft_set_type nft_hash_type __read_mostly = {
         },
 };
 
-static struct nft_set_type nft_hash_fast_type __read_mostly = {
+struct nft_set_type nft_set_hash_fast_type __read_mostly = {
         .owner          = THIS_MODULE,
         .features       = NFT_SET_MAP | NFT_SET_OBJECT,
         .ops            = {
@@ -716,26 +716,3 @@ static struct nft_set_type nft_hash_fast_type __read_mostly = {
                 .get            = nft_hash_get,
         },
 };
-
-static int __init nft_hash_module_init(void)
-{
-        if (nft_register_set(&nft_hash_fast_type) ||
-            nft_register_set(&nft_hash_type) ||
-            nft_register_set(&nft_rhash_type))
-                return 1;
-        return 0;
-}
-
-static void __exit nft_hash_module_exit(void)
-{
-        nft_unregister_set(&nft_rhash_type);
-        nft_unregister_set(&nft_hash_type);
-        nft_unregister_set(&nft_hash_fast_type);
-}
-
-module_init(nft_hash_module_init);
-module_exit(nft_hash_module_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
-MODULE_ALIAS_NFT_SET();
diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c
index 7f3a9a211034..1f8f257cb518 100644
--- a/net/netfilter/nft_set_rbtree.c
+++ b/net/netfilter/nft_set_rbtree.c
@@ -462,7 +462,7 @@ static bool nft_rbtree_estimate(const struct nft_set_desc *desc, u32 features,
         return true;
 }
 
-static struct nft_set_type nft_rbtree_type __read_mostly = {
+struct nft_set_type nft_set_rbtree_type __read_mostly = {
         .owner          = THIS_MODULE,
         .features       = NFT_SET_INTERVAL | NFT_SET_MAP | NFT_SET_OBJECT | NFT_SET_TIMEOUT,
         .ops            = {
@@ -481,20 +481,3 @@ static struct nft_set_type nft_rbtree_type __read_mostly = {
                 .get            = nft_rbtree_get,
         },
 };
-
-static int __init nft_rbtree_module_init(void)
-{
-        return nft_register_set(&nft_rbtree_type);
-}
-
-static void __exit nft_rbtree_module_exit(void)
-{
-        nft_unregister_set(&nft_rbtree_type);
-}
-
-module_init(nft_rbtree_module_init);
-module_exit(nft_rbtree_module_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
-MODULE_ALIAS_NFT_SET();
diff --git a/net/netfilter/xt_TPROXY.c b/net/netfilter/xt_TPROXY.c
index 58fce4e749a9..d76550a8b642 100644
--- a/net/netfilter/xt_TPROXY.c
+++ b/net/netfilter/xt_TPROXY.c
@@ -61,7 +61,7 @@ tproxy_tg4(struct net *net, struct sk_buff *skb, __be32 laddr, __be16 lport,
          * addresses, this happens if the redirect already happened
          * and the current packet belongs to an already established
          * connection */
-        sk = nf_tproxy_get_sock_v4(net, skb, hp, iph->protocol,
+        sk = nf_tproxy_get_sock_v4(net, skb, iph->protocol,
                                    iph->saddr, iph->daddr,
                                    hp->source, hp->dest,
                                    skb->dev, NF_TPROXY_LOOKUP_ESTABLISHED);
@@ -77,7 +77,7 @@ tproxy_tg4(struct net *net, struct sk_buff *skb, __be32 laddr, __be16 lport,
         else if (!sk)
                 /* no, there's no established connection, check if
                  * there's a listener on the redirected addr/port */
-                sk = nf_tproxy_get_sock_v4(net, skb, hp, iph->protocol,
+                sk = nf_tproxy_get_sock_v4(net, skb, iph->protocol,
                                            iph->saddr, laddr,
                                            hp->source, lport,
                                            skb->dev, NF_TPROXY_LOOKUP_LISTENER);
@@ -150,7 +150,7 @@ tproxy_tg6_v1(struct sk_buff *skb, const struct xt_action_param *par)
          * addresses, this happens if the redirect already happened
          * and the current packet belongs to an already established
          * connection */
-        sk = nf_tproxy_get_sock_v6(xt_net(par), skb, thoff, hp, tproto,
+        sk = nf_tproxy_get_sock_v6(xt_net(par), skb, thoff, tproto,
                                    &iph->saddr, &iph->daddr,
                                    hp->source, hp->dest,
                                    xt_in(par), NF_TPROXY_LOOKUP_ESTABLISHED);
@@ -171,7 +171,7 @@ tproxy_tg6_v1(struct sk_buff *skb, const struct xt_action_param *par)
         else if (!sk)
                 /* no there's no established connection, check if
                  * there's a listener on the redirected addr/port */
-                sk = nf_tproxy_get_sock_v6(xt_net(par), skb, thoff, hp,
+                sk = nf_tproxy_get_sock_v6(xt_net(par), skb, thoff,
                                            tproto, &iph->saddr, laddr,
                                            hp->source, lport,
                                            xt_in(par), NF_TPROXY_LOOKUP_LISTENER);
diff --git a/net/nfc/llcp_commands.c b/net/nfc/llcp_commands.c
index 2ceefa183cee..6a196e438b6c 100644
--- a/net/nfc/llcp_commands.c
+++ b/net/nfc/llcp_commands.c
@@ -752,11 +752,14 @@ int nfc_llcp_send_ui_frame(struct nfc_llcp_sock *sock, u8 ssap, u8 dsap,
                 pr_debug("Fragment %zd bytes remaining %zd",
                          frag_len, remaining_len);
 
-                pdu = nfc_alloc_send_skb(sock->dev, &sock->sk, MSG_DONTWAIT,
+                pdu = nfc_alloc_send_skb(sock->dev, &sock->sk, 0,
                                          frag_len + LLCP_HEADER_SIZE, &err);
                 if (pdu == NULL) {
-                        pr_err("Could not allocate PDU\n");
-                        continue;
+                        pr_err("Could not allocate PDU (error=%d)\n", err);
+                        len -= remaining_len;
+                        if (len == 0)
+                                len = err;
+                        break;
                 }
 
                 pdu = llcp_add_header(pdu, dsap, ssap, LLCP_PDU_UI);
diff --git a/net/nsh/nsh.c b/net/nsh/nsh.c
index 9696ef96b719..1a30e165eeb4 100644
--- a/net/nsh/nsh.c
+++ b/net/nsh/nsh.c
@@ -104,7 +104,7 @@ static struct sk_buff *nsh_gso_segment(struct sk_buff *skb,
         __skb_pull(skb, nsh_len);
 
         skb_reset_mac_header(skb);
-        skb_reset_mac_len(skb);
+        skb->mac_len = proto == htons(ETH_P_TEB) ? ETH_HLEN : 0;
         skb->protocol = proto;
 
         features &= NETIF_F_SG;
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 57634bc3da74..9b27d0cd766d 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -2878,6 +2878,8 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)
                         goto out_free;
         } else if (reserve) {
                 skb_reserve(skb, -reserve);
+                if (len < reserve)
+                        skb_reset_network_header(skb);
         }
 
         /* Returns -EFAULT on error */
diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c
index 2aa07b547b16..86e1e37eb4e8 100644
--- a/net/qrtr/qrtr.c
+++ b/net/qrtr/qrtr.c
@@ -191,8 +191,13 @@ static int qrtr_node_enqueue(struct qrtr_node *node, struct sk_buff *skb,
         hdr->type = cpu_to_le32(type);
         hdr->src_node_id = cpu_to_le32(from->sq_node);
         hdr->src_port_id = cpu_to_le32(from->sq_port);
-        hdr->dst_node_id = cpu_to_le32(to->sq_node);
-        hdr->dst_port_id = cpu_to_le32(to->sq_port);
+        if (to->sq_port == QRTR_PORT_CTRL) {
+                hdr->dst_node_id = cpu_to_le32(node->nid);
+                hdr->dst_port_id = cpu_to_le32(QRTR_NODE_BCAST);
+        } else {
+                hdr->dst_node_id = cpu_to_le32(to->sq_node);
+                hdr->dst_port_id = cpu_to_le32(to->sq_port);
+        }
 
         hdr->size = cpu_to_le32(len);
         hdr->confirm_rx = 0;
@@ -764,6 +769,10 @@ static int qrtr_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
         node = NULL;
         if (addr->sq_node == QRTR_NODE_BCAST) {
                 enqueue_fn = qrtr_bcast_enqueue;
+                if (addr->sq_port != QRTR_PORT_CTRL) {
+                        release_sock(sk);
+                        return -ENOTCONN;
+                }
         } else if (addr->sq_node == ipc->us.sq_node) {
                 enqueue_fn = qrtr_local_enqueue;
         } else {
diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
index 526a8e491626..6e7124e57918 100644
--- a/net/sched/act_csum.c
+++ b/net/sched/act_csum.c
@@ -91,7 +91,7 @@ static int tcf_csum_init(struct net *net, struct nlattr *nla,
         }
         params_old = rtnl_dereference(p->params);
 
-        params_new->action = parm->action;
+        p->tcf_action = parm->action;
         params_new->update_flags = parm->update_flags;
         rcu_assign_pointer(p->params, params_new);
         if (params_old)
@@ -561,7 +561,7 @@ static int tcf_csum(struct sk_buff *skb, const struct tc_action *a,
         tcf_lastuse_update(&p->tcf_tm);
         bstats_cpu_update(this_cpu_ptr(p->common.cpu_bstats), skb);
 
-        action = params->action;
+        action = READ_ONCE(p->tcf_action);
         if (unlikely(action == TC_ACT_SHOT))
                 goto drop_stats;
 
@@ -599,11 +599,11 @@ static int tcf_csum_dump(struct sk_buff *skb, struct tc_action *a, int bind,
                 .index   = p->tcf_index,
                 .refcnt  = p->tcf_refcnt - ref,
                 .bindcnt = p->tcf_bindcnt - bind,
+                .action  = p->tcf_action,
         };
         struct tcf_t t;
 
         params = rtnl_dereference(p->params);
-        opt.action = params->action;
         opt.update_flags = params->update_flags;
 
         if (nla_put(skb, TCA_CSUM_PARMS, sizeof(opt), &opt))
diff --git a/net/sched/act_tunnel_key.c b/net/sched/act_tunnel_key.c
index 626dac81a48a..9bc6c2ae98a5 100644
--- a/net/sched/act_tunnel_key.c
+++ b/net/sched/act_tunnel_key.c
@@ -36,7 +36,7 @@ static int tunnel_key_act(struct sk_buff *skb, const struct tc_action *a,
 
         tcf_lastuse_update(&t->tcf_tm);
         bstats_cpu_update(this_cpu_ptr(t->common.cpu_bstats), skb);
-        action = params->action;
+        action = READ_ONCE(t->tcf_action);
 
         switch (params->tcft_action) {
         case TCA_TUNNEL_KEY_ACT_RELEASE:
@@ -182,7 +182,7 @@ static int tunnel_key_init(struct net *net, struct nlattr *nla,
 
         params_old = rtnl_dereference(t->params);
 
-        params_new->action = parm->action;
+        t->tcf_action = parm->action;
         params_new->tcft_action = parm->t_action;
         params_new->tcft_enc_metadata = metadata;
 
@@ -254,13 +254,13 @@ static int tunnel_key_dump(struct sk_buff *skb, struct tc_action *a,
                 .index    = t->tcf_index,
                 .refcnt   = t->tcf_refcnt - ref,
                 .bindcnt  = t->tcf_bindcnt - bind,
+                .action   = t->tcf_action,
         };
         struct tcf_t tm;
 
         params = rtnl_dereference(t->params);
 
         opt.t_action = params->tcft_action;
-        opt.action = params->action;
 
         if (nla_put(skb, TCA_TUNNEL_KEY_PARMS, sizeof(opt), &opt))
                 goto nla_put_failure;
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index cdc3c87c53e6..f74513a7c7a8 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -1053,7 +1053,7 @@ static void tfilter_notify_chain(struct net *net, struct sk_buff *oskb,
         for (tp = rtnl_dereference(chain->filter_chain);
              tp; tp = rtnl_dereference(tp->next))
                 tfilter_notify(net, oskb, n, tp, block,
-                               q, parent, 0, event, false);
+                               q, parent, NULL, event, false);
 }
 
 static int tc_new_tfilter(struct sk_buff *skb, struct nlmsghdr *n,
@@ -1444,7 +1444,7 @@ static bool tcf_chain_dump(struct tcf_chain *chain, struct Qdisc *q, u32 parent,
                         memset(&cb->args[1], 0,
                                sizeof(cb->args) - sizeof(cb->args[0]));
                 if (cb->args[1] == 0) {
-                        if (tcf_fill_node(net, skb, tp, block, q, parent, 0,
+                        if (tcf_fill_node(net, skb, tp, block, q, parent, NULL,
                                           NETLINK_CB(cb->skb).portid,
                                           cb->nlh->nlmsg_seq, NLM_F_MULTI,
                                           RTM_NEWTFILTER) <= 0)
diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
index cd2e0e342fb6..6c0a9d5dbf94 100644
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
@@ -479,24 +479,28 @@ static int fq_codel_init(struct Qdisc *sch, struct nlattr *opt,
         q->cparams.mtu = psched_mtu(qdisc_dev(sch));
 
         if (opt) {
-                int err = fq_codel_change(sch, opt, extack);
+                err = fq_codel_change(sch, opt, extack);
                 if (err)
-                        return err;
+                        goto init_failure;
         }
 
         err = tcf_block_get(&q->block, &q->filter_list, sch, extack);
         if (err)
-                return err;
+                goto init_failure;
 
         if (!q->flows) {
                 q->flows = kvcalloc(q->flows_cnt,
                                     sizeof(struct fq_codel_flow),
                                     GFP_KERNEL);
-                if (!q->flows)
-                        return -ENOMEM;
+                if (!q->flows) {
+                        err = -ENOMEM;
+                        goto init_failure;
+                }
                 q->backlogs = kvcalloc(q->flows_cnt, sizeof(u32), GFP_KERNEL);
-                if (!q->backlogs)
-                        return -ENOMEM;
+                if (!q->backlogs) {
+                        err = -ENOMEM;
+                        goto alloc_failure;
+                }
                 for (i = 0; i < q->flows_cnt; i++) {
                         struct fq_codel_flow *flow = q->flows + i;
 
@@ -509,6 +513,13 @@ static int fq_codel_init(struct Qdisc *sch, struct nlattr *opt,
         else
                 sch->flags &= ~TCQ_F_CAN_BYPASS;
         return 0;
+
+alloc_failure:
+        kvfree(q->flows);
+        q->flows = NULL;
+init_failure:
+        q->flows_cnt = 0;
+        return err;
 }
 
 static int fq_codel_dump(struct Qdisc *sch, struct sk_buff *skb)
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index 445b7ef61677..12cac85da994 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -282,7 +282,7 @@ bool sctp_transport_update_pmtu(struct sctp_transport *t, u32 pmtu)
 
         if (dst) {
                 /* Re-fetch, as under layers may have a higher minimum size */
-                pmtu = SCTP_TRUNC4(dst_mtu(dst));
+                pmtu = sctp_dst_mtu(dst);
                 change = t->pathmtu != pmtu;
         }
         t->pathmtu = pmtu;
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 3c1405df936c..05e4ffe5aabd 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -147,7 +147,8 @@ static int smc_release(struct socket *sock)
                 smc->clcsock = NULL;
         }
         if (smc->use_fallback) {
-                sock_put(sk); /* passive closing */
+                if (sk->sk_state != SMC_LISTEN && sk->sk_state != SMC_INIT)
+                        sock_put(sk); /* passive closing */
                 sk->sk_state = SMC_CLOSED;
                 sk->sk_state_change(sk);
         }
@@ -417,12 +418,18 @@ static int smc_connect_decline_fallback(struct smc_sock *smc, int reason_code)
 {
         int rc;
 
-        if (reason_code < 0) /* error, fallback is not possible */
+        if (reason_code < 0) { /* error, fallback is not possible */
+                if (smc->sk.sk_state == SMC_INIT)
+                        sock_put(&smc->sk); /* passive closing */
                 return reason_code;
+        }
         if (reason_code != SMC_CLC_DECL_REPLY) {
                 rc = smc_clc_send_decline(smc, reason_code);
-                if (rc < 0)
+                if (rc < 0) {
+                        if (smc->sk.sk_state == SMC_INIT)
+                                sock_put(&smc->sk); /* passive closing */
                         return rc;
+                }
         }
         return smc_connect_fallback(smc);
 }
@@ -435,8 +442,6 @@ static int smc_connect_abort(struct smc_sock *smc, int reason_code,
                 smc_lgr_forget(smc->conn.lgr);
         mutex_unlock(&smc_create_lgr_pending);
         smc_conn_free(&smc->conn);
-        if (reason_code < 0 && smc->sk.sk_state == SMC_INIT)
-                sock_put(&smc->sk); /* passive closing */
         return reason_code;
 }
 
@@ -1452,7 +1457,8 @@ static int smc_setsockopt(struct socket *sock, int level, int optname,
 
         if (optlen < sizeof(int))
                 return -EINVAL;
-        get_user(val, (int __user *)optval);
+        if (get_user(val, (int __user *)optval))
+                return -EFAULT;
 
         lock_sock(sk);
         switch (optname) {
@@ -1520,10 +1526,13 @@ static int smc_ioctl(struct socket *sock, unsigned int cmd,
                         return -EBADF;
                 return smc->clcsock->ops->ioctl(smc->clcsock, cmd, arg);
         }
+        lock_sock(&smc->sk);
         switch (cmd) {
         case SIOCINQ: /* same as FIONREAD */
-                if (smc->sk.sk_state == SMC_LISTEN)
+                if (smc->sk.sk_state == SMC_LISTEN) {
+                        release_sock(&smc->sk);
                         return -EINVAL;
+                }
                 if (smc->sk.sk_state == SMC_INIT ||
                     smc->sk.sk_state == SMC_CLOSED)
                         answ = 0;
@@ -1532,8 +1541,10 @@ static int smc_ioctl(struct socket *sock, unsigned int cmd,
                 break;
         case SIOCOUTQ:
                 /* output queue size (not send + not acked) */
-                if (smc->sk.sk_state == SMC_LISTEN)
+                if (smc->sk.sk_state == SMC_LISTEN) {
+                        release_sock(&smc->sk);
                         return -EINVAL;
+                }
                 if (smc->sk.sk_state == SMC_INIT ||
                     smc->sk.sk_state == SMC_CLOSED)
                         answ = 0;
@@ -1543,8 +1554,10 @@ static int smc_ioctl(struct socket *sock, unsigned int cmd,
                 break;
         case SIOCOUTQNSD:
                 /* output queue size (not send only) */
-                if (smc->sk.sk_state == SMC_LISTEN)
+                if (smc->sk.sk_state == SMC_LISTEN) {
+                        release_sock(&smc->sk);
                         return -EINVAL;
+                }
                 if (smc->sk.sk_state == SMC_INIT ||
                     smc->sk.sk_state == SMC_CLOSED)
                         answ = 0;
@@ -1552,8 +1565,10 @@ static int smc_ioctl(struct socket *sock, unsigned int cmd,
                         answ = smc_tx_prepared_sends(&smc->conn);
                 break;
         case SIOCATMARK:
-                if (smc->sk.sk_state == SMC_LISTEN)
+                if (smc->sk.sk_state == SMC_LISTEN) {
+                        release_sock(&smc->sk);
                         return -EINVAL;
+                }
                 if (smc->sk.sk_state == SMC_INIT ||
                     smc->sk.sk_state == SMC_CLOSED) {
                         answ = 0;
@@ -1569,8 +1584,10 @@ static int smc_ioctl(struct socket *sock, unsigned int cmd,
                 }
                 break;
         default:
+                release_sock(&smc->sk);
                 return -ENOIOCTLCMD;
         }
+        release_sock(&smc->sk);
 
         return put_user(answ, (int __user *)arg);
 }
diff --git a/net/smc/smc_clc.c b/net/smc/smc_clc.c
index 717449b1da0b..ae5d168653ce 100644
--- a/net/smc/smc_clc.c
+++ b/net/smc/smc_clc.c
@@ -250,6 +250,7 @@ out:
 int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen,
                      u8 expected_type)
 {
+        long rcvtimeo = smc->clcsock->sk->sk_rcvtimeo;
         struct sock *clc_sk = smc->clcsock->sk;
         struct smc_clc_msg_hdr *clcm = buf;
         struct msghdr msg = {NULL, 0};
@@ -306,7 +307,6 @@ int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen,
         memset(&msg, 0, sizeof(struct msghdr));
         iov_iter_kvec(&msg.msg_iter, READ | ITER_KVEC, &vec, 1, datlen);
         krflags = MSG_WAITALL;
-        smc->clcsock->sk->sk_rcvtimeo = CLC_WAIT_TIME;
         len = sock_recvmsg(smc->clcsock, &msg, krflags);
         if (len < datlen || !smc_clc_msg_hdr_valid(clcm)) {
                 smc->sk.sk_err = EPROTO;
@@ -322,6 +322,7 @@ int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen,
         }
 
 out:
+        smc->clcsock->sk->sk_rcvtimeo = rcvtimeo;
         return reason_code;
 }
 
diff --git a/net/smc/smc_close.c b/net/smc/smc_close.c
index fa41d9881741..ac961dfb1ea1 100644
--- a/net/smc/smc_close.c
+++ b/net/smc/smc_close.c
@@ -107,6 +107,8 @@ static void smc_close_active_abort(struct smc_sock *smc)
         }
         switch (sk->sk_state) {
         case SMC_INIT:
+                sk->sk_state = SMC_PEERABORTWAIT;
+                break;
         case SMC_ACTIVE:
                 sk->sk_state = SMC_PEERABORTWAIT;
                 release_sock(sk);
diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c
index cee666400752..f82886b7d1d8 100644
--- a/net/smc/smc_tx.c
+++ b/net/smc/smc_tx.c
@@ -495,7 +495,8 @@ out:
 
 void smc_tx_consumer_update(struct smc_connection *conn, bool force)
 {
-        union smc_host_cursor cfed, cons;
+        union smc_host_cursor cfed, cons, prod;
+        int sender_free = conn->rmb_desc->len;
         int to_confirm;
 
         smc_curs_write(&cons,
@@ -505,11 +506,18 @@ void smc_tx_consumer_update(struct smc_connection *conn, bool force)
                        smc_curs_read(&conn->rx_curs_confirmed, conn),
                        conn);
         to_confirm = smc_curs_diff(conn->rmb_desc->len, &cfed, &cons);
+        if (to_confirm > conn->rmbe_update_limit) {
+                smc_curs_write(&prod,
+                               smc_curs_read(&conn->local_rx_ctrl.prod, conn),
+                               conn);
+                sender_free = conn->rmb_desc->len -
+                              smc_curs_diff(conn->rmb_desc->len, &prod, &cfed);
+        }
 
         if (conn->local_rx_ctrl.prod_flags.cons_curs_upd_req ||
             force ||
             ((to_confirm > conn->rmbe_update_limit) &&
-             ((to_confirm > (conn->rmb_desc->len / 2)) ||
+             ((sender_free <= (conn->rmb_desc->len / 2)) ||
               conn->local_rx_ctrl.prod_flags.write_blocked))) {
                 if ((smc_cdc_get_slot_and_msg_send(conn) < 0) &&
                     conn->alert_token_local) { /* connection healthy */
diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index 9f666e0650e2..2830709957bd 100644
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -133,6 +133,8 @@ static void disc_dupl_alert(struct tipc_bearer *b, u32 node_addr,
 }
 
 /* tipc_disc_addr_trial(): - handle an address uniqueness trial from peer
+ * Returns true if message should be dropped by caller, i.e., if it is a
+ * trial message or we are inside trial period. Otherwise false.
  */
 static bool tipc_disc_addr_trial_msg(struct tipc_discoverer *d,
                                      struct tipc_media_addr *maddr,
@@ -168,8 +170,9 @@ static bool tipc_disc_addr_trial_msg(struct tipc_discoverer *d,
                 msg_set_type(buf_msg(d->skb), DSC_REQ_MSG);
         }
 
+        /* Accept regular link requests/responses only after trial period */
         if (mtyp != DSC_TRIAL_MSG)
-                return false;
+                return trial;
 
         sugg_addr = tipc_node_try_addr(net, peer_id, src);
         if (sugg_addr)
@@ -284,7 +287,6 @@ static void tipc_disc_timeout(struct timer_list *t)
 {
         struct tipc_discoverer *d = from_timer(d, t, timer);
         struct tipc_net *tn = tipc_net(d->net);
-        u32 self = tipc_own_addr(d->net);
         struct tipc_media_addr maddr;
         struct sk_buff *skb = NULL;
         struct net *net = d->net;
@@ -298,12 +300,14 @@ static void tipc_disc_timeout(struct timer_list *t)
                 goto exit;
         }
 
-        /* Did we just leave the address trial period ? */
-        if (!self && !time_before(jiffies, tn->addr_trial_end)) {
-                self = tn->trial_addr;
-                tipc_net_finalize(net, self);
-                msg_set_prevnode(buf_msg(d->skb), self);
+        /* Trial period over ? */
+        if (!time_before(jiffies, tn->addr_trial_end)) {
+                /* Did we just leave it ? */
+                if (!tipc_own_addr(net))
+                        tipc_net_finalize(net, tn->trial_addr);
+
                 msg_set_type(buf_msg(d->skb), DSC_REQ_MSG);
+                msg_set_prevnode(buf_msg(d->skb), tipc_own_addr(net));
         }
 
         /* Adjust timeout interval according to discovery phase */
diff --git a/net/tipc/net.c b/net/tipc/net.c
index 4fbaa0464405..a7f6964c3a4b 100644
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -121,12 +121,17 @@ int tipc_net_init(struct net *net, u8 *node_id, u32 addr)
 
 void tipc_net_finalize(struct net *net, u32 addr)
 {
-        tipc_set_node_addr(net, addr);
-        smp_mb();
-        tipc_named_reinit(net);
-        tipc_sk_reinit(net);
-        tipc_nametbl_publish(net, TIPC_CFG_SRV, addr, addr,
-                             TIPC_CLUSTER_SCOPE, 0, addr);
+        struct tipc_net *tn = tipc_net(net);
+
+        spin_lock_bh(&tn->node_list_lock);
+        if (!tipc_own_addr(net)) {
+                tipc_set_node_addr(net, addr);
+                tipc_named_reinit(net);
+                tipc_sk_reinit(net);
+                tipc_nametbl_publish(net, TIPC_CFG_SRV, addr, addr,
+                                     TIPC_CLUSTER_SCOPE, 0, addr);
+        }
+        spin_unlock_bh(&tn->node_list_lock);
 }
 
 void tipc_net_stop(struct net *net)
diff --git a/net/tipc/node.c b/net/tipc/node.c
index 6a44eb812baf..0453bd451ce8 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -797,6 +797,7 @@ static u32 tipc_node_suggest_addr(struct net *net, u32 addr)
 }
 
 /* tipc_node_try_addr(): Check if addr can be used by peer, suggest other if not
+ * Returns suggested address if any, otherwise 0
  */
 u32 tipc_node_try_addr(struct net *net, u8 *id, u32 addr)
 {
@@ -819,12 +820,14 @@ u32 tipc_node_try_addr(struct net *net, u8 *id, u32 addr)
         if (n) {
                 addr = n->addr;
                 tipc_node_put(n);
+                return addr;
         }
-        /* Even this node may be in trial phase */
+
+        /* Even this node may be in conflict */
         if (tn->trial_addr == addr)
                 return tipc_node_suggest_addr(net, addr);
 
-        return addr;
+        return 0;
 }
 
 void tipc_node_check_dest(struct net *net, u32 addr,
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index d2380548f8f6..4618f1c31137 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -440,7 +440,7 @@ alloc_encrypted:
                         ret = tls_push_record(sk, msg->msg_flags, record_type);
                         if (!ret)
                                 continue;
-                        if (ret == -EAGAIN)
+                        if (ret < 0)
                                 goto send_end;
 
                         copied -= try_to_copy;
@@ -701,6 +701,10 @@ static int decrypt_skb(struct sock *sk, struct sk_buff *skb,
         nsg = skb_to_sgvec(skb, &sgin[1],
                            rxm->offset + tls_ctx->rx.prepend_size,
                            rxm->full_len - tls_ctx->rx.prepend_size);
+        if (nsg < 0) {
+                ret = nsg;
+                goto out;
+        }
 
         tls_make_aad(ctx->rx_aad_ciphertext,
                      rxm->full_len - tls_ctx->rx.overhead_size,
@@ -712,6 +716,7 @@ static int decrypt_skb(struct sock *sk, struct sk_buff *skb,
                                 rxm->full_len - tls_ctx->rx.overhead_size,
                                 skb, sk->sk_allocation);
 
+out:
         if (sgin != &sgin_arr[0])
                 kfree(sgin);
 
diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index 59fb7d3c36a3..72335c2e8108 100644
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -199,8 +199,11 @@ static void xsk_destruct_skb(struct sk_buff *skb)
 {
         u64 addr = (u64)(long)skb_shinfo(skb)->destructor_arg;
         struct xdp_sock *xs = xdp_sk(skb->sk);
+        unsigned long flags;
 
+        spin_lock_irqsave(&xs->tx_completion_lock, flags);
         WARN_ON_ONCE(xskq_produce_addr(xs->umem->cq, addr));
+        spin_unlock_irqrestore(&xs->tx_completion_lock, flags);
 
         sock_wfree(skb);
 }
@@ -215,9 +218,6 @@ static int xsk_generic_xmit(struct sock *sk, struct msghdr *m,
         struct sk_buff *skb;
         int err = 0;
 
-        if (unlikely(!xs->tx))
-                return -ENOBUFS;
-
         mutex_lock(&xs->mutex);
 
         while (xskq_peek_desc(xs->tx, &desc)) {
@@ -230,22 +230,13 @@ static int xsk_generic_xmit(struct sock *sk, struct msghdr *m,
                         goto out;
                 }
 
-                if (xskq_reserve_addr(xs->umem->cq)) {
-                        err = -EAGAIN;
-                        goto out;
-                }
-
-                len = desc.len;
-                if (unlikely(len > xs->dev->mtu)) {
-                        err = -EMSGSIZE;
+                if (xskq_reserve_addr(xs->umem->cq))
                         goto out;
-                }
 
-                if (xs->queue_id >= xs->dev->real_num_tx_queues) {
-                        err = -ENXIO;
+                if (xs->queue_id >= xs->dev->real_num_tx_queues)
                         goto out;
-                }
 
+                len = desc.len;
                 skb = sock_alloc_send_skb(sk, len, 1, &err);
                 if (unlikely(!skb)) {
                         err = -EAGAIN;
@@ -268,15 +259,15 @@ static int xsk_generic_xmit(struct sock *sk, struct msghdr *m,
                 skb->destructor = xsk_destruct_skb;
 
                 err = dev_direct_xmit(skb, xs->queue_id);
+                xskq_discard_desc(xs->tx);
                 /* Ignore NET_XMIT_CN as packet might have been sent */
                 if (err == NET_XMIT_DROP || err == NETDEV_TX_BUSY) {
-                        err = -EAGAIN;
-                        /* SKB consumed by dev_direct_xmit() */
+                        /* SKB completed but not sent */
+                        err = -EBUSY;
                         goto out;
                 }
 
                 sent_frame = true;
-                xskq_discard_desc(xs->tx);
         }
 
 out:
@@ -297,6 +288,8 @@ static int xsk_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len)
                 return -ENXIO;
         if (unlikely(!(xs->dev->flags & IFF_UP)))
                 return -ENETDOWN;
+        if (unlikely(!xs->tx))
+                return -ENOBUFS;
         if (need_wait)
                 return -EOPNOTSUPP;
 
@@ -755,6 +748,7 @@ static int xsk_create(struct net *net, struct socket *sock, int protocol,
 
         xs = xdp_sk(sk);
         mutex_init(&xs->mutex);
+        spin_lock_init(&xs->tx_completion_lock);
 
         local_bh_disable();
         sock_prot_inuse_add(net, &xsk_proto, 1);
diff --git a/net/xdp/xsk_queue.h b/net/xdp/xsk_queue.h
index ef6a6f0ec949..52ecaf770642 100644
--- a/net/xdp/xsk_queue.h
+++ b/net/xdp/xsk_queue.h
@@ -62,14 +62,9 @@ static inline u32 xskq_nb_avail(struct xsk_queue *q, u32 dcnt)
         return (entries > dcnt) ? dcnt : entries;
 }
 
-static inline u32 xskq_nb_free_lazy(struct xsk_queue *q, u32 producer)
-{
-        return q->nentries - (producer - q->cons_tail);
-}
-
 static inline u32 xskq_nb_free(struct xsk_queue *q, u32 producer, u32 dcnt)
 {
-        u32 free_entries = xskq_nb_free_lazy(q, producer);
+        u32 free_entries = q->nentries - (producer - q->cons_tail);
 
         if (free_entries >= dcnt)
                 return free_entries;
@@ -129,7 +124,7 @@ static inline int xskq_produce_addr(struct xsk_queue *q, u64 addr)
 {
         struct xdp_umem_ring *ring = (struct xdp_umem_ring *)q->ring;
 
-        if (xskq_nb_free(q, q->prod_tail, LAZY_UPDATE_THRESHOLD) == 0)
+        if (xskq_nb_free(q, q->prod_tail, 1) == 0)
                 return -ENOSPC;
 
         ring->desc[q->prod_tail++ & q->ring_mask] = addr;
diff --git a/samples/bpf/.gitignore b/samples/bpf/.gitignore
new file mode 100644
index 000000000000..8ae4940025f8
--- /dev/null
+++ b/samples/bpf/.gitignore
@@ -0,0 +1,49 @@
+cpustat
+fds_example
+lathist
+load_sock_ops
+lwt_len_hist
+map_perf_test
+offwaketime
+per_socket_stats_example
+sampleip
+sock_example
+sockex1
+sockex2
+sockex3
+spintest
+syscall_nrs.h
+syscall_tp
+task_fd_query
+tc_l2_redirect
+test_cgrp2_array_pin
+test_cgrp2_attach
+test_cgrp2_attach2
+test_cgrp2_sock
+test_cgrp2_sock2
+test_current_task_under_cgroup
+test_lru_dist
+test_map_in_map
+test_overhead
+test_probe_write_user
+trace_event
+trace_output
+tracex1
+tracex2
+tracex3
+tracex4
+tracex5
+tracex6
+tracex7
+xdp1
+xdp2
+xdp_adjust_tail
+xdp_fwd
+xdp_monitor
+xdp_redirect
+xdp_redirect_cpu
+xdp_redirect_map
+xdp_router_ipv4
+xdp_rxq_info
+xdp_tx_iptunnel
+xdpsock
diff --git a/samples/bpf/parse_varlen.c b/samples/bpf/parse_varlen.c
index 95c16324760c..0b6f22feb2c9 100644
--- a/samples/bpf/parse_varlen.c
+++ b/samples/bpf/parse_varlen.c
@@ -6,6 +6,7 @@
  */
 #define KBUILD_MODNAME "foo"
 #include <linux/if_ether.h>
+#include <linux/if_vlan.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/in.h>
@@ -108,11 +109,6 @@ static int parse_ipv6(void *data, uint64_t nh_off, void *data_end)
         return 0;
 }
 
-struct vlan_hdr {
-        uint16_t h_vlan_TCI;
-        uint16_t h_vlan_encapsulated_proto;
-};
-
 SEC("varlen")
 int handle_ingress(struct __sk_buff *skb)
 {
diff --git a/samples/bpf/test_overhead_user.c b/samples/bpf/test_overhead_user.c
index 6caf47afa635..9d6dcaa9db92 100644
--- a/samples/bpf/test_overhead_user.c
+++ b/samples/bpf/test_overhead_user.c
@@ -6,6 +6,7 @@
  */
 #define _GNU_SOURCE
 #include <sched.h>
+#include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <asm/unistd.h>
@@ -44,8 +45,13 @@ static void test_task_rename(int cpu)
                 exit(1);
         }
         start_time = time_get_ns();
-        for (i = 0; i < MAX_CNT; i++)
-                write(fd, buf, sizeof(buf));
+        for (i = 0; i < MAX_CNT; i++) {
+                if (write(fd, buf, sizeof(buf)) < 0) {
+                        printf("task rename failed: %s\n", strerror(errno));
+                        close(fd);
+                        return;
+                }
+        }
         printf("task_rename:%d: %lld events per sec\n",
                cpu, MAX_CNT * 1000000000ll / (time_get_ns() - start_time));
         close(fd);
@@ -63,8 +69,13 @@ static void test_urandom_read(int cpu)
                 exit(1);
         }
         start_time = time_get_ns();
-        for (i = 0; i < MAX_CNT; i++)
-                read(fd, buf, sizeof(buf));
+        for (i = 0; i < MAX_CNT; i++) {
+                if (read(fd, buf, sizeof(buf)) < 0) {
+                        printf("failed to read from /dev/urandom: %s\n", strerror(errno));
+                        close(fd);
+                        return;
+                }
+        }
         printf("urandom_read:%d: %lld events per sec\n",
                cpu, MAX_CNT * 1000000000ll / (time_get_ns() - start_time));
         close(fd);
diff --git a/samples/bpf/trace_event_user.c b/samples/bpf/trace_event_user.c
index 1fa1becfa641..d08046ab81f0 100644
--- a/samples/bpf/trace_event_user.c
+++ b/samples/bpf/trace_event_user.c
@@ -122,6 +122,16 @@ static void print_stacks(void)
         }
 }
 
+static inline int generate_load(void)
+{
+        if (system("dd if=/dev/zero of=/dev/null count=5000k status=none") < 0) {
+                printf("failed to generate some load with dd: %s\n", strerror(errno));
+                return -1;
+        }
+
+        return 0;
+}
+
 static void test_perf_event_all_cpu(struct perf_event_attr *attr)
 {
         int nr_cpus = sysconf(_SC_NPROCESSORS_CONF);
@@ -142,7 +152,11 @@ static void test_perf_event_all_cpu(struct perf_event_attr *attr)
                 assert(ioctl(pmu_fd[i], PERF_EVENT_IOC_SET_BPF, prog_fd[0]) == 0);
                 assert(ioctl(pmu_fd[i], PERF_EVENT_IOC_ENABLE) == 0);
         }
-        system("dd if=/dev/zero of=/dev/null count=5000k status=none");
+
+        if (generate_load() < 0) {
+                error = 1;
+                goto all_cpu_err;
+        }
         print_stacks();
 all_cpu_err:
         for (i--; i >= 0; i--) {
@@ -156,7 +170,7 @@ all_cpu_err:
 
 static void test_perf_event_task(struct perf_event_attr *attr)
 {
-        int pmu_fd;
+        int pmu_fd, error = 0;
 
         /* per task perf event, enable inherit so the "dd ..." command can be traced properly.
          * Enabling inherit will cause bpf_perf_prog_read_time helper failure.
@@ -171,10 +185,17 @@ static void test_perf_event_task(struct perf_event_attr *attr)
         }
         assert(ioctl(pmu_fd, PERF_EVENT_IOC_SET_BPF, prog_fd[0]) == 0);
         assert(ioctl(pmu_fd, PERF_EVENT_IOC_ENABLE) == 0);
-        system("dd if=/dev/zero of=/dev/null count=5000k status=none");
+
+        if (generate_load() < 0) {
+                error = 1;
+                goto err;
+        }
         print_stacks();
+err:
         ioctl(pmu_fd, PERF_EVENT_IOC_DISABLE);
         close(pmu_fd);
+        if (error)
+                int_exit(0);
 }
 
 static void test_bpf_perf_event(void)
diff --git a/samples/bpf/xdp2skb_meta.sh b/samples/bpf/xdp2skb_meta.sh
index b9c9549c4c27..4bde9d066c46 100755
--- a/samples/bpf/xdp2skb_meta.sh
+++ b/samples/bpf/xdp2skb_meta.sh
@@ -16,8 +16,8 @@
 BPF_FILE=xdp2skb_meta_kern.o
 DIR=$(dirname $0)
 
-export TC=/usr/sbin/tc
-export IP=/usr/sbin/ip
+[ -z "$TC" ] && TC=tc
+[ -z "$IP" ] && IP=ip
 
 function usage() {
     echo ""
@@ -53,7 +53,7 @@ function _call_cmd() {
     local allow_fail="$2"
     shift 2
     if [[ -n "$VERBOSE" ]]; then
-        echo "$(basename $cmd) $@"
+        echo "$cmd $@"
     fi
     if [[ -n "$DRYRUN" ]]; then
         return
diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c
index d69c8d78d3fd..5904b1543831 100644
--- a/samples/bpf/xdpsock_user.c
+++ b/samples/bpf/xdpsock_user.c
@@ -729,7 +729,7 @@ static void kick_tx(int fd)
         int ret;
 
         ret = sendto(fd, NULL, 0, MSG_DONTWAIT, NULL, 0);
-        if (ret >= 0 || errno == ENOBUFS || errno == EAGAIN)
+        if (ret >= 0 || errno == ENOBUFS || errno == EAGAIN || errno == EBUSY)
                 return;
         lassert(0);
 }
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 412a70cce558..26de7d5aa5c8 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -152,6 +152,7 @@ regex_asm=(
 )
 regex_c=(
         '/^SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/sys_\1/'
+        '/^BPF_CALL_[0-9](\([[:alnum:]_]*\).*/\1/'
         '/^COMPAT_SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/compat_sys_\1/'
         '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1/'
         '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1_rcuidle/'
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index 69616d00481c..b53026a72e73 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -635,7 +635,7 @@ static int snd_rawmidi_info_select_user(struct snd_card *card,
 int snd_rawmidi_output_params(struct snd_rawmidi_substream *substream,
                               struct snd_rawmidi_params * params)
 {
-        char *newbuf;
+        char *newbuf, *oldbuf;
         struct snd_rawmidi_runtime *runtime = substream->runtime;
         
         if (substream->append && substream->use_count > 1)
@@ -648,13 +648,17 @@ int snd_rawmidi_output_params(struct snd_rawmidi_substream *substream,
                 return -EINVAL;
         }
         if (params->buffer_size != runtime->buffer_size) {
-                newbuf = krealloc(runtime->buffer, params->buffer_size,
-                                  GFP_KERNEL);
+                newbuf = kmalloc(params->buffer_size, GFP_KERNEL);
                 if (!newbuf)
                         return -ENOMEM;
+                spin_lock_irq(&runtime->lock);
+                oldbuf = runtime->buffer;
                 runtime->buffer = newbuf;
                 runtime->buffer_size = params->buffer_size;
                 runtime->avail = runtime->buffer_size;
+                runtime->appl_ptr = runtime->hw_ptr = 0;
+                spin_unlock_irq(&runtime->lock);
+                kfree(oldbuf);
         }
         runtime->avail_min = params->avail_min;
         substream->active_sensing = !params->no_active_sensing;
@@ -665,7 +669,7 @@ EXPORT_SYMBOL(snd_rawmidi_output_params);
 int snd_rawmidi_input_params(struct snd_rawmidi_substream *substream,
                              struct snd_rawmidi_params * params)
 {
-        char *newbuf;
+        char *newbuf, *oldbuf;
         struct snd_rawmidi_runtime *runtime = substream->runtime;
 
         snd_rawmidi_drain_input(substream);
@@ -676,12 +680,16 @@ int snd_rawmidi_input_params(struct snd_rawmidi_substream *substream,
                 return -EINVAL;
         }
         if (params->buffer_size != runtime->buffer_size) {
-                newbuf = krealloc(runtime->buffer, params->buffer_size,
-                                  GFP_KERNEL);
+                newbuf = kmalloc(params->buffer_size, GFP_KERNEL);
                 if (!newbuf)
                         return -ENOMEM;
+                spin_lock_irq(&runtime->lock);
+                oldbuf = runtime->buffer;
                 runtime->buffer = newbuf;
                 runtime->buffer_size = params->buffer_size;
+                runtime->appl_ptr = runtime->hw_ptr = 0;
+                spin_unlock_irq(&runtime->lock);
+                kfree(oldbuf);
         }
         runtime->avail_min = params->avail_min;
         return 0;
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index e7fcfc3b8885..f641c20095f7 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -964,6 +964,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
         SND_PCI_QUIRK(0x103c, 0x8115, "HP Z1 Gen3", CXT_FIXUP_HP_GATE_MIC),
         SND_PCI_QUIRK(0x103c, 0x814f, "HP ZBook 15u G3", CXT_FIXUP_MUTE_LED_GPIO),
         SND_PCI_QUIRK(0x103c, 0x822e, "HP ProBook 440 G4", CXT_FIXUP_MUTE_LED_GPIO),
+        SND_PCI_QUIRK(0x103c, 0x836e, "HP ProBook 455 G5", CXT_FIXUP_MUTE_LED_GPIO),
         SND_PCI_QUIRK(0x103c, 0x8299, "HP 800 G3 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x103c, 0x8455, "HP Z2 G4", CXT_FIXUP_HP_MIC_NO_PRESENCE),
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 7496be4491b1..f6af3e1c2b93 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2366,6 +2366,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {
         SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3),
         SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX),
         SND_PCI_QUIRK(0x1558, 0x9501, "Clevo P950HR", ALC1220_FIXUP_CLEVO_P950),
+        SND_PCI_QUIRK(0x1558, 0x95e1, "Clevo P95xER", ALC1220_FIXUP_CLEVO_P950),
         SND_PCI_QUIRK(0x1558, 0x95e2, "Clevo P950ER", ALC1220_FIXUP_CLEVO_P950),
         SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD),
         SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD),
@@ -6569,6 +6570,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x10cf, 0x1629, "Lifebook U7x7", ALC255_FIXUP_LIFEBOOK_U7x7_HEADSET_MIC),
         SND_PCI_QUIRK(0x10cf, 0x1845, "Lifebook U904", ALC269_FIXUP_LIFEBOOK_EXTMIC),
         SND_PCI_QUIRK(0x10ec, 0x10f2, "Intel Reference board", ALC700_FIXUP_INTEL_REFERENCE),
+        SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-SZ6", ALC269_FIXUP_HEADSET_MODE),
         SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),
         SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8),
         SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 0d1acb704f64..7ec85d567598 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -519,10 +519,12 @@ struct section *elf_create_section(struct elf *elf, const char *name,
         sec->sh.sh_flags = SHF_ALLOC;
 
 
-        /* Add section name to .shstrtab */
+        /* Add section name to .shstrtab (or .strtab for Clang) */
         shstrtab = find_section_by_name(elf, ".shstrtab");
+        if (!shstrtab)
+                shstrtab = find_section_by_name(elf, ".strtab");
         if (!shstrtab) {
-                WARN("can't find .shstrtab section");
+                WARN("can't find .shstrtab or .strtab section");
                 return NULL;
         }
 
diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c
index 2ecd27b670d7..f5f7bcc96046 100644
--- a/tools/testing/selftests/bpf/test_verifier.c
+++ b/tools/testing/selftests/bpf/test_verifier.c
@@ -4975,6 +4975,24 @@ static struct bpf_test tests[] = {
                 .prog_type = BPF_PROG_TYPE_LWT_XMIT,
         },
         {
+                "make headroom for LWT_XMIT",
+                .insns = {
+                        BPF_MOV64_REG(BPF_REG_6, BPF_REG_1),
+                        BPF_MOV64_IMM(BPF_REG_2, 34),
+                        BPF_MOV64_IMM(BPF_REG_3, 0),
+                        BPF_EMIT_CALL(BPF_FUNC_skb_change_head),
+                        /* split for s390 to succeed */
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_6),
+                        BPF_MOV64_IMM(BPF_REG_2, 42),
+                        BPF_MOV64_IMM(BPF_REG_3, 0),
+                        BPF_EMIT_CALL(BPF_FUNC_skb_change_head),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .result = ACCEPT,
+                .prog_type = BPF_PROG_TYPE_LWT_XMIT,
+        },
+        {
                 "invalid access of tc_classid for LWT_IN",
                 .insns = {
                         BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,
@@ -12554,8 +12572,11 @@ static void do_test_single(struct bpf_test *test, bool unpriv,
         }
 
         if (fd_prog >= 0) {
+                __u8 tmp[TEST_DATA_LEN << 2];
+                __u32 size_tmp = sizeof(tmp);
+
                 err = bpf_prog_test_run(fd_prog, 1, test->data,
-                                        sizeof(test->data), NULL, NULL,
+                                        sizeof(test->data), tmp, &size_tmp,
                                         &retval, NULL);
                 if (err && errno != 524/*ENOTSUPP*/ && errno != EPERM) {
                         printf("Unexpected bpf_prog_test_run error\n");
diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh
index 78245d60d8bc..0f45633bd634 100755
--- a/tools/testing/selftests/net/fib_tests.sh
+++ b/tools/testing/selftests/net/fib_tests.sh
@@ -740,13 +740,6 @@ ipv6_rt_add()
         run_cmd "$IP -6 ro add unreachable 2001:db8:104::/64"
         log_test $? 2 "Attempt to add duplicate route - reject route"
 
-        # iproute2 prepend only sets NLM_F_CREATE
-        # - adds a new route; does NOT convert existing route to ECMP
-        add_route6 "2001:db8:104::/64" "via 2001:db8:101::2"
-        run_cmd "$IP -6 ro prepend 2001:db8:104::/64 via 2001:db8:103::2"
-        check_route6 "2001:db8:104::/64 via 2001:db8:101::2 dev veth1 metric 1024 2001:db8:104::/64 via 2001:db8:103::2 dev veth3 metric 1024"
-        log_test $? 0 "Add new route for existing prefix (w/o NLM_F_EXCL)"
-
         # route append with same prefix adds a new route
         # - iproute2 sets NLM_F_CREATE | NLM_F_APPEND
         add_route6 "2001:db8:104::/64" "via 2001:db8:101::2"
@@ -754,27 +747,6 @@ ipv6_rt_add()
         check_route6 "2001:db8:104::/64 metric 1024 nexthop via 2001:db8:101::2 dev veth1 weight 1 nexthop via 2001:db8:103::2 dev veth3 weight 1"
         log_test $? 0 "Append nexthop to existing route - gw"
 
-        add_route6 "2001:db8:104::/64" "via 2001:db8:101::2"
-        run_cmd "$IP -6 ro append 2001:db8:104::/64 dev veth3"
-        check_route6 "2001:db8:104::/64 metric 1024 nexthop via 2001:db8:101::2 dev veth1 weight 1 nexthop dev veth3 weight 1"
-        log_test $? 0 "Append nexthop to existing route - dev only"
-
-        # multipath route can not have a nexthop that is a reject route
-        add_route6 "2001:db8:104::/64" "via 2001:db8:101::2"
-        run_cmd "$IP -6 ro append unreachable 2001:db8:104::/64"
-        log_test $? 2 "Append nexthop to existing route - reject route"
-
-        # reject route can not be converted to multipath route
-        run_cmd "$IP -6 ro flush 2001:db8:104::/64"
-        run_cmd "$IP -6 ro add unreachable 2001:db8:104::/64"
-        run_cmd "$IP -6 ro append 2001:db8:104::/64 via 2001:db8:103::2"
-        log_test $? 2 "Append nexthop to existing reject route - gw"
-
-        run_cmd "$IP -6 ro flush 2001:db8:104::/64"
-        run_cmd "$IP -6 ro add unreachable 2001:db8:104::/64"
-        run_cmd "$IP -6 ro append 2001:db8:104::/64 dev veth3"
-        log_test $? 2 "Append nexthop to existing reject route - dev only"
-
         # insert mpath directly
         add_route6 "2001:db8:104::/64" "nexthop via 2001:db8:101::2 nexthop via 2001:db8:103::2"
         check_route6  "2001:db8:104::/64 metric 1024 nexthop via 2001:db8:101::2 dev veth1 weight 1 nexthop via 2001:db8:103::2 dev veth3 weight 1"
@@ -819,13 +791,6 @@ ipv6_rt_replace_single()
         check_route6 "2001:db8:104::/64 metric 1024 nexthop via 2001:db8:101::3 dev veth1 weight 1 nexthop via 2001:db8:103::2 dev veth3 weight 1"
         log_test $? 0 "Single path with multipath"
 
-        # single path with reject
-        #
-        add_initial_route6 "nexthop via 2001:db8:101::2"
-        run_cmd "$IP -6 ro replace unreachable 2001:db8:104::/64"
-        check_route6 "unreachable 2001:db8:104::/64 dev lo metric 1024"
-        log_test $? 0 "Single path with reject route"
-
         # single path with single path using MULTIPATH attribute
         #
         add_initial_route6 "via 2001:db8:101::2"
@@ -873,12 +838,6 @@ ipv6_rt_replace_mpath()
         check_route6 "2001:db8:104::/64 via 2001:db8:101::3 dev veth1 metric 1024"
         log_test $? 0 "Multipath with single path via multipath attribute"
 
-        # multipath with reject
-        add_initial_route6 "nexthop via 2001:db8:101::2 nexthop via 2001:db8:103::2"
-        run_cmd "$IP -6 ro replace unreachable 2001:db8:104::/64"
-        check_route6 "unreachable 2001:db8:104::/64 dev lo metric 1024"
-        log_test $? 0 "Multipath with reject route"
-
         # route replace fails - invalid nexthop 1
         add_initial_route6 "nexthop via 2001:db8:101::2 nexthop via 2001:db8:103::2"
         run_cmd "$IP -6 ro replace 2001:db8:104::/64 nexthop via 2001:db8:111::3 nexthop via 2001:db8:103::3"
diff --git a/tools/testing/selftests/net/udpgso_bench.sh b/tools/testing/selftests/net/udpgso_bench.sh
index 792fa4d0285e..850767befa47 100755
--- a/tools/testing/selftests/net/udpgso_bench.sh
+++ b/tools/testing/selftests/net/udpgso_bench.sh
@@ -35,9 +35,6 @@ run_udp() {
 
         echo "udp gso"
         run_in_netns ${args} -S
-
-        echo "udp gso zerocopy"
-        run_in_netns ${args} -S -z
 }
 
 run_tcp() {
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index 90d30fbe95ae..b20b751286fc 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -119,8 +119,12 @@ irqfd_shutdown(struct work_struct *work)
 {
         struct kvm_kernel_irqfd *irqfd =
                 container_of(work, struct kvm_kernel_irqfd, shutdown);
+        struct kvm *kvm = irqfd->kvm;
         u64 cnt;
 
+        /* Make sure irqfd has been initalized in assign path. */
+        synchronize_srcu(&kvm->irq_srcu);
+
         /*
          * Synchronize with the wait-queue and unhook ourselves to prevent
          * further events.
@@ -387,7 +391,6 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
 
         idx = srcu_read_lock(&kvm->irq_srcu);
         irqfd_update(kvm, irqfd);
-        srcu_read_unlock(&kvm->irq_srcu, idx);
 
         list_add_tail(&irqfd->list, &kvm->irqfds.items);
 
@@ -402,11 +405,6 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
         if (events & EPOLLIN)
                 schedule_work(&irqfd->inject);
 
-        /*
-         * do not drop the file until the irqfd is fully initialized, otherwise
-         * we might race against the EPOLLHUP
-         */
-        fdput(f);
 #ifdef CONFIG_HAVE_KVM_IRQ_BYPASS
         if (kvm_arch_has_irq_bypass()) {
                 irqfd->consumer.token = (void *)irqfd->eventfd;
@@ -421,6 +419,13 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
         }
 #endif
 
+        srcu_read_unlock(&kvm->irq_srcu, idx);
+
+        /*
+         * do not drop the file until the irqfd is fully initialized, otherwise
+         * we might race against the EPOLLHUP
+         */
+        fdput(f);
         return 0;
 
 fail: