169 files changed, 2566 insertions, 1086 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-mdio b/Documentation/ABI/testing/sysfs-bus-mdio
deleted file mode 100644
index 491baaf4285f..000000000000
--- a/Documentation/ABI/testing/sysfs-bus-mdio
+++ /dev/null
@@ -1,29 +0,0 @@
-What:           /sys/bus/mdio_bus/devices/.../phy_id
-Date:           November 2012
-KernelVersion:  3.8
-Contact:        netdev@vger.kernel.org
-Description:
-                This attribute contains the 32-bit PHY Identifier as reported
-                by the device during bus enumeration, encoded in hexadecimal.
-                This ID is used to match the device with the appropriate
-                driver.
-What:           /sys/bus/mdio_bus/devices/.../phy_interface
-Date:           February 2014
-KernelVersion:  3.15
-Contact:        netdev@vger.kernel.org
-Description:
-                This attribute contains the PHY interface as configured by the
-                Ethernet driver during bus enumeration, encoded in string.
-                This interface mode is used to configure the Ethernet MAC with the
-                appropriate mode for its data lines to the PHY hardware.
-What:           /sys/bus/mdio_bus/devices/.../phy_has_fixups
-Date:           February 2014
-KernelVersion:  3.15
-Contact:        netdev@vger.kernel.org
-Description:
-                This attribute contains the boolean value whether a given PHY
-                device has had any "fixup" workaround running on it, encoded as
-                a boolean. This information is provided to help troubleshooting
-                PHY configurations.
diff --git a/Documentation/ABI/testing/sysfs-class-net-phydev b/Documentation/ABI/testing/sysfs-class-net-phydev
index 6ebabfb27912..2a5723343aba 100644
--- a/Documentation/ABI/testing/sysfs-class-net-phydev
+++ b/Documentation/ABI/testing/sysfs-class-net-phydev
@@ -11,24 +11,31 @@ Date:		February 2014
 KernelVersion:  3.15
 Contact:        netdev@vger.kernel.org
 Description:
-                Boolean value indicating whether the PHY device has
+                This attribute contains the boolean value whether a given PHY
-                any fixups registered against it (phy_register_fixup)
+                device has had any "fixup" workaround running on it, encoded as
+                a boolean. This information is provided to help troubleshooting
+                PHY configurations.
 What:           /sys/class/mdio_bus/<bus>/<device>/phy_id
 Date:           November 2012
 KernelVersion:  3.8
 Contact:        netdev@vger.kernel.org
 Description:
-                32-bit hexadecimal value corresponding to the PHY device's OUI,
+                This attribute contains the 32-bit PHY Identifier as reported
-                model and revision number.
+                by the device during bus enumeration, encoded in hexadecimal.
+                This ID is used to match the device with the appropriate
+                driver.
 What:           /sys/class/mdio_bus/<bus>/<device>/phy_interface
 Date:           February 2014
 KernelVersion:  3.15
 Contact:        netdev@vger.kernel.org
 Description:
-                String value indicating the PHY interface, possible
+                This attribute contains the PHY interface as configured by the
-                values are:.
+                Ethernet driver during bus enumeration, encoded in string.
+                This interface mode is used to configure the Ethernet MAC with the
+                appropriate mode for its data lines to the PHY hardware.
+                Possible values are:
                <empty> (not available), mii, gmii, sgmii, tbi, rev-mii,
                rmii, rgmii, rgmii-id, rgmii-rxid, rgmii-txid, rtbi, smii
                xgmii, moca, qsgmii, trgmii, 1000base-x, 2500base-x, rxaui,
diff --git a/Documentation/admin-guide/mm/index.rst b/Documentation/admin-guide/mm/index.rst
index 8edb35f11317..ddf8d8d33377 100644
--- a/Documentation/admin-guide/mm/index.rst
+++ b/Documentation/admin-guide/mm/index.rst
@@ -31,6 +31,7 @@ the Linux memory management.
   ksm
   memory-hotplug
   numa_memory_policy
+   numaperf
   pagemap
   soft-dirty
   transhuge
diff --git a/Documentation/admin-guide/mm/numaperf.rst b/Documentation/admin-guide/mm/numaperf.rst
index b79f70c04397..c067ed145158 100644
--- a/Documentation/admin-guide/mm/numaperf.rst
+++ b/Documentation/admin-guide/mm/numaperf.rst
@@ -15,7 +15,7 @@ characteristics.  Some memory may share the same node as a CPU, and others
 are provided as memory only nodes. While memory only nodes do not provide
 CPUs, they may still be local to one or more compute nodes relative to
 other nodes. The following diagram shows one such example of two compute
-nodes with local memory and a memory only node for each of compute node:
+nodes with local memory and a memory only node for each of compute node::
 +------------------+     +------------------+
 | Compute Node 0   +-----+ Compute Node 1   |
diff --git a/Documentation/conf.py b/Documentation/conf.py
index 72647a38b5c2..7ace3f8852bd 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -37,7 +37,7 @@ needs_sphinx = '1.3'
 extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', 'kfigure', 'sphinx.ext.ifconfig']
 # The name of the math extension changed on Sphinx 1.4
-if major == 1 and minor > 3:
+if (major == 1 and minor > 3) or (major > 1):
    extensions.append("sphinx.ext.imgmath")
 else:
    extensions.append("sphinx.ext.pngmath")
diff --git a/Documentation/firmware-guide/acpi/enumeration.rst b/Documentation/firmware-guide/acpi/enumeration.rst
index 6b32b7be8c85..850be9696931 100644
--- a/Documentation/firmware-guide/acpi/enumeration.rst
+++ b/Documentation/firmware-guide/acpi/enumeration.rst
@@ -423,7 +423,7 @@ will be enumerated to depends on the device ID returned by _HID.
 For example, the following ACPI sample might be used to enumerate an lm75-type
 I2C temperature sensor and match it to the driver using the Device Tree
-namespace link:
+namespace link::
        Device (TMP0)
        {
diff --git a/Documentation/networking/device_drivers/index.rst b/Documentation/networking/device_drivers/index.rst
new file mode 100644
index 000000000000..75fa537763a4
--- /dev/null
+++ b/Documentation/networking/device_drivers/index.rst
@@ -0,0 +1,30 @@
+.. SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+Vendor Device Drivers
+=====================
+Contents:
+.. toctree::
+   :maxdepth: 2
+   freescale/dpaa2/index
+   intel/e100
+   intel/e1000
+   intel/e1000e
+   intel/fm10k
+   intel/igb
+   intel/igbvf
+   intel/ixgb
+   intel/ixgbe
+   intel/ixgbevf
+   intel/i40e
+   intel/iavf
+   intel/ice
+.. only::  subproject
+   Indices
+   =======
+   * :ref:`genindex`
diff --git a/Documentation/networking/index.rst b/Documentation/networking/index.rst
index f390fe3cfdfb..a46fca264bee 100644
--- a/Documentation/networking/index.rst
+++ b/Documentation/networking/index.rst
@@ -11,19 +11,7 @@ Contents:
   batman-adv
   can
   can_ucan_protocol
-   device_drivers/freescale/dpaa2/index
+   device_drivers/index
-   device_drivers/intel/e100
-   device_drivers/intel/e1000
-   device_drivers/intel/e1000e
-   device_drivers/intel/fm10k
-   device_drivers/intel/igb
-   device_drivers/intel/igbvf
-   device_drivers/intel/ixgb
-   device_drivers/intel/ixgbe
-   device_drivers/intel/ixgbevf
-   device_drivers/intel/i40e
-   device_drivers/intel/iavf
-   device_drivers/intel/ice
   dsa/index
   devlink-info-versions
   ieee802154
@@ -40,6 +28,8 @@ Contents:
   checksum-offloads
   segmentation-offloads
   scaling
+   tls
+   tls-offload
 .. only::  subproject
diff --git a/Documentation/networking/tls-offload-layers.svg b/Documentation/networking/tls-offload-layers.svg
new file mode 100644
index 000000000000..cf72f05dbb21
--- /dev/null
+++ b/Documentation/networking/tls-offload-layers.svg
@@ -0,0 +1 @@
+<svg version="1.1" viewBox="0.0 0.0 460.0 500.0" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><clipPath id="p.0"><path d="m0 0l960.0 0l0 720.0l-960.0 0l0 -720.0z" clip-rule="nonzero"/></clipPath><g clip-path="url(#p.0)"><path fill="#000000" fill-opacity="0.0" d="m0 0l960.0 0l0 720.0l-960.0 0z" fill-rule="evenodd"/><path fill="#cfe2f3" d="m117.02887 0l72.28346 0l0 40.25197l-72.28346 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m117.02887 0l72.28346 0l0 40.25197l-72.28346 0z" fill-rule="evenodd"/><path fill="#000000" d="m135.71944 27.045982l0 -9.671875l1.46875 0l0 1.46875q0.5625 -1.03125 1.03125 -1.359375q0.484375 -0.328125 1.0625 -0.328125q0.828125 0 1.6875 0.53125l-0.5625 1.515625q-0.609375 -0.359375 -1.203125 -0.359375q-0.546875 0 -0.96875 0.328125q-0.421875 0.328125 -0.609375 0.890625q-0.28125 0.875 -0.28125 1.921875l0 5.0625l-1.625 0zm12.853302 -3.109375l1.6875 0.203125q-0.40625 1.484375 -1.484375 2.3125q-1.078125 0.8125 -2.765625 0.8125q-2.125 0 -3.375 -1.296875q-1.234375 -1.3125 -1.234375 -3.671875q0 -2.453125 1.25 -3.796875q1.265625 -1.34375 3.265625 -1.34375q1.9375 0 3.15625 1.328125q1.234375 1.3125 1.234375 3.703125q0 0.15625 0 0.4375l-7.21875 0q0.09375 1.59375 0.90625 2.453125q0.8125 0.84375 2.015625 0.84375q0.90625 0 1.546875 -0.46875q0.640625 -0.484375 1.015625 -1.515625zm-5.390625 -2.65625l5.40625 0q-0.109375 -1.21875 -0.625 -1.828125q-0.78125 -0.953125 -2.03125 -0.953125q-1.125 0 -1.90625 0.765625q-0.765625 0.75 -0.84375 2.015625zm15.453842 4.578125q-0.921875 0.765625 -1.765625 1.09375q-0.828125 0.3125 -1.796875 0.3125q-1.59375 0 -2.453125 -0.78125q-0.859375 -0.78125 -0.859375 -1.984375q0 -0.71875 0.328125 -1.296875q0.328125 -0.59375 0.84375 -0.9375q0.53125 -0.359375 1.1875 -0.546875q0.46875 -0.125 1.453125 -0.25q1.984375 -0.234375 2.921875 -0.5625q0.015625 -0.34375 0.015625 -0.421875q0 -1.0 -0.46875 -1.421875q-0.625 -0.546875 -1.875 -0.546875q-1.15625 0 -1.703125 0.40625q-0.546875 0.40625 -0.8125 1.421875l-1.609375 -0.21875q0.21875 -1.015625 0.71875 -1.640625q0.5 -0.640625 1.453125 -0.984375q0.953125 -0.34375 2.1875 -0.34375q1.25 0 2.015625 0.296875q0.78125 0.28125 1.140625 0.734375q0.375 0.4375 0.515625 1.109375q0.078125 0.421875 0.078125 1.515625l0 2.1875q0 2.28125 0.109375 2.890625q0.109375 0.59375 0.40625 1.15625l-1.703125 0q-0.265625 -0.515625 -0.328125 -1.1875zm-0.140625 -3.671875q-0.890625 0.375 -2.671875 0.625q-1.015625 0.140625 -1.4375 0.328125q-0.421875 0.1875 -0.65625 0.53125q-0.21875 0.34375 -0.21875 0.78125q0 0.65625 0.5 1.09375q0.5 0.4375 1.453125 0.4375q0.9375 0 1.671875 -0.40625q0.75 -0.421875 1.09375 -1.140625q0.265625 -0.5625 0.265625 -1.640625l0 -0.609375zm10.469467 4.859375l0 -1.21875q-0.90625 1.4375 -2.703125 1.4375q-1.15625 0 -2.125 -0.640625q-0.96875 -0.640625 -1.5 -1.78125q-0.53125 -1.140625 -0.53125 -2.625q0 -1.453125 0.484375 -2.625q0.484375 -1.1875 1.4375 -1.8125q0.96875 -0.625 2.171875 -0.625q0.875 0 1.546875 0.375q0.6875 0.359375 1.109375 0.953125l0 -4.796875l1.640625 0l0 13.359375l-1.53125 0zm-5.171875 -4.828125q0 1.859375 0.78125 2.78125q0.78125 0.921875 1.84375 0.921875q1.078125 0 1.828125 -0.875q0.75 -0.890625 0.75 -2.6875q0 -1.984375 -0.765625 -2.90625q-0.765625 -0.9375 -1.890625 -0.9375q-1.078125 0 -1.8125 0.890625q-0.734375 0.890625 -0.734375 2.8125z" fill-rule="nonzero"/><path fill="#cfe2f3" d="m309.02887 0l72.28348 0l0 40.25197l-72.28348 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m309.02887 0l72.28348 0l0 40.25197l-72.28348 0z" fill-rule="evenodd"/><path fill="#000000" d="m328.4915 27.045982l-2.96875 -9.671875l1.703125 0l1.53125 5.578125l0.578125 2.078125q0.046875 -0.15625 0.5 -2.0l1.546875 -5.65625l1.6875 0l1.4375 5.609375l0.484375 1.84375l0.5625 -1.859375l1.65625 -5.59375l1.59375 0l-3.03125 9.671875l-1.703125 0l-1.53125 -5.796875l-0.375 -1.640625l-1.953125 7.4375l-1.71875 0zm11.676086 0l0 -9.671875l1.46875 0l0 1.46875q0.5625 -1.03125 1.03125 -1.359375q0.484375 -0.328125 1.0625 -0.328125q0.828125 0 1.6875 0.53125l-0.5625 1.515625q-0.609375 -0.359375 -1.203125 -0.359375q-0.546875 0 -0.96875 0.328125q-0.421875 0.328125 -0.609375 0.890625q-0.28125 0.875 -0.28125 1.921875l0 5.0625l-1.625 0zm6.228302 -11.46875l0 -1.890625l1.640625 0l0 1.890625l-1.640625 0zm0 11.46875l0 -9.671875l1.640625 0l0 9.671875l-1.640625 0zm7.722931 -1.46875l0.234375 1.453125q-0.6875 0.140625 -1.234375 0.140625q-0.890625 0 -1.390625 -0.28125q-0.484375 -0.28125 -0.6875 -0.734375q-0.203125 -0.46875 -0.203125 -1.9375l0 -5.578125l-1.203125 0l0 -1.265625l1.203125 0l0 -2.390625l1.625 -0.984375l0 3.375l1.65625 0l0 1.265625l-1.65625 0l0 5.671875q0 0.6875 0.078125 0.890625q0.09375 0.203125 0.28125 0.328125q0.203125 0.109375 0.578125 0.109375q0.265625 0 0.71875 -0.0625zm8.230194 -1.640625l1.6875 0.203125q-0.40625 1.484375 -1.484375 2.3125q-1.078125 0.8125 -2.765625 0.8125q-2.125 0 -3.375 -1.296875q-1.234375 -1.3125 -1.234375 -3.671875q0 -2.453125 1.25 -3.796875q1.265625 -1.34375 3.265625 -1.34375q1.9375 0 3.15625 1.328125q1.234375 1.3125 1.234375 3.703125q0 0.15625 0 0.4375l-7.21875 0q0.09375 1.59375 0.90625 2.453125q0.8125 0.84375 2.015625 0.84375q0.90625 0 1.546875 -0.46875q0.640625 -0.484375 1.015625 -1.515625zm-5.390625 -2.65625l5.40625 0q-0.109375 -1.21875 -0.625 -1.828125q-0.78125 -0.953125 -2.03125 -0.953125q-1.125 0 -1.90625 0.765625q-0.765625 0.75 -0.84375 2.015625z" fill-rule="nonzero"/><path fill="#cfe2f3" d="m73.64304 101.46588l351.0551 0l0 53.70079l-351.0551 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m73.64304 101.46588l351.0551 0l0 53.70079l-351.0551 0z" fill-rule="evenodd"/><path fill="#000000" d="m215.67503 135.23627l0 -13.359367l1.640625 0l0 7.6249924l3.890625 -3.9374924l2.109375 0l-3.6875 3.5937424l4.0625 6.078125l-2.015625 0l-3.203125 -4.953125l-1.15625 1.125l0 3.828125l-1.640625 0zm12.90625 -1.46875l0.234375 1.453125q-0.6875 0.140625 -1.234375 0.140625q-0.890625 0 -1.390625 -0.28125q-0.484375 -0.28125 -0.6875 -0.734375q-0.203125 -0.46875 -0.203125 -1.9375l0 -5.5781174l-1.203125 0l0 -1.265625l1.203125 0l0 -2.390625l1.625 -0.984375l0 3.375l1.65625 0l0 1.265625l-1.65625 0l0 5.6718674q0 0.6875 0.078125 0.890625q0.09375 0.203125 0.28125 0.328125q0.203125 0.109375 0.578125 0.109375q0.265625 0 0.71875 -0.0625zm1.5583038 1.46875l0 -13.359367l1.640625 0l0 13.359367l-1.640625 0zm3.5354462 -2.890625l1.625 -0.25q0.125 0.96875 0.75 1.5q0.625 0.515625 1.75 0.515625q1.125 0 1.671875 -0.453125q0.546875 -0.46875 0.546875 -1.09375q0 -0.546875 -0.484375 -0.875q-0.328125 -0.21875 -1.671875 -0.546875q-1.8125 -0.46875 -2.515625 -0.796875q-0.6875 -0.328125 -1.046875 -0.90625q-0.359375 -0.59375 -0.359375 -1.3125q0 -0.6406174 0.296875 -1.1874924q0.296875 -0.5625 0.8125 -0.921875q0.375 -0.28125 1.03125 -0.46875q0.671875 -0.203125 1.421875 -0.203125q1.140625 0 2.0 0.328125q0.859375 0.328125 1.265625 0.890625q0.421875 0.5625 0.578125 1.4999924l-1.609375 0.21875q-0.109375 -0.7499924 -0.640625 -1.1718674q-0.515625 -0.421875 -1.46875 -0.421875q-1.140625 0 -1.625 0.375q-0.46875 0.375 -0.46875 0.875q0 0.31249237 0.1875 0.5781174q0.203125 0.265625 0.640625 0.4375q0.234375 0.09375 1.4375 0.421875q1.75 0.453125 2.4375 0.75q0.6875 0.296875 1.078125 0.859375q0.390625 0.5625 0.390625 1.40625q0 0.828125 -0.484375 1.546875q-0.46875 0.71875 -1.375 1.125q-0.90625 0.390625 -2.046875 0.390625q-1.875 0 -2.875 -0.78125q-0.984375 -0.78125 -1.25 -2.328125zm24.136429 -10.468742l1.765625 0l0 7.7187424q0 2.015625 -0.453125 3.203125q-0.453125 1.1875 -1.640625 1.9375q-1.1875 0.734375 -3.125 0.734375q-1.875 0 -3.078125 -0.640625q-1.1875 -0.65625 -1.703125 -1.875q-0.5 -1.234375 -0.5 -3.359375l0 -7.7187424l1.765625 0l0 7.7187424q0 1.734375 0.3125 2.5625q0.328125 0.8125 1.109375 1.265625q0.796875 0.453125 1.9375 0.453125q1.953125 0 2.78125 -0.890625q0.828125 -0.890625 0.828125 -3.390625l0 -7.7187424zm4.629181 13.359367l0 -13.359367l1.78125 0l0 11.781242l6.5625 0l0 1.578125l-8.34375 0zm10.453857 0l0 -13.359367l5.046875 0q1.328125 0 2.03125 0.125q0.96875 0.171875 1.640625 0.640625q0.671875 0.453125 1.078125 1.28125q0.40625 0.828125 0.40625 1.828125q0 1.703125 -1.09375 2.8906174q-1.078125 1.171875 -3.921875 1.171875l-3.421875 0l0 5.421875l-1.765625 0zm1.765625 -7.0l3.453125 0q1.71875 0 2.4375 -0.6406174q0.71875 -0.640625 0.71875 -1.796875q0 -0.84375 -0.421875 -1.4375q-0.421875 -0.59375 -1.125 -0.78125q-0.4375 -0.125 -1.640625 -0.125l-3.421875 0l0 4.7812424z" fill-rule="nonzero"/><path fill="#cfe2f3" d="m73.64304 216.38058l351.0551 0l0 53.700775l-351.0551 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m73.64304 216.38058l351.0551 0l0 53.700775l-351.0551 0z" fill-rule="evenodd"/><path fill="#000000" d="m211.16338 250.15097l0 -11.78125l-4.40625 0l0 -1.578125l10.578125 0l0 1.578125l-4.40625 0l0 11.78125l-1.765625 0zm17.52098 -4.6875l1.765625 0.453125q-0.5625 2.171875 -2.0 3.328125q-1.4375 1.140625 -3.53125 1.140625q-2.15625 0 -3.515625 -0.875q-1.34375 -0.890625 -2.0625 -2.546875q-0.703125 -1.671875 -0.703125 -3.59375q0 -2.078125 0.796875 -3.625q0.796875 -1.5625 2.265625 -2.359375q1.484375 -0.8125 3.25 -0.8125q2.0 0 3.359375 1.015625q1.375 1.015625 1.90625 2.875l-1.734375 0.40625q-0.46875 -1.453125 -1.359375 -2.109375q-0.875 -0.671875 -2.203125 -0.671875q-1.546875 0 -2.578125 0.734375q-1.03125 0.734375 -1.453125 1.984375q-0.421875 1.234375 -0.421875 2.5625q0 1.703125 0.5 2.96875q0.5 1.265625 1.546875 1.90625q1.046875 0.625 2.265625 0.625q1.484375 0 2.515625 -0.859375q1.03125 -0.859375 1.390625 -2.546875zm3.9416962 4.6875l0 -13.359375l5.046875 0q1.328125 0 2.03125 0.125q0.96875 0.171875 1.640625 0.640625q0.671875 0.453125 1.078125 1.28125q0.40625 0.828125 0.40625 1.828125q0 1.703125 -1.09375 2.890625q-1.078125 1.171875 -3.921875 1.171875l-3.421875 0l0 5.421875l-1.765625 0zm1.765625 -7.0l3.453125 0q1.71875 0 2.4375 -0.640625q0.71875 -0.640625 0.71875 -1.796875q0 -0.84375 -0.421875 -1.4375q-0.421875 -0.59375 -1.125 -0.78125q-0.4375 -0.125 -1.640625 -0.125l-3.421875 0l0 4.78125zm14.664642 4.109375l1.625 -0.25q0.125 0.96875 0.75 1.5q0.625 0.515625 1.75 0.515625q1.125 0 1.671875 -0.453125q0.546875 -0.46875 0.546875 -1.09375q0 -0.546875 -0.484375 -0.875q-0.328125 -0.21875 -1.671875 -0.546875q-1.8125 -0.46875 -2.515625 -0.796875q-0.6875 -0.328125 -1.046875 -0.90625q-0.359375 -0.59375 -0.359375 -1.3125q0 -0.640625 0.296875 -1.1875q0.296875 -0.5625 0.8125 -0.921875q0.375 -0.28125 1.03125 -0.46875q0.671875 -0.203125 1.421875 -0.203125q1.140625 0 2.0 0.328125q0.859375 0.328125 1.2656097 0.890625q0.421875 0.5625 0.578125 1.5l-1.6093597 0.21875q-0.109375 -0.75 -0.640625 -1.171875q-0.515625 -0.421875 -1.46875 -0.421875q-1.140625 0 -1.625 0.375q-0.46875 0.375 -0.46875 0.875q0 0.3125 0.1875 0.578125q0.203125 0.265625 0.640625 0.4375q0.234375 0.09375 1.4375 0.421875q1.75 0.453125 2.4375 0.75q0.68748474 0.296875 1.0781097 0.859375q0.390625 0.5625 0.390625 1.40625q0 0.828125 -0.484375 1.546875q-0.46875 0.71875 -1.3749847 1.125q-0.90625 0.390625 -2.046875 0.390625q-1.875 0 -2.875 -0.78125q-0.984375 -0.78125 -1.25 -2.328125zm13.562485 1.421875l0.234375 1.453125q-0.6875 0.140625 -1.234375 0.140625q-0.890625 0 -1.390625 -0.28125q-0.484375 -0.28125 -0.6875 -0.734375q-0.203125 -0.46875 -0.203125 -1.9375l0 -5.578125l-1.203125 0l0 -1.265625l1.203125 0l0 -2.390625l1.625 -0.984375l0 3.375l1.65625 0l0 1.265625l-1.65625 0l0 5.671875q0 0.6875 0.078125 0.890625q0.09375 0.203125 0.28125 0.328125q0.203125 0.109375 0.578125 0.109375q0.265625 0 0.71875 -0.0625zm7.917694 0.28125q-0.921875 0.765625 -1.765625 1.09375q-0.828125 0.3125 -1.796875 0.3125q-1.59375 0 -2.453125 -0.78125q-0.859375 -0.78125 -0.859375 -1.984375q0 -0.71875 0.328125 -1.296875q0.328125 -0.59375 0.84375 -0.9375q0.53125 -0.359375 1.1875 -0.546875q0.46875 -0.125 1.453125 -0.25q1.984375 -0.234375 2.921875 -0.5625q0.015625 -0.34375 0.015625 -0.421875q0 -1.0 -0.46875 -1.421875q-0.625 -0.546875 -1.875 -0.546875q-1.15625 0 -1.703125 0.40625q-0.546875 0.40625 -0.8125 1.421875l-1.609375 -0.21875q0.21875 -1.015625 0.71875 -1.640625q0.5 -0.640625 1.453125 -0.984375q0.953125 -0.34375 2.1875 -0.34375q1.25 0 2.015625 0.296875q0.78125 0.28125 1.140625 0.734375q0.375 0.4375 0.515625 1.109375q0.078125 0.421875 0.078125 1.515625l0 2.1875q0 2.28125 0.109375 2.890625q0.109375 0.59375 0.40625 1.15625l-1.703125 0q-0.265625 -0.515625 -0.328125 -1.1875zm-0.140625 -3.671875q-0.890625 0.375 -2.671875 0.625q-1.015625 0.140625 -1.4375 0.328125q-0.421875 0.1875 -0.65625 0.53125q-0.21875 0.34375 -0.21875 0.78125q0 0.65625 0.5 1.09375q0.5 0.4375 1.453125 0.4375q0.9375 0 1.671875 -0.40625q0.75 -0.421875 1.09375 -1.140625q0.265625 -0.5625 0.265625 -1.640625l0 -0.609375zm10.516327 1.3125l1.609375 0.21875q-0.265625 1.65625 -1.359375 2.609375q-1.078125 0.9375 -2.671875 0.9375q-1.984375 0 -3.1875 -1.296875q-1.203125 -1.296875 -1.203125 -3.71875q0 -1.578125 0.515625 -2.75q0.515625 -1.171875 1.578125 -1.75q1.0625 -0.59375 2.3125 -0.59375q1.578125 0 2.578125 0.796875q1.0 0.796875 1.28125 2.265625l-1.59375 0.234375q-0.234375 -0.96875 -0.8125 -1.453125q-0.578125 -0.5 -1.390625 -0.5q-1.234375 0 -2.015625 0.890625q-0.78125 0.890625 -0.78125 2.8125q0 1.953125 0.75 2.84375q0.75 0.875 1.953125 0.875q0.96875 0 1.609375 -0.59375q0.65625 -0.59375 0.828125 -1.828125zm3.015625 3.546875l0 -13.359375l1.640625 0l0 7.625l3.890625 -3.9375l2.109375 0l-3.6875 3.59375l4.0625 6.078125l-2.015625 0l-3.203125 -4.953125l-1.15625 1.125l0 3.828125l-1.640625 0z" fill-rule="nonzero"/><path fill="#cfe2f3" d="m73.64304 331.2953l351.0551 0l0 53.700775l-351.0551 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m73.64304 331.2953l351.0551 0l0 53.700775l-351.0551 0z" fill-rule="evenodd"/><path fill="#000000" d="m225.73463 365.06567l0 -13.359375l4.609375 0q1.546875 0 2.375 0.203125q1.140625 0.25 1.953125 0.953125q1.0625 0.890625 1.578125 2.28125q0.53125 1.390625 0.53125 3.171875q0 1.515625 -0.359375 2.703125q-0.359375 1.171875 -0.921875 1.9375q-0.546875 0.765625 -1.203125 1.21875q-0.65625 0.4375 -1.59375 0.671875q-0.9375 0.21875 -2.140625 0.21875l-4.828125 0zm1.765625 -1.578125l2.859375 0q1.3125 0 2.0625 -0.234375q0.75 -0.25 1.203125 -0.703125q0.625 -0.625 0.96875 -1.6875q0.359375 -1.0625 0.359375 -2.578125q0 -2.09375 -0.6875 -3.21875q-0.6875 -1.125 -1.671875 -1.5q-0.703125 -0.28125 -2.28125 -0.28125l-2.8125 0l0 10.203125zm11.488571 1.578125l0 -9.671875l1.46875 0l0 1.46875q0.5625 -1.03125 1.03125 -1.359375q0.484375 -0.328125 1.0625 -0.328125q0.828125 0 1.6875 0.53125l-0.5625 1.515625q-0.609375 -0.359375 -1.203125 -0.359375q-0.546875 0 -0.96875 0.328125q-0.421875 0.328125 -0.609375 0.890625q-0.28125 0.875 -0.28125 1.921875l0 5.0625l-1.625 0zm6.228302 -11.46875l0 -1.890625l1.640625 0l0 1.890625l-1.640625 0zm0 11.46875l0 -9.671875l1.640625 0l0 9.671875l-1.640625 0zm6.832321 0l-3.6875 -9.671875l1.734375 0l2.078125 5.796875q0.328125 0.9375 0.625 1.9375q0.203125 -0.765625 0.609375 -1.828125l2.140625 -5.90625l1.6874847 0l-3.6562347 9.671875l-1.53125 0zm13.26561 -3.109375l1.6875 0.203125q-0.40625 1.484375 -1.484375 2.3125q-1.078125 0.8125 -2.765625 0.8125q-2.125 0 -3.375 -1.296875q-1.234375 -1.3125 -1.234375 -3.671875q0 -2.453125 1.25 -3.796875q1.265625 -1.34375 3.265625 -1.34375q1.9375 0 3.15625 1.328125q1.234375 1.3125 1.234375 3.703125q0 0.15625 0 0.4375l-7.21875 0q0.09375 1.59375 0.90625 2.453125q0.8125 0.84375 2.015625 0.84375q0.90625 0 1.546875 -0.46875q0.640625 -0.484375 1.015625 -1.515625zm-5.390625 -2.65625l5.40625 0q-0.109375 -1.21875 -0.625 -1.828125q-0.78125 -0.953125 -2.03125 -0.953125q-1.125 0 -1.90625 0.765625q-0.765625 0.75 -0.84375 2.015625zm9.125732 5.765625l0 -9.671875l1.46875 0l0 1.46875q0.5625 -1.03125 1.03125 -1.359375q0.484375 -0.328125 1.0625 -0.328125q0.828125 0 1.6875 0.53125l-0.5625 1.515625q-0.609375 -0.359375 -1.203125 -0.359375q-0.546875 0 -0.96875 0.328125q-0.421875 0.328125 -0.609375 0.890625q-0.28125 0.875 -0.28125 1.921875l0 5.0625l-1.625 0z" fill-rule="nonzero"/><path fill="#cfe2f3" d="m73.64304 446.20996l351.0551 0l0 53.700806l-351.0551 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m73.64304 446.20996l351.0551 0l0 53.700806l-351.0551 0z" fill-rule="evenodd"/><path fill="#000000" d="m222.09538 479.98038l0 -13.359375l4.609375 0q1.546875 0 2.375 0.203125q1.140625 0.25 1.953125 0.953125q1.0625 0.890625 1.578125 2.28125q0.53125 1.390625 0.53125 3.171875q0 1.515625 -0.359375 2.703125q-0.359375 1.171875 -0.921875 1.9375q-0.546875 0.765625 -1.203125 1.21875q-0.65625 0.4375 -1.59375 0.671875q-0.9375 0.21875 -2.140625 0.21875l-4.828125 0zm1.765625 -1.578125l2.859375 0q1.3125 0 2.0625 -0.234375q0.75 -0.25 1.203125 -0.703125q0.625 -0.625 0.96875 -1.6875q0.359375 -1.0625 0.359375 -2.578125q0 -2.09375 -0.6875 -3.21875q-0.6875 -1.125 -1.671875 -1.5q-0.703125 -0.28125 -2.28125 -0.28125l-2.8125 0l0 10.203125zm18.129196 -1.53125l1.6875 0.203125q-0.40625 1.484375 -1.484375 2.3125q-1.078125 0.8125 -2.765625 0.8125q-2.125 0 -3.375 -1.296875q-1.234375 -1.3125 -1.234375 -3.671875q0 -2.453125 1.25 -3.796875q1.265625 -1.34375 3.265625 -1.34375q1.9375 0 3.15625 1.328125q1.234375 1.3125 1.234375 3.703125q0 0.15625 0 0.4375l-7.21875 0q0.09375 1.59375 0.90625 2.453125q0.8125 0.84375 2.015625 0.84375q0.90625 0 1.546875 -0.46875q0.640625 -0.484375 1.015625 -1.515625zm-5.390625 -2.65625l5.40625 0q-0.109375 -1.21875 -0.625 -1.828125q-0.78125 -0.953125 -2.03125 -0.953125q-1.125 0 -1.90625 0.765625q-0.765625 0.75 -0.84375 2.015625zm11.828842 5.765625l-3.6875 -9.671875l1.734375 0l2.078125 5.796875q0.328125 0.9375 0.625 1.9375q0.203125 -0.765625 0.609375 -1.828125l2.140625 -5.90625l1.6875 0l-3.65625 9.671875l-1.53125 0zm6.640625 -11.46875l0 -1.890625l1.6406097 0l0 1.890625l-1.6406097 0zm0 11.46875l0 -9.671875l1.6406097 0l0 9.671875l-1.6406097 0zm10.457321 -3.546875l1.609375 0.21875q-0.265625 1.65625 -1.359375 2.609375q-1.078125 0.9375 -2.671875 0.9375q-1.984375 0 -3.1875 -1.296875q-1.203125 -1.296875 -1.203125 -3.71875q0 -1.578125 0.515625 -2.75q0.515625 -1.171875 1.578125 -1.75q1.0625 -0.59375 2.3125 -0.59375q1.578125 0 2.578125 0.796875q1.0 0.796875 1.28125 2.265625l-1.59375 0.234375q-0.234375 -0.96875 -0.8125 -1.453125q-0.578125 -0.5 -1.390625 -0.5q-1.234375 0 -2.015625 0.890625q-0.78125 0.890625 -0.78125 2.8125q0 1.953125 0.75 2.84375q0.75 0.875 1.953125 0.875q0.96875 0 1.609375 -0.59375q0.65625 -0.59375 0.828125 -1.828125zm9.640625 0.4375l1.6875 0.203125q-0.40625 1.484375 -1.484375 2.3125q-1.078125 0.8125 -2.765625 0.8125q-2.125 0 -3.375 -1.296875q-1.234375 -1.3125 -1.234375 -3.671875q0 -2.453125 1.25 -3.796875q1.265625 -1.34375 3.265625 -1.34375q1.9375 0 3.15625 1.328125q1.234375 1.3125 1.234375 3.703125q0 0.15625 0 0.4375l-7.21875 0q0.09375 1.59375 0.90625 2.453125q0.8125 0.84375 2.015625 0.84375q0.90625 0 1.546875 -0.46875q0.640625 -0.484375 1.015625 -1.515625zm-5.390625 -2.65625l5.40625 0q-0.109375 -1.21875 -0.625 -1.828125q-0.78125 -0.953125 -2.03125 -0.953125q-1.125 0 -1.90625 0.765625q-0.765625 0.75 -0.84375 2.015625z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m153.17061 40.25197l0 0" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m153.17061 40.25197l0 0" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m48.435696 73.03937l402.67715 0" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="4.0,3.0" d="m48.435696 73.03937l402.67715 0" fill-rule="evenodd"/><path fill="#cfe2f3" d="m177.95801 71.49061l-12.393707 0l0 12.897636l-24.7874 0l0 -12.897636l-12.393692 0l24.7874 -12.89764z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m177.95801 71.49061l-12.393707 0l0 12.897636l-24.7874 0l0 -12.897636l-12.393692 0l24.7874 -12.89764z" fill-rule="evenodd"/><path fill="#cfe2f3" d="m320.3832 71.49061l12.393707 0l0 -12.89764l24.787384 0l0 12.89764l12.393707 0l-24.787415 12.897636z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m320.3832 71.49061l12.393707 0l0 -12.89764l24.787384 0l0 12.89764l12.393707 0l-24.787415 12.897636z" fill-rule="evenodd"/><path fill="#cfe2f3" d="m177.95801 188.3931l-12.393707 0l0 12.897629l-24.7874 0l0 -12.897629l-12.393692 0l24.7874 -12.897644z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m177.95801 188.3931l-12.393707 0l0 12.897629l-24.7874 0l0 -12.897629l-12.393692 0l24.7874 -12.897644z" fill-rule="evenodd"/><path fill="#cfe2f3" d="m320.3832 188.3931l12.393707 0l0 -12.897644l24.787384 0l0 12.897644l12.393707 0l-24.787415 12.897629z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m320.3832 188.3931l12.393707 0l0 -12.897644l24.787384 0l0 12.897644l12.393707 0l-24.787415 12.897629z" fill-rule="evenodd"/><path fill="#cfe2f3" d="m177.95801 301.4256l-12.393707 0l0 12.897644l-24.7874 0l0 -12.897644l-12.393692 0l24.7874 -12.897644z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m177.95801 301.4256l-12.393707 0l0 12.897644l-24.7874 0l0 -12.897644l-12.393692 0l24.7874 -12.897644z" fill-rule="evenodd"/><path fill="#cfe2f3" d="m320.3832 301.4256l12.393707 0l0 -12.897644l24.787384 0l0 12.897644l12.393707 0l-24.787415 12.897644z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m320.3832 301.4256l12.393707 0l0 -12.897644l24.787384 0l0 12.897644l12.393707 0l-24.787415 12.897644z" fill-rule="evenodd"/><path fill="#cfe2f3" d="m177.95801 415.4906l-12.393707 0l0 12.897644l-24.7874 0l0 -12.897644l-12.393692 0l24.7874 -12.897644z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m177.95801 415.4906l-12.393707 0l0 12.897644l-24.7874 0l0 -12.897644l-12.393692 0l24.7874 -12.897644z" fill-rule="evenodd"/><path fill="#cfe2f3" d="m320.3832 415.4906l12.393707 0l0 -12.897644l24.787384 0l0 12.897644l12.393707 0l-24.787415 12.897644z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m320.3832 415.4906l12.393707 0l0 -12.897644l24.787384 0l0 12.897644l12.393707 0l-24.787415 12.897644z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m198.14961 44.009186l109.44881 0l0 53.70079l-109.44881 0z" fill-rule="evenodd"/><path fill="#000000" d="m224.98174 70.929184l2.78125 -13.359375l1.65625 0l-1.0 4.78125q0.78125 -0.71875 1.421875 -1.015625q0.640625 -0.296875 1.328125 -0.296875q1.359375 0 2.265625 1.015625q0.90625 1.0 0.90625 2.9375q0 1.28125 -0.375 2.359375q-0.359375 1.0625 -0.890625 1.78125q-0.53125 0.71875 -1.109375 1.15625q-0.578125 0.4375 -1.1875 0.640625q-0.59375 0.21875 -1.140625 0.21875q-0.96875 0 -1.703125 -0.5q-0.71875 -0.515625 -1.125 -1.546875l-0.390625 1.828125l-1.4375 0zm2.4375 -3.96875l-0.015625 0.3125q0 1.234375 0.59375 1.890625q0.59375 0.640625 1.484375 0.640625q0.859375 0 1.578125 -0.609375q0.734375 -0.609375 1.1875 -1.890625q0.46875 -1.28125 0.46875 -2.375q0 -1.21875 -0.59375 -1.890625q-0.578125 -0.671875 -1.4375 -0.671875q-0.90625 0 -1.65625 0.6875q-0.734375 0.6875 -1.234375 2.125q-0.375 1.0625 -0.375 1.78125zm14.531967 2.21875q-1.734375 1.96875 -3.5625 1.96875q-1.109375 0 -1.796875 -0.640625q-0.6875 -0.640625 -0.6875 -1.578125q0 -0.609375 0.296875 -2.09375l1.171875 -5.578125l1.65625 0l-1.296875 6.1875q-0.171875 0.765625 -0.171875 1.203125q0 0.546875 0.328125 0.859375q0.34375 0.296875 0.984375 0.296875q0.703125 0 1.359375 -0.328125q0.65625 -0.34375 1.125 -0.921875q0.484375 -0.578125 0.796875 -1.359375q0.1875 -0.5 0.453125 -1.765625l0.875 -4.171875l1.65625 0l-2.03125 9.671875l-1.515625 0l0.359375 -1.75zm4.000717 1.75l1.765625 -8.40625l-1.484375 0l0.265625 -1.265625l1.484375 0l0.28125 -1.375q0.21875 -1.03125 0.4375 -1.484375q0.234375 -0.453125 0.75 -0.75q0.53125 -0.296875 1.4375 -0.296875q0.625 0 1.828125 0.265625l-0.296875 1.4375q-0.84375 -0.21875 -1.40625 -0.21875q-0.484375 0 -0.734375 0.25q-0.25 0.234375 -0.4375 1.125l-0.21875 1.046875l1.84375 0l-0.265625 1.265625l-1.84375 0l-1.75 8.40625l-1.65625 0zm5.183304 0l1.765625 -8.40625l-1.484375 0l0.265625 -1.265625l1.484375 0l0.28125 -1.375q0.21875 -1.03125 0.4375 -1.484375q0.234375 -0.453125 0.75 -0.75q0.53125 -0.296875 1.4375 -0.296875q0.625 0 1.828125 0.265625l-0.296875 1.4375q-0.84375 -0.21875 -1.40625 -0.21875q-0.484375 0 -0.734375 0.25q-0.25 0.234375 -0.4375 1.125l-0.21875 1.046875l1.84375 0l-0.265625 1.265625l-1.84375 0l-1.75 8.40625l-1.65625 0zm12.058319 -3.28125l1.609375 0.15625q-0.34375 1.1875 -1.59375 2.265625q-1.234375 1.078125 -2.96875 1.078125q-1.0625 0 -1.96875 -0.5q-0.890625 -0.5 -1.359375 -1.4375q-0.46875 -0.953125 -0.46875 -2.15625q0 -1.59375 0.734375 -3.078125q0.734375 -1.484375 1.890625 -2.203125q1.171875 -0.734375 2.53125 -0.734375q1.734375 0 2.765625 1.078125q1.03125 1.0625 1.03125 2.921875q0 0.71875 -0.125 1.46875l-7.125 0q-0.046875 0.28125 -0.046875 0.5q0 1.359375 0.625 2.078125q0.625 0.71875 1.53125 0.71875q0.84375 0 1.65625 -0.546875q0.828125 -0.5625 1.28125 -1.609375zm-4.78125 -2.40625l5.421875 0q0.015625 -0.25 0.015625 -0.359375q0 -1.234375 -0.625 -1.890625q-0.625 -0.671875 -1.59375 -0.671875q-1.0625 0 -1.9375 0.734375q-0.859375 0.71875 -1.28125 2.1875zm8.063202 5.6875l2.015625 -9.671875l1.453125 0l-0.40625 1.96875q0.75 -1.109375 1.453125 -1.640625q0.71875 -0.546875 1.46875 -0.546875q0.5 0 1.21875 0.359375l-0.671875 1.53125q-0.4375 -0.3125 -0.9375 -0.3125q-0.875 0 -1.78125 0.96875q-0.90625 0.953125 -1.4375 3.46875l-0.8125 3.875l-1.5625 0zm6.368927 -3.3125l1.640625 -0.09375q0 0.703125 0.21875 1.21875q0.21875 0.5 0.796875 0.8125q0.59375 0.3125 1.375 0.3125q1.09375 0 1.640625 -0.4375q0.546875 -0.4375 0.546875 -1.015625q0 -0.4375 -0.328125 -0.8125q-0.328125 -0.390625 -1.640625 -0.953125q-1.3125 -0.5625 -1.671875 -0.78125q-0.609375 -0.375 -0.921875 -0.875q-0.3125 -0.515625 -0.3125 -1.171875q0 -1.140625 0.90625 -1.953125q0.921875 -0.828125 2.5625 -0.828125q1.828125 0 2.765625 0.84375q0.953125 0.84375 1.0 2.21875l-1.609375 0.109375q-0.046875 -0.875 -0.625 -1.390625q-0.578125 -0.515625 -1.65625 -0.515625q-0.84375 0 -1.328125 0.40625q-0.46875 0.390625 -0.46875 0.84375q0 0.453125 0.40625 0.796875q0.28125 0.234375 1.421875 0.734375q1.890625 0.8125 2.375 1.28125q0.78125 0.765625 0.78125 1.84375q0 0.71875 -0.4375 1.421875q-0.4375 0.6875 -1.34375 1.109375q-0.90625 0.40625 -2.140625 0.40625q-1.671875 0 -2.84375 -0.828125q-1.1875 -0.828125 -1.109375 -2.703125z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m198.14961 164.00919l109.44881 0l0 53.70079l-109.44881 0z" fill-rule="evenodd"/><path fill="#000000" d="m211.6696 187.61668l1.640625 -0.09375q0 0.703125 0.21875 1.21875q0.21875 0.5 0.796875 0.8125q0.59375 0.3125 1.375 0.3125q1.09375 0 1.640625 -0.4375q0.546875 -0.4375 0.546875 -1.015625q0 -0.4375 -0.328125 -0.8125q-0.328125 -0.390625 -1.640625 -0.953125q-1.3125 -0.5625 -1.671875 -0.78125q-0.609375 -0.375 -0.921875 -0.875q-0.3125 -0.515625 -0.3125 -1.171875q0 -1.140625 0.90625 -1.953125q0.921875 -0.828125 2.5625 -0.828125q1.828125 0 2.765625 0.84375q0.953125 0.84375 1.0 2.21875l-1.609375 0.109375q-0.046875 -0.875 -0.625 -1.390625q-0.578125 -0.515625 -1.65625 -0.515625q-0.84375 0 -1.328125 0.40625q-0.46875 0.390625 -0.46875 0.84375q0 0.453125 0.40625 0.796875q0.28125 0.234375 1.421875 0.734375q1.890625 0.8125 2.375 1.28125q0.78125 0.765625 0.78125 1.84375q0 0.71875 -0.4375 1.421875q-0.4375 0.6875 -1.34375 1.109375q-0.90625 0.40625 -2.140625 0.40625q-1.671875 0 -2.84375 -0.828125q-1.1875 -0.828125 -1.109375 -2.703125zm15.84375 -0.21875l1.65625 0.171875q-0.625 1.8125 -1.765625 2.703125q-1.140625 0.875 -2.609375 0.875q-1.578125 0 -2.5625 -1.015625q-0.96875 -1.03125 -0.96875 -2.859375q0 -1.578125 0.625 -3.109375q0.640625 -1.53125 1.796875 -2.328125q1.171875 -0.796875 2.6875 -0.796875q1.546875 0 2.453125 0.875q0.921875 0.875 0.921875 2.328125l-1.625 0.109375q-0.015625 -0.921875 -0.546875 -1.4375q-0.515625 -0.515625 -1.359375 -0.515625q-1.0 0 -1.734375 0.625q-0.71875 0.625 -1.140625 1.90625q-0.40625 1.28125 -0.40625 2.46875q0 1.234375 0.546875 1.859375q0.546875 0.609375 1.34375 0.609375q0.796875 0 1.53125 -0.609375q0.734375 -0.609375 1.15625 -1.859375zm9.171875 2.328125q-0.859375 0.734375 -1.65625 1.078125q-0.78125 0.34375 -1.6875 0.34375q-1.34375 0 -2.171875 -0.78125q-0.8125 -0.796875 -0.8125 -2.03125q0 -0.796875 0.375 -1.421875q0.375 -0.625 0.984375 -1.0q0.609375 -0.390625 1.484375 -0.546875q0.5625 -0.109375 2.109375 -0.171875q1.5625 -0.0625 2.234375 -0.328125q0.1875 -0.671875 0.1875 -1.125q0 -0.578125 -0.421875 -0.90625q-0.5625 -0.453125 -1.671875 -0.453125q-1.03125 0 -1.703125 0.46875q-0.65625 0.453125 -0.953125 1.296875l-1.671875 -0.140625q0.515625 -1.4375 1.609375 -2.203125q1.109375 -0.765625 2.796875 -0.765625q1.796875 0 2.84375 0.859375q0.796875 0.625 0.796875 1.65625q0 0.765625 -0.21875 1.796875l-0.53125 2.40625q-0.265625 1.140625 -0.265625 1.859375q0 0.453125 0.203125 1.3125l-1.671875 0q-0.125 -0.46875 -0.1875 -1.203125zm0.609375 -3.703125q-0.34375 0.140625 -0.75 0.21875q-0.390625 0.0625 -1.3125 0.15625q-1.4375 0.125 -2.03125 0.328125q-0.59375 0.1875 -0.90625 0.625q-0.296875 0.421875 -0.296875 0.9375q0 0.6875 0.484375 1.140625q0.484375 0.4375 1.359375 0.4375q0.828125 0 1.578125 -0.421875q0.75 -0.4375 1.1875 -1.203125q0.4375 -0.78125 0.6875 -2.21875zm7.094467 3.5625l-0.265625 1.359375q-0.59375 0.140625 -1.15625 0.140625q-0.984375 0 -1.5625 -0.46875q-0.4375 -0.375 -0.4375 -1.0q0 -0.3125 0.234375 -1.46875l1.171875 -5.625l-1.296875 0l0.265625 -1.265625l1.296875 0l0.5 -2.375l1.890625 -1.140625l-0.734375 3.515625l1.625 0l-0.28125 1.265625l-1.609375 0l-1.125 5.359375q-0.203125 1.015625 -0.203125 1.21875q0 0.28125 0.15625 0.4375q0.171875 0.15625 0.5625 0.15625q0.546875 0 0.96875 -0.109375zm5.183304 0l-0.265625 1.359375q-0.59375 0.140625 -1.15625 0.140625q-0.984375 0 -1.5625 -0.46875q-0.4375 -0.375 -0.4375 -1.0q0 -0.3125 0.234375 -1.46875l1.171875 -5.625l-1.296875 0l0.265625 -1.265625l1.296875 0l0.5 -2.375l1.890625 -1.140625l-0.734375 3.515625l1.625 0l-0.28125 1.265625l-1.609375 0l-1.125 5.359375q-0.203125 1.015625 -0.203125 1.21875q0 0.28125 0.15625 0.4375q0.171875 0.15625 0.5625 0.15625q0.546875 0 0.96875 -0.109375zm8.433304 -1.9375l1.609375 0.15625q-0.34375 1.1875 -1.59375 2.265625q-1.234375 1.078125 -2.96875 1.078125q-1.0625 0 -1.96875 -0.5q-0.890625 -0.5 -1.359375 -1.4375q-0.46875 -0.953125 -0.46875 -2.15625q0 -1.59375 0.734375 -3.078125q0.734375 -1.484375 1.890625 -2.203125q1.171875 -0.734375 2.53125 -0.734375q1.734375 0 2.765625 1.078125q1.03125 1.0625 1.03125 2.921875q0 0.71875 -0.125 1.46875l-7.125 0q-0.046875 0.28125 -0.046875 0.5q0 1.359375 0.625 2.078125q0.625 0.71875 1.53125 0.71875q0.84375 0 1.65625 -0.546875q0.828125 -0.5625 1.28125 -1.609375zm-4.78125 -2.40625l5.421875 0q0.015625 -0.25 0.015625 -0.359375q0 -1.234375 -0.625 -1.890625q-0.625 -0.671875 -1.59375 -0.671875q-1.0625 0 -1.9375 0.734375q-0.859375 0.71875 -1.28125 2.1875zm8.063202 5.6875l2.015625 -9.671875l1.453125 0l-0.40625 1.96875q0.75 -1.109375 1.453125 -1.640625q0.71875 -0.546875 1.46875 -0.546875q0.5 0 1.21875 0.359375l-0.671875 1.53125q-0.4375 -0.3125 -0.9375 -0.3125q-0.875 0 -1.78125 0.96875q-0.90625 0.953125 -1.4375 3.46875l-0.8125 3.875l-1.5625 0zm11.255371 0l2.796875 -13.359375l1.640625 0l-2.78125 13.359375l-1.65625 0zm6.613556 -11.484375l0.40625 -1.875l1.625 0l-0.390625 1.875l-1.640625 0zm-2.390625 11.484375l2.015625 -9.671875l1.65625 0l-2.03125 9.671875l-1.640625 0zm4.3635864 -3.3125l1.640625 -0.09375q0 0.703125 0.21875 1.21875q0.21875 0.5 0.796875 0.8125q0.59375 0.3125 1.375 0.3125q1.09375 0 1.640625 -0.4375q0.546875 -0.4375 0.546875 -1.015625q0 -0.4375 -0.328125 -0.8125q-0.328125 -0.390625 -1.640625 -0.953125q-1.3125 -0.5625 -1.671875 -0.78125q-0.609375 -0.375 -0.921875 -0.875q-0.3125 -0.515625 -0.3125 -1.171875q0 -1.140625 0.90625 -1.953125q0.921875 -0.828125 2.5625 -0.828125q1.828125 0 2.765625 0.84375q0.953125 0.84375 1.0 2.21875l-1.609375 0.109375q-0.046875 -0.875 -0.625 -1.390625q-0.578125 -0.515625 -1.65625 -0.515625q-0.84375 0 -1.328125 0.40625q-0.46875 0.390625 -0.46875 0.84375q0 0.453125 0.40625 0.796875q0.28125 0.234375 1.421875 0.734375q1.890625 0.8125 2.375 1.28125q0.78125 0.765625 0.78125 1.84375q0 0.71875 -0.4375 1.421875q-0.4375 0.6875 -1.34375 1.109375q-0.90625 0.40625 -2.140625 0.40625q-1.671875 0 -2.84375 -0.828125q-1.1875 -0.828125 -1.109375 -2.703125zm13.015625 1.96875l-0.265625 1.359375q-0.59375 0.140625 -1.15625 0.140625q-0.984375 0 -1.5625 -0.46875q-0.4375 -0.375 -0.4375 -1.0q0 -0.3125 0.234375 -1.46875l1.171875 -5.625l-1.296875 0l0.265625 -1.265625l1.296875 0l0.5 -2.375l1.890625 -1.140625l-0.734375 3.515625l1.625 0l-0.28125 1.265625l-1.609375 0l-1.125 5.359375q-0.203125 1.015625 -0.203125 1.21875q0 0.28125 0.15625 0.4375q0.171875 0.15625 0.5625 0.15625q0.546875 0 0.96875 -0.109375z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m198.14961 280.1392l109.44881 0l0 53.700806l-109.44881 0z" fill-rule="evenodd"/><path fill="#000000" d="m223.58026 303.7467l1.640625 -0.09375q0 0.703125 0.21875 1.21875q0.21875 0.5 0.796875 0.8125q0.59375 0.3125 1.375 0.3125q1.09375 0 1.640625 -0.4375q0.546875 -0.4375 0.546875 -1.015625q0 -0.4375 -0.328125 -0.8125q-0.328125 -0.390625 -1.640625 -0.953125q-1.3125 -0.5625 -1.671875 -0.78125q-0.609375 -0.375 -0.921875 -0.875q-0.3125 -0.515625 -0.3125 -1.171875q0 -1.140625 0.90625 -1.953125q0.921875 -0.828125 2.5625 -0.828125q1.828125 0 2.765625 0.84375q0.953125 0.84375 1.0 2.21875l-1.609375 0.109375q-0.046875 -0.875 -0.625 -1.390625q-0.578125 -0.515625 -1.65625 -0.515625q-0.84375 0 -1.328125 0.40625q-0.46875 0.390625 -0.46875 0.84375q0 0.453125 0.40625 0.796875q0.28125 0.234375 1.421875 0.734375q1.890625 0.8125 2.375 1.28125q0.78125 0.765625 0.78125 1.84375q0 0.71875 -0.4375 1.421875q-0.4375 0.6875 -1.34375 1.109375q-0.90625 0.40625 -2.140625 0.40625q-1.671875 0 -2.84375 -0.828125q-1.1875 -0.828125 -1.109375 -2.703125zm9.1875 3.3125l2.796875 -13.359375l1.640625 0l-1.734375 8.28125l4.8125 -4.59375l2.171875 0l-4.125 3.609375l2.5 6.0625l-1.8125 0l-1.921875 -4.96875l-2.015625 1.734375l-0.671875 3.234375l-1.640625 0zm7.5 3.703125l0 -1.1875l10.875 0l0 1.1875l-10.875 0zm12.188217 -3.703125l2.78125 -13.359375l1.6562653 0l-1.0000153 4.78125q0.78126526 -0.71875 1.4218903 -1.015625q0.640625 -0.296875 1.328125 -0.296875q1.359375 0 2.265625 1.015625q0.90625 1.0 0.90625 2.9375q0 1.28125 -0.375 2.359375q-0.359375 1.0625 -0.890625 1.78125q-0.53125 0.71875 -1.109375 1.15625q-0.578125 0.4375 -1.1875 0.640625q-0.59375 0.21875 -1.140625 0.21875q-0.96875 0 -1.7031403 -0.5q-0.71875 -0.515625 -1.125 -1.546875l-0.390625 1.828125l-1.4375 0zm2.4375 -3.96875l-0.015625 0.3125q0 1.234375 0.59375 1.890625q0.59376526 0.640625 1.4843903 0.640625q0.859375 0 1.578125 -0.609375q0.734375 -0.609375 1.1875 -1.890625q0.46875 -1.28125 0.46875 -2.375q0 -1.21875 -0.59375 -1.890625q-0.578125 -0.671875 -1.4375 -0.671875q-0.90625 0 -1.65625 0.6875q-0.73439026 0.6875 -1.2343903 2.125q-0.375 1.0625 -0.375 1.78125zm14.531967 2.21875q-1.734375 1.96875 -3.5625 1.96875q-1.109375 0 -1.796875 -0.640625q-0.6875 -0.640625 -0.6875 -1.578125q0 -0.609375 0.296875 -2.09375l1.171875 -5.578125l1.65625 0l-1.296875 6.1875q-0.171875 0.765625 -0.171875 1.203125q0 0.546875 0.328125 0.859375q0.34375 0.296875 0.984375 0.296875q0.703125 0 1.359375 -0.328125q0.65625 -0.34375 1.125 -0.921875q0.484375 -0.578125 0.796875 -1.359375q0.1875 -0.5 0.453125 -1.765625l0.875 -4.171875l1.65625 0l-2.03125 9.671875l-1.515625 0l0.359375 -1.75zm4.0007324 1.75l1.765625 -8.40625l-1.484375 0l0.265625 -1.265625l1.484375 0l0.28125 -1.375q0.21875 -1.03125 0.4375 -1.484375q0.234375 -0.453125 0.75 -0.75q0.53125 -0.296875 1.4375 -0.296875q0.625 0 1.828125 0.265625l-0.296875 1.4375q-0.84375 -0.21875 -1.40625 -0.21875q-0.484375 0 -0.734375 0.25q-0.25 0.234375 -0.4375 1.125l-0.21875 1.046875l1.84375 0l-0.265625 1.265625l-1.84375 0l-1.75 8.40625l-1.65625 0zm5.1832886 0l1.765625 -8.40625l-1.484375 0l0.265625 -1.265625l1.484375 0l0.28125 -1.375q0.21875 -1.03125 0.4375 -1.484375q0.234375 -0.453125 0.75 -0.75q0.53125 -0.296875 1.4375 -0.296875q0.625 0 1.828125 0.265625l-0.296875 1.4375q-0.84375 -0.21875 -1.40625 -0.21875q-0.484375 0 -0.734375 0.25q-0.25 0.234375 -0.4375 1.125l-0.21875 1.046875l1.84375 0l-0.265625 1.265625l-1.84375 0l-1.75 8.40625l-1.65625 0z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m163.81627 395.2362l178.11024 0l0 53.700806l-178.11024 0z" fill-rule="evenodd"/><path fill="#000000" d="m195.60925 418.62497l1.65625 0.171875q-0.625 1.8125 -1.765625 2.703125q-1.140625 0.875 -2.609375 0.875q-1.578125 0 -2.5625 -1.015625q-0.96875 -1.03125 -0.96875 -2.859375q0 -1.578125 0.625 -3.109375q0.640625 -1.53125 1.796875 -2.328125q1.171875 -0.796875 2.6875 -0.796875q1.546875 0 2.453125 0.875q0.921875 0.875 0.921875 2.328125l-1.625 0.109375q-0.015625 -0.921875 -0.546875 -1.4375q-0.515625 -0.515625 -1.359375 -0.515625q-1.0 0 -1.734375 0.625q-0.71875 0.625 -1.140625 1.90625q-0.40625 1.28125 -0.40625 2.46875q0 1.234375 0.546875 1.859375q0.546875 0.609375 1.34375 0.609375q0.796875 0 1.53125 -0.609375q0.734375 -0.609375 1.15625 -1.859375zm2.9375 -0.140625q0 -2.828125 1.671875 -4.6875q1.375 -1.53125 3.609375 -1.53125q1.75 0 2.8125 1.09375q1.078125 1.09375 1.078125 2.953125q0 1.65625 -0.671875 3.09375q-0.671875 1.4375 -1.921875 2.203125q-1.25 0.765625 -2.625 0.765625q-1.125 0 -2.046875 -0.484375q-0.921875 -0.484375 -1.421875 -1.359375q-0.484375 -0.890625 -0.484375 -2.046875zm1.65625 -0.15625q0 1.359375 0.65625 2.0625q0.65625 0.703125 1.65625 0.703125q0.53125 0 1.046875 -0.203125q0.53125 -0.21875 0.96875 -0.65625q0.453125 -0.4375 0.765625 -1.0q0.3125 -0.5625 0.5 -1.203125q0.28125 -0.90625 0.28125 -1.734375q0 -1.3125 -0.65625 -2.03125q-0.65625 -0.734375 -1.65625 -0.734375q-0.78125 0 -1.421875 0.375q-0.625 0.375 -1.140625 1.09375q-0.515625 0.703125 -0.765625 1.640625q-0.234375 0.9375 -0.234375 1.6875zm8.438217 3.828125l2.015625 -9.671875l1.5 0l-0.359375 1.6875q0.96875 -1.0 1.8125 -1.453125q0.859375 -0.453125 1.734375 -0.453125q1.1875 0 1.84375 0.640625q0.671875 0.625 0.671875 1.703125q0 0.53125 -0.234375 1.6875l-1.234375 5.859375l-1.640625 0l1.28125 -6.125q0.1875 -0.890625 0.1875 -1.328125q0 -0.484375 -0.328125 -0.78125q-0.328125 -0.296875 -0.953125 -0.296875q-1.28125 0 -2.265625 0.90625q-0.984375 0.90625 -1.453125 3.125l-0.9375 4.5l-1.640625 0zm14.219467 -1.34375l-0.265625 1.359375q-0.59375 0.140625 -1.15625 0.140625q-0.984375 0 -1.5625 -0.46875q-0.4375 -0.375 -0.4375 -1.0q0 -0.3125 0.234375 -1.46875l1.171875 -5.625l-1.296875 0l0.265625 -1.265625l1.296875 0l0.5 -2.375l1.890625 -1.140625l-0.734375 3.515625l1.625 0l-0.28125 1.265625l-1.609375 0l-1.125 5.359375q-0.203125 1.015625 -0.203125 1.21875q0 0.28125 0.15625 0.4375q0.171875 0.15625 0.5625 0.15625q0.546875 0 0.96875 -0.109375zm8.433304 -1.9375l1.609375 0.15625q-0.34375 1.1875 -1.59375 2.265625q-1.234375 1.078125 -2.96875 1.078125q-1.0625 0 -1.96875 -0.5q-0.890625 -0.5 -1.359375 -1.4375q-0.46875 -0.953125 -0.46875 -2.15625q0 -1.59375 0.734375 -3.078125q0.734375 -1.484375 1.890625 -2.203125q1.171875 -0.734375 2.53125 -0.734375q1.734375 0 2.765625 1.078125q1.03125 1.0625 1.03125 2.921875q0 0.71875 -0.125 1.46875l-7.125 0q-0.046875 0.28125 -0.046875 0.5q0 1.359375 0.625 2.078125q0.625 0.71875 1.53125 0.71875q0.84375 0 1.65625 -0.546875q0.828125 -0.5625 1.28125 -1.609375zm-4.78125 -2.40625l5.421875 0q0.015625 -0.25 0.015625 -0.359375q0 -1.234375 -0.625 -1.890625q-0.625 -0.671875 -1.59375 -0.671875q-1.0625 0 -1.9375 0.734375q-0.859375 0.71875 -1.28125 2.1875zm7.406967 5.6875l4.21875 -4.90625l-2.421875 -4.765625l1.828125 0l0.8125 1.71875q0.453125 0.96875 0.828125 1.84375l2.78125 -3.5625l2.015625 0l-4.0625 4.890625l2.4375 4.78125l-1.8125 0l-0.96875 -1.96875q-0.3125 -0.625 -0.703125 -1.5625l-2.875 3.53125l-2.078125 0zm13.828125 -1.34375l-0.265625 1.359375q-0.59375 0.140625 -1.15625 0.140625q-0.984375 0 -1.5625 -0.46875q-0.4375 -0.375 -0.4375 -1.0q0 -0.3125 0.234375 -1.46875l1.171875 -5.625l-1.296875 0l0.265625 -1.265625l1.296875 0l0.5 -2.375l1.890625 -1.140625l-0.734375 3.515625l1.625 0l-0.28125 1.265625l-1.609375 0l-1.125 5.359375q-0.203125 1.015625 -0.203125 1.21875q0 0.28125 0.15625 0.4375q0.171875 0.15625 0.5625 0.15625q0.546875 0 0.96875 -0.109375zm11.210358 -0.8125l0 -3.671875l-3.640625 0l0 -1.515625l3.640625 0l0 -3.640625l1.546875 0l0 3.640625l3.640625 0l0 1.515625l-3.640625 0l0 3.671875l-1.546875 0zm11.390778 2.15625l2.78125 -13.359375l1.65625 0l-1.0 4.78125q0.78125 -0.71875 1.421875 -1.015625q0.640625 -0.296875 1.328125 -0.296875q1.359375 0 2.265625 1.015625q0.90625 1.0 0.90625 2.9375q0 1.28125 -0.375 2.359375q-0.359375 1.0625 -0.890625 1.78125q-0.53125 0.71875 -1.109375 1.15625q-0.578125 0.4375 -1.1875 0.640625q-0.59375 0.21875 -1.140625 0.21875q-0.96875 0 -1.703125 -0.5q-0.71875 -0.515625 -1.125 -1.546875l-0.390625 1.828125l-1.4375 0zm2.4375 -3.96875l-0.015625 0.3125q0 1.234375 0.59375 1.890625q0.59375 0.640625 1.484375 0.640625q0.859375 0 1.578125 -0.609375q0.734375 -0.609375 1.1875 -1.890625q0.46875 -1.28125 0.46875 -2.375q0 -1.21875 -0.59375 -1.890625q-0.578125 -0.671875 -1.4375 -0.671875q-0.90625 0 -1.65625 0.6875q-0.734375 0.6875 -1.234375 2.125q-0.375 1.0625 -0.375 1.78125zm14.531952 2.21875q-1.734375 1.96875 -3.5625 1.96875q-1.109375 0 -1.796875 -0.640625q-0.6875 -0.640625 -0.6875 -1.578125q0 -0.609375 0.296875 -2.09375l1.171875 -5.578125l1.65625 0l-1.296875 6.1875q-0.171875 0.765625 -0.171875 1.203125q0 0.546875 0.328125 0.859375q0.34375 0.296875 0.984375 0.296875q0.703125 0 1.359375 -0.328125q0.65625 -0.34375 1.125 -0.921875q0.484375 -0.578125 0.796875 -1.359375q0.1875 -0.5 0.453125 -1.765625l0.875 -4.171875l1.65625 0l-2.03125 9.671875l-1.515625 0l0.359375 -1.75zm4.0007324 1.75l1.765625 -8.40625l-1.484375 0l0.265625 -1.265625l1.484375 0l0.28125 -1.375q0.21875 -1.03125 0.4375 -1.484375q0.234375 -0.453125 0.75 -0.75q0.53125 -0.296875 1.4375 -0.296875q0.625 0 1.828125 0.265625l-0.296875 1.4375q-0.84375 -0.21875 -1.40625 -0.21875q-0.484375 0 -0.734375 0.25q-0.25 0.234375 -0.4375 1.125l-0.21875 1.046875l1.84375 0l-0.265625 1.265625l-1.84375 0l-1.75 8.40625l-1.65625 0zm5.1832886 0l1.765625 -8.40625l-1.484375 0l0.265625 -1.265625l1.484375 0l0.28125 -1.375q0.21875 -1.03125 0.4375 -1.484375q0.234375 -0.453125 0.75 -0.75q0.53125 -0.296875 1.4375 -0.296875q0.625 0 1.828125 0.265625l-0.296875 1.4375q-0.84375 -0.21875 -1.40625 -0.21875q-0.484375 0 -0.734375 0.25q-0.25 0.234375 -0.4375 1.125l-0.21875 1.046875l1.84375 0l-0.265625 1.265625l-1.84375 0l-1.75 8.40625l-1.65625 0zm12.058319 -3.28125l1.609375 0.15625q-0.34375 1.1875 -1.59375 2.265625q-1.234375 1.078125 -2.96875 1.078125q-1.0625 0 -1.96875 -0.5q-0.890625 -0.5 -1.359375 -1.4375q-0.46875 -0.953125 -0.46875 -2.15625q0 -1.59375 0.734375 -3.078125q0.734375 -1.484375 1.890625 -2.203125q1.171875 -0.734375 2.53125 -0.734375q1.734375 0 2.765625 1.078125q1.03125 1.0625 1.03125 2.921875q0 0.71875 -0.125 1.46875l-7.125 0q-0.046875 0.28125 -0.046875 0.5q0 1.359375 0.625 2.078125q0.625 0.71875 1.53125 0.71875q0.84375 0 1.65625 -0.546875q0.828125 -0.5625 1.28125 -1.609375zm-4.78125 -2.40625l5.421875 0q0.015625 -0.25 0.015625 -0.359375q0 -1.234375 -0.625 -1.890625q-0.625 -0.671875 -1.59375 -0.671875q-1.0625 0 -1.9375 0.734375q-0.859375 0.71875 -1.28125 2.1875zm8.063202 5.6875l2.015625 -9.671875l1.453125 0l-0.40625 1.96875q0.75 -1.109375 1.453125 -1.640625q0.71875 -0.546875 1.46875 -0.546875q0.5 0 1.21875 0.359375l-0.671875 1.53125q-0.4375 -0.3125 -0.9375 -0.3125q-0.875 0 -1.78125 0.96875q-0.90625 0.953125 -1.4375 3.46875l-0.8125 3.875l-1.5625 0z" fill-rule="nonzero"/><path fill="#cfe2f3" d="m0 165.96588l118.74016 0l0 40.25197l-118.74016 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m0 165.96588l118.74016 0l0 40.25197l-118.74016 0z" fill-rule="evenodd"/><path fill="#000000" d="m23.145836 190.12123l1.625 -0.25q0.125 0.96875 0.75 1.5q0.625 0.515625 1.75 0.515625q1.125 0 1.671875 -0.453125q0.546875 -0.46875 0.546875 -1.09375q0 -0.546875 -0.484375 -0.875q-0.328125 -0.21875 -1.671875 -0.546875q-1.8125 -0.46875 -2.515625 -0.796875q-0.6875 -0.328125 -1.046875 -0.90625q-0.359375 -0.59375 -0.359375 -1.3125q0 -0.640625 0.296875 -1.1875q0.296875 -0.5625 0.8125 -0.921875q0.375 -0.28125 1.03125 -0.46875q0.671875 -0.203125 1.421875 -0.203125q1.140625 0 2.0 0.328125q0.859375 0.328125 1.265625 0.890625q0.421875 0.5625 0.578125 1.5l-1.609375 0.21875q-0.109375 -0.75 -0.640625 -1.171875q-0.515625 -0.421875 -1.46875 -0.421875q-1.140625 0 -1.625 0.375q-0.46875 0.375 -0.46875 0.875q0 0.3125 0.1875 0.578125q0.203125 0.265625 0.640625 0.4375q0.234375 0.09375 1.4375 0.421875q1.75 0.453125 2.4375 0.75q0.6875 0.296875 1.078125 0.859375q0.390625 0.5625 0.390625 1.40625q0 0.828125 -0.484375 1.546875q-0.46875 0.71875 -1.375 1.125q-0.90625 0.390625 -2.046875 0.390625q-1.875 0 -2.875 -0.78125q-0.984375 -0.78125 -1.25 -2.328125zm13.5625 1.421875l0.234375 1.453125q-0.6875 0.140625 -1.234375 0.140625q-0.890625 0 -1.390625 -0.28125q-0.484375 -0.28125 -0.6875 -0.734375q-0.203125 -0.46875 -0.203125 -1.9375l0 -5.578125l-1.203125 0l0 -1.265625l1.203125 0l0 -2.390625l1.625 -0.984375l0 3.375l1.65625 0l0 1.265625l-1.65625 0l0 5.671875q0 0.6875 0.078125 0.890625q0.09375 0.203125 0.28125 0.328125q0.203125 0.109375 0.578125 0.109375q0.265625 0 0.71875 -0.0625zm1.5895538 1.46875l0 -9.671875l1.46875 0l0 1.46875q0.5625 -1.03125 1.03125 -1.359375q0.484375 -0.328125 1.0625 -0.328125q0.828125 0 1.6875 0.53125l-0.5625 1.515625q-0.609375 -0.359375 -1.203125 -0.359375q-0.546875 0 -0.96875 0.328125q-0.421875 0.328125 -0.609375 0.890625q-0.28125 0.875 -0.28125 1.921875l0 5.0625l-1.625 0zm6.228302 3.703125l0 -13.375l1.484375 0l0 1.25q0.53125 -0.734375 1.1875 -1.09375q0.671875 -0.375 1.625 -0.375q1.234375 0 2.171875 0.640625q0.953125 0.625 1.4375 1.796875q0.484375 1.15625 0.484375 2.546875q0 1.484375 -0.53125 2.671875q-0.53125 1.1875 -1.546875 1.828125q-1.015625 0.625 -2.140625 0.625q-0.8125 0 -1.46875 -0.34375q-0.65625 -0.34375 -1.0625 -0.875l0 4.703125l-1.640625 0zm1.484375 -8.484375q0 1.859375 0.75 2.765625q0.765625 0.890625 1.828125 0.890625q1.09375 0 1.875 -0.921875q0.78125 -0.9375 0.78125 -2.875q0 -1.84375 -0.765625 -2.765625q-0.75 -0.921875 -1.8125 -0.921875q-1.046875 0 -1.859375 0.984375q-0.796875 0.96875 -0.796875 2.84375zm15.203842 3.59375q-0.921875 0.765625 -1.765625 1.09375q-0.828125 0.3125 -1.796875 0.3125q-1.59375 0 -2.453125 -0.78125q-0.859375 -0.78125 -0.859375 -1.984375q0 -0.71875 0.328125 -1.296875q0.328125 -0.59375 0.84375 -0.9375q0.53125 -0.359375 1.1875 -0.546875q0.46875 -0.125 1.453125 -0.25q1.984375 -0.234375 2.921875 -0.5625q0.015625 -0.34375 0.015625 -0.421875q0 -1.0 -0.46875 -1.421875q-0.625 -0.546875 -1.875 -0.546875q-1.15625 0 -1.703125 0.40625q-0.546875 0.40625 -0.8125 1.421875l-1.609375 -0.21875q0.21875 -1.015625 0.71875 -1.640625q0.5 -0.640625 1.453125 -0.984375q0.953125 -0.34375 2.1875 -0.34375q1.25 0 2.015625 0.296875q0.78125 0.28125 1.140625 0.734375q0.375 0.4375 0.515625 1.109375q0.078125 0.421875 0.078125 1.515625l0 2.1875q0 2.28125 0.109375 2.890625q0.109375 0.59375 0.40625 1.15625l-1.703125 0q-0.265625 -0.515625 -0.328125 -1.1875zm-0.140625 -3.671875q-0.890625 0.375 -2.671875 0.625q-1.015625 0.140625 -1.4375 0.328125q-0.421875 0.1875 -0.65625 0.53125q-0.21875 0.34375 -0.21875 0.78125q0 0.65625 0.5 1.09375q0.5 0.4375 1.453125 0.4375q0.9375 0 1.671875 -0.40625q0.75 -0.421875 1.09375 -1.140625q0.265625 -0.5625 0.265625 -1.640625l0 -0.609375zm4.188217 4.859375l0 -9.671875l1.46875 0l0 1.46875q0.5625 -1.03125 1.03125 -1.359375q0.484375 -0.328125 1.0625 -0.328125q0.828125 0 1.6875 0.53125l-0.5625 1.515625q-0.609375 -0.359375 -1.203125 -0.359375q-0.546875 0 -0.96875 0.328125q-0.421875 0.328125 -0.609375 0.890625q-0.28125 0.875 -0.28125 1.921875l0 5.0625l-1.625 0zm5.572052 -2.890625l1.625 -0.25q0.125 0.96875 0.75 1.5q0.625 0.515625 1.75 0.515625q1.125 0 1.671875 -0.453125q0.546875 -0.46875 0.546875 -1.09375q0 -0.546875 -0.484375 -0.875q-0.328125 -0.21875 -1.671875 -0.546875q-1.8125 -0.46875 -2.515625 -0.796875q-0.6875 -0.328125 -1.046875 -0.90625q-0.359375 -0.59375 -0.359375 -1.3125q0 -0.640625 0.296875 -1.1875q0.296875 -0.5625 0.8125 -0.921875q0.375 -0.28125 1.03125 -0.46875q0.671875 -0.203125 1.421875 -0.203125q1.140625 0 2.0 0.328125q0.859375 0.328125 1.265625 0.890625q0.421875 0.5625 0.578125 1.5l-1.609375 0.21875q-0.109375 -0.75 -0.640625 -1.171875q-0.515625 -0.421875 -1.46875 -0.421875q-1.140625 0 -1.625 0.375q-0.46875 0.375 -0.46875 0.875q0 0.3125 0.1875 0.578125q0.203125 0.265625 0.640625 0.4375q0.234375 0.09375 1.4375 0.421875q1.75 0.453125 2.4375 0.75q0.6875 0.296875 1.078125 0.859375q0.390625 0.5625 0.390625 1.40625q0 0.828125 -0.484375 1.546875q-0.46875 0.71875 -1.375 1.125q-0.90625 0.390625 -2.046875 0.390625q-1.875 0 -2.875 -0.78125q-0.984375 -0.78125 -1.25 -2.328125zm16.609375 -0.21875l1.6875 0.203125q-0.40625 1.484375 -1.484375 2.3125q-1.078125 0.8125 -2.765625 0.8125q-2.125 0 -3.375 -1.296875q-1.234375 -1.3125 -1.234375 -3.671875q0 -2.453125 1.25 -3.796875q1.265625 -1.34375 3.265625 -1.34375q1.9375 0 3.15625 1.328125q1.234375 1.3125 1.234375 3.703125q0 0.15625 0 0.4375l-7.21875 0q0.09375 1.59375 0.90625 2.453125q0.8125 0.84375 2.015625 0.84375q0.90625 0 1.546875 -0.46875q0.640625 -0.484375 1.015625 -1.515625zm-5.390625 -2.65625l5.40625 0q-0.109375 -1.21875 -0.625 -1.828125q-0.78125 -0.953125 -2.03125 -0.953125q-1.125 0 -1.90625 0.765625q-0.765625 0.75 -0.84375 2.015625zm9.125717 5.765625l0 -9.671875l1.46875 0l0 1.46875q0.5625 -1.03125 1.03125 -1.359375q0.484375 -0.328125 1.0625 -0.328125q0.828125 0 1.6875 0.53125l-0.5625 1.515625q-0.609375 -0.359375 -1.203125 -0.359375q-0.546875 0 -0.96875 0.328125q-0.421875 0.328125 -0.609375 0.890625q-0.28125 0.875 -0.28125 1.921875l0 5.0625l-1.625 0z" fill-rule="nonzero"/></g></svg>
diff --git a/Documentation/networking/tls-offload-reorder-bad.svg b/Documentation/networking/tls-offload-reorder-bad.svg
new file mode 100644
index 000000000000..d107aaf0f71e
--- /dev/null
+++ b/Documentation/networking/tls-offload-reorder-bad.svg
@@ -0,0 +1 @@
+<svg version="1.1" viewBox="0.0 0.0 672.0 68.0" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><clipPath id="p.0"><path d="m0 0l960.0 0l0 720.0l-960.0 0l0 -720.0z" clip-rule="nonzero"/></clipPath><g clip-path="url(#p.0)"><path fill="#000000" fill-opacity="0.0" d="m0 0l960.0 0l0 720.0l-960.0 0z" fill-rule="evenodd"/><path fill="#b6d7a8" d="m0 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m0 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path fill="#000000" d="m15.953125 52.942722l-1.640625 0l0 -10.453125q-0.59375 0.5625 -1.5625 1.140625q-0.953125 0.5625 -1.71875 0.84375l0 -1.59375q1.375 -0.640625 2.40625 -1.5625q1.03125 -0.921875 1.453125 -1.78125l1.0625 0l0 13.40625z" fill-rule="nonzero"/><path fill="#c9daf8" d="m340.69897 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m340.69897 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path fill="#000000" d="m355.73022 52.942722l0 -3.203125l-5.796875 0l0 -1.5l6.09375 -8.65625l1.34375 0l0 8.65625l1.796875 0l0 1.5l-1.796875 0l0 3.203125l-1.640625 0zm0 -4.703125l0 -6.015625l-4.1875 6.015625l4.1875 0z" fill-rule="nonzero"/><path fill="#cfe2f3" d="m225.37527 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m225.37527 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path fill="#000000" d="m235.15652 49.411472l1.640625 -0.21875q0.28125 1.40625 0.953125 2.015625q0.6875 0.609375 1.65625 0.609375q1.15625 0 1.953125 -0.796875q0.796875 -0.796875 0.796875 -1.984375q0 -1.125 -0.734375 -1.859375q-0.734375 -0.734375 -1.875 -0.734375q-0.46875 0 -1.15625 0.171875l0.1875 -1.4375q0.15625 0.015625 0.265625 0.015625q1.046875 0 1.875 -0.546875q0.84375 -0.546875 0.84375 -1.671875q0 -0.90625 -0.609375 -1.5q-0.609375 -0.59375 -1.578125 -0.59375q-0.953125 0 -1.59375 0.609375q-0.640625 0.59375 -0.8125 1.796875l-1.640625 -0.296875q0.296875 -1.640625 1.359375 -2.546875q1.0625 -0.90625 2.65625 -0.90625q1.09375 0 2.0 0.46875q0.921875 0.46875 1.40625 1.28125q0.5 0.8125 0.5 1.71875q0 0.859375 -0.46875 1.578125q-0.46875 0.703125 -1.375 1.125q1.1875 0.28125 1.84375 1.140625q0.65625 0.859375 0.65625 2.15625q0 1.734375 -1.28125 2.953125q-1.265625 1.21875 -3.21875 1.21875q-1.765625 0 -2.921875 -1.046875q-1.15625 -1.046875 -1.328125 -2.71875z" fill-rule="nonzero"/><path fill="#cfe2f3" d="m572.3295 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m572.3295 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path fill="#000000" d="m590.72015 51.364597l0 1.578125l-8.828125 0q-0.015625 -0.59375 0.1875 -1.140625q0.34375 -0.90625 1.078125 -1.78125q0.75 -0.875 2.15625 -2.015625q2.171875 -1.78125 2.9375 -2.828125q0.765625 -1.046875 0.765625 -1.96875q0 -0.984375 -0.703125 -1.640625q-0.6875 -0.671875 -1.8125 -0.671875q-1.1875 0 -1.90625 0.71875q-0.703125 0.703125 -0.703125 1.953125l-1.6875 -0.171875q0.171875 -1.890625 1.296875 -2.875q1.140625 -0.984375 3.03125 -0.984375q1.921875 0 3.046875 1.0625q1.125 1.0625 1.125 2.640625q0 0.796875 -0.328125 1.578125q-0.328125 0.78125 -1.09375 1.640625q-0.75 0.84375 -2.53125 2.34375q-1.46875 1.234375 -1.890625 1.6875q-0.421875 0.4375 -0.6875 0.875l6.546875 0z" fill-rule="nonzero"/><path fill="#e06666" d="m615.56793 24.999102l6.5512085 0l0 42.04725l-6.5512085 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m615.56793 24.999102l6.5512085 0l0 42.04725l-6.5512085 0z" fill-rule="evenodd"/><path fill="#c9daf8" d="m456.51425 24.999102l99.02365 0l0 42.04725l-99.02365 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m456.51425 24.999102l99.02365 0l0 42.04725l-99.02365 0z" fill-rule="evenodd"/><path fill="#000000" d="m466.2955 49.442722l1.71875 -0.140625q0.1875 1.25 0.875 1.890625q0.703125 0.625 1.6875 0.625q1.1875 0 2.0 -0.890625q0.828125 -0.890625 0.828125 -2.359375q0 -1.40625 -0.796875 -2.21875q-0.78125 -0.8125 -2.0625 -0.8125q-0.78125 0 -1.421875 0.359375q-0.640625 0.359375 -1.0 0.9375l-1.546875 -0.203125l1.296875 -6.859375l6.640625 0l0 1.5625l-5.328125 0l-0.71875 3.59375q1.203125 -0.84375 2.515625 -0.84375q1.75 0 2.953125 1.21875q1.203125 1.203125 1.203125 3.109375q0 1.8125 -1.046875 3.140625q-1.296875 1.625 -3.515625 1.625q-1.8125 0 -2.96875 -1.015625q-1.15625 -1.03125 -1.3125 -2.71875z" fill-rule="nonzero"/><path fill="#e06666" d="m391.1985 24.999102l6.551178 0l0 42.04725l-6.551178 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m391.1985 24.999102l6.551178 0l0 42.04725l-6.551178 0z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m114.43843 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="4.0,3.0" d="m114.43843 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m163.95024 24.999102c0 -12.5 114.47246 -25.007874 228.9449 -25.0c114.47241 0.007874016 228.94489 12.531496 228.94489 25.062992" fill-rule="evenodd"/><path stroke="#000000" stroke-width="2.0" stroke-linejoin="round" stroke-linecap="butt" d="m163.95024 24.9991c0 -12.499998 114.47246 -25.007872 228.9449 -24.999998c57.236206 0.003937008 114.47244 3.136811 157.3996 7.835138c21.463562 2.3491635 39.349915 5.0896897 51.8703 8.026144c3.130127 0.7341137 5.9248657 1.4804726 8.356262 2.236023c0.30395508 0.09444237 0.6022339 0.1890316 0.89471436 0.28375435l0.37457275 0.12388611" fill-rule="evenodd"/><path fill="#000000" stroke="#000000" stroke-width="2.0" stroke-linecap="butt" d="m609.98517 21.270555l9.406311 2.1936665l-5.7955933 -7.7266836z" fill-rule="evenodd"/><path fill="#e06666" d="m47.56793 24.999102l6.551182 0l0 42.04725l-6.551182 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m47.56793 24.999102l6.551182 0l0 42.04725l-6.551182 0z" fill-rule="evenodd"/></g></svg>
diff --git a/Documentation/networking/tls-offload-reorder-good.svg b/Documentation/networking/tls-offload-reorder-good.svg
new file mode 100644
index 000000000000..10e17d91f70c
--- /dev/null
+++ b/Documentation/networking/tls-offload-reorder-good.svg
@@ -0,0 +1 @@
+<svg version="1.1" viewBox="0.0 0.0 672.0 68.0" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><clipPath id="p.0"><path d="m0 0l960.0 0l0 720.0l-960.0 0l0 -720.0z" clip-rule="nonzero"/></clipPath><g clip-path="url(#p.0)"><path fill="#000000" fill-opacity="0.0" d="m0 0l960.0 0l0 720.0l-960.0 0z" fill-rule="evenodd"/><path fill="#b6d7a8" d="m0 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m0 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path fill="#000000" d="m15.953125 52.942722l-1.640625 0l0 -10.453125q-0.59375 0.5625 -1.5625 1.140625q-0.953125 0.5625 -1.71875 0.84375l0 -1.59375q1.375 -0.640625 2.40625 -1.5625q1.03125 -0.921875 1.453125 -1.78125l1.0625 0l0 13.40625z" fill-rule="nonzero"/><path fill="#b6d7a8" d="m340.69897 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m340.69897 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path fill="#000000" d="m355.73022 52.942722l0 -3.203125l-5.796875 0l0 -1.5l6.09375 -8.65625l1.34375 0l0 8.65625l1.796875 0l0 1.5l-1.796875 0l0 3.203125l-1.640625 0zm0 -4.703125l0 -6.015625l-4.1875 6.015625l4.1875 0z" fill-rule="nonzero"/><path fill="#cfe2f3" d="m225.37527 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m225.37527 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path fill="#000000" d="m235.15652 49.411472l1.640625 -0.21875q0.28125 1.40625 0.953125 2.015625q0.6875 0.609375 1.65625 0.609375q1.15625 0 1.953125 -0.796875q0.796875 -0.796875 0.796875 -1.984375q0 -1.125 -0.734375 -1.859375q-0.734375 -0.734375 -1.875 -0.734375q-0.46875 0 -1.15625 0.171875l0.1875 -1.4375q0.15625 0.015625 0.265625 0.015625q1.046875 0 1.875 -0.546875q0.84375 -0.546875 0.84375 -1.671875q0 -0.90625 -0.609375 -1.5q-0.609375 -0.59375 -1.578125 -0.59375q-0.953125 0 -1.59375 0.609375q-0.640625 0.59375 -0.8125 1.796875l-1.640625 -0.296875q0.296875 -1.640625 1.359375 -2.546875q1.0625 -0.90625 2.65625 -0.90625q1.09375 0 2.0 0.46875q0.921875 0.46875 1.40625 1.28125q0.5 0.8125 0.5 1.71875q0 0.859375 -0.46875 1.578125q-0.46875 0.703125 -1.375 1.125q1.1875 0.28125 1.84375 1.140625q0.65625 0.859375 0.65625 2.15625q0 1.734375 -1.28125 2.953125q-1.265625 1.21875 -3.21875 1.21875q-1.765625 0 -2.921875 -1.046875q-1.15625 -1.046875 -1.328125 -2.71875z" fill-rule="nonzero"/><path fill="#e06666" d="m271.56793 24.999102l6.551178 0l0 42.04725l-6.551178 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m271.56793 24.999102l6.551178 0l0 42.04725l-6.551178 0z" fill-rule="evenodd"/><path fill="#cfe2f3" d="m572.3295 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m572.3295 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path fill="#000000" d="m590.72015 51.364597l0 1.578125l-8.828125 0q-0.015625 -0.59375 0.1875 -1.140625q0.34375 -0.90625 1.078125 -1.78125q0.75 -0.875 2.15625 -2.015625q2.171875 -1.78125 2.9375 -2.828125q0.765625 -1.046875 0.765625 -1.96875q0 -0.984375 -0.703125 -1.640625q-0.6875 -0.671875 -1.8125 -0.671875q-1.1875 0 -1.90625 0.71875q-0.703125 0.703125 -0.703125 1.953125l-1.6875 -0.171875q0.171875 -1.890625 1.296875 -2.875q1.140625 -0.984375 3.03125 -0.984375q1.921875 0 3.046875 1.0625q1.125 1.0625 1.125 2.640625q0 0.796875 -0.328125 1.578125q-0.328125 0.78125 -1.09375 1.640625q-0.75 0.84375 -2.53125 2.34375q-1.46875 1.234375 -1.890625 1.6875q-0.421875 0.4375 -0.6875 0.875l6.546875 0z" fill-rule="nonzero"/><path fill="#b6d7a8" d="m456.51425 24.999102l99.02365 0l0 42.04725l-99.02365 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m456.51425 24.999102l99.02365 0l0 42.04725l-99.02365 0z" fill-rule="evenodd"/><path fill="#000000" d="m466.2955 49.442722l1.71875 -0.140625q0.1875 1.25 0.875 1.890625q0.703125 0.625 1.6875 0.625q1.1875 0 2.0 -0.890625q0.828125 -0.890625 0.828125 -2.359375q0 -1.40625 -0.796875 -2.21875q-0.78125 -0.8125 -2.0625 -0.8125q-0.78125 0 -1.421875 0.359375q-0.640625 0.359375 -1.0 0.9375l-1.546875 -0.203125l1.296875 -6.859375l6.640625 0l0 1.5625l-5.328125 0l-0.71875 3.59375q1.203125 -0.84375 2.515625 -0.84375q1.75 0 2.953125 1.21875q1.203125 1.203125 1.203125 3.109375q0 1.8125 -1.046875 3.140625q-1.296875 1.625 -3.515625 1.625q-1.8125 0 -2.96875 -1.015625q-1.15625 -1.03125 -1.3125 -2.71875z" fill-rule="nonzero"/><path fill="#e06666" d="m503.1985 24.999102l6.551178 0l0 42.04725l-6.551178 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m503.1985 24.999102l6.551178 0l0 42.04725l-6.551178 0z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m114.43843 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="4.0,3.0" d="m114.43843 24.999102l99.02362 0l0 42.04725l-99.02362 0z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m163.95024 24.999102c0 -12.5 114.47246 -25.007874 228.9449 -25.0c114.47241 0.007874016 228.94489 12.531496 228.94489 25.062992" fill-rule="evenodd"/><path stroke="#000000" stroke-width="2.0" stroke-linejoin="round" stroke-linecap="butt" d="m163.95024 24.9991c0 -12.499998 114.47246 -25.007872 228.9449 -24.999998c57.236206 0.003937008 114.47244 3.136811 157.3996 7.835138c21.463562 2.3491635 39.349915 5.0896897 51.8703 8.026144c3.130127 0.7341137 5.9248657 1.4804726 8.356262 2.236023c0.30395508 0.09444237 0.6022339 0.1890316 0.89471436 0.28375435l0.37457275 0.12388611" fill-rule="evenodd"/><path fill="#000000" stroke="#000000" stroke-width="2.0" stroke-linecap="butt" d="m609.98517 21.270555l9.406311 2.1936665l-5.7955933 -7.7266836z" fill-rule="evenodd"/><path fill="#e06666" d="m47.56793 24.999102l6.551182 0l0 42.04725l-6.551182 0z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m47.56793 24.999102l6.551182 0l0 42.04725l-6.551182 0z" fill-rule="evenodd"/></g></svg>
diff --git a/Documentation/networking/tls-offload.rst b/Documentation/networking/tls-offload.rst
new file mode 100644
index 000000000000..cb85af559dff
--- /dev/null
+++ b/Documentation/networking/tls-offload.rst
@@ -0,0 +1,482 @@
+.. SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+==================
+Kernel TLS offload
+==================
+Kernel TLS operation
+====================
+Linux kernel provides TLS connection offload infrastructure. Once a TCP
+connection is in ``ESTABLISHED`` state user space can enable the TLS Upper
+Layer Protocol (ULP) and install the cryptographic connection state.
+For details regarding the user-facing interface refer to the TLS
+documentation in :ref:`Documentation/networking/tls.rst <kernel_tls>`.
+``ktls`` can operate in three modes:
+ * Software crypto mode (``TLS_SW``) - CPU handles the cryptography.
+   In most basic cases only crypto operations synchronous with the CPU
+   can be used, but depending on calling context CPU may utilize
+   asynchronous crypto accelerators. The use of accelerators introduces extra
+   latency on socket reads (decryption only starts when a read syscall
+   is made) and additional I/O load on the system.
+ * Packet-based NIC offload mode (``TLS_HW``) - the NIC handles crypto
+   on a packet by packet basis, provided the packets arrive in order.
+   This mode integrates best with the kernel stack and is described in detail
+   in the remaining part of this document
+   (``ethtool`` flags ``tls-hw-tx-offload`` and ``tls-hw-rx-offload``).
+ * Full TCP NIC offload mode (``TLS_HW_RECORD``) - mode of operation where
+   NIC driver and firmware replace the kernel networking stack
+   with its own TCP handling, it is not usable in production environments
+   making use of the Linux networking stack for example any firewalling
+   abilities or QoS and packet scheduling (``ethtool`` flag ``tls-hw-record``).
+The operation mode is selected automatically based on device configuration,
+offload opt-in or opt-out on per-connection basis is not currently supported.
+TX
+--
+At a high level user write requests are turned into a scatter list, the TLS ULP
+intercepts them, inserts record framing, performs encryption (in ``TLS_SW``
+mode) and then hands the modified scatter list to the TCP layer. From this
+point on the TCP stack proceeds as normal.
+In ``TLS_HW`` mode the encryption is not performed in the TLS ULP.
+Instead packets reach a device driver, the driver will mark the packets
+for crypto offload based on the socket the packet is attached to,
+and send them to the device for encryption and transmission.
+RX
+--
+On the receive side if the device handled decryption and authentication
+successfully, the driver will set the decrypted bit in the associated
+:c:type:`struct sk_buff <sk_buff>`. The packets reach the TCP stack and
+are handled normally. ``ktls`` is informed when data is queued to the socket
+and the ``strparser`` mechanism is used to delineate the records. Upon read
+request, records are retrieved from the socket and passed to decryption routine.
+If device decrypted all the segments of the record the decryption is skipped,
+otherwise software path handles decryption.
+.. kernel-figure::  tls-offload-layers.svg
+   :alt:        TLS offload layers
+   :align:      center
+   :figwidth:   28em
+   Layers of Kernel TLS stack
+Device configuration
+====================
+During driver initialization device sets the ``NETIF_F_HW_TLS_RX`` and
+``NETIF_F_HW_TLS_TX`` features and installs its
+:c:type:`struct tlsdev_ops <tlsdev_ops>`
+pointer in the :c:member:`tlsdev_ops` member of the
+:c:type:`struct net_device <net_device>`.
+When TLS cryptographic connection state is installed on a ``ktls`` socket
+(note that it is done twice, once for RX and once for TX direction,
+and the two are completely independent), the kernel checks if the underlying
+network device is offload-capable and attempts the offload. In case offload
+fails the connection is handled entirely in software using the same mechanism
+as if the offload was never tried.
+Offload request is performed via the :c:member:`tls_dev_add` callback of
+:c:type:`struct tlsdev_ops <tlsdev_ops>`:
+.. code-block:: c
+        int (*tls_dev_add)(struct net_device *netdev, struct sock *sk,
+                           enum tls_offload_ctx_dir direction,
+                           struct tls_crypto_info *crypto_info,
+                           u32 start_offload_tcp_sn);
+``direction`` indicates whether the cryptographic information is for
+the received or transmitted packets. Driver uses the ``sk`` parameter
+to retrieve the connection 5-tuple and socket family (IPv4 vs IPv6).
+Cryptographic information in ``crypto_info`` includes the key, iv, salt
+as well as TLS record sequence number. ``start_offload_tcp_sn`` indicates
+which TCP sequence number corresponds to the beginning of the record with
+sequence number from ``crypto_info``. The driver can add its state
+at the end of kernel structures (see :c:member:`driver_state` members
+in ``include/net/tls.h``) to avoid additional allocations and pointer
+dereferences.
+TX
+--
+After TX state is installed, the stack guarantees that the first segment
+of the stream will start exactly at the ``start_offload_tcp_sn`` sequence
+number, simplifying TCP sequence number matching.
+TX offload being fully initialized does not imply that all segments passing
+through the driver and which belong to the offloaded socket will be after
+the expected sequence number and will have kernel record information.
+In particular, already encrypted data may have been queued to the socket
+before installing the connection state in the kernel.
+RX
+--
+In RX direction local networking stack has little control over the segmentation,
+so the initial records' TCP sequence number may be anywhere inside the segment.
+Normal operation
+================
+At the minimum the device maintains the following state for each connection, in
+each direction:
+ * crypto secrets (key, iv, salt)
+ * crypto processing state (partial blocks, partial authentication tag, etc.)
+ * record metadata (sequence number, processing offset and length)
+ * expected TCP sequence number
+There are no guarantees on record length or record segmentation. In particular
+segments may start at any point of a record and contain any number of records.
+Assuming segments are received in order, the device should be able to perform
+crypto operations and authentication regardless of segmentation. For this
+to be possible device has to keep small amount of segment-to-segment state.
+This includes at least:
+ * partial headers (if a segment carried only a part of the TLS header)
+ * partial data block
+ * partial authentication tag (all data had been seen but part of the
+   authentication tag has to be written or read from the subsequent segment)
+Record reassembly is not necessary for TLS offload. If the packets arrive
+in order the device should be able to handle them separately and make
+forward progress.
+TX
+--
+The kernel stack performs record framing reserving space for the authentication
+tag and populating all other TLS header and tailer fields.
+Both the device and the driver maintain expected TCP sequence numbers
+due to the possibility of retransmissions and the lack of software fallback
+once the packet reaches the device.
+For segments passed in order, the driver marks the packets with
+a connection identifier (note that a 5-tuple lookup is insufficient to identify
+packets requiring HW offload, see the :ref:`5tuple_problems` section)
+and hands them to the device. The device identifies the packet as requiring
+TLS handling and confirms the sequence number matches its expectation.
+The device performs encryption and authentication of the record data.
+It replaces the authentication tag and TCP checksum with correct values.
+RX
+--
+Before a packet is DMAed to the host (but after NIC's embedded switching
+and packet transformation functions) the device validates the Layer 4
+checksum and performs a 5-tuple lookup to find any TLS connection the packet
+may belong to (technically a 4-tuple
+lookup is sufficient - IP addresses and TCP port numbers, as the protocol
+is always TCP). If connection is matched device confirms if the TCP sequence
+number is the expected one and proceeds to TLS handling (record delineation,
+decryption, authentication for each record in the packet). The device leaves
+the record framing unmodified, the stack takes care of record decapsulation.
+Device indicates successful handling of TLS offload in the per-packet context
+(descriptor) passed to the host.
+Upon reception of a TLS offloaded packet, the driver sets
+the :c:member:`decrypted` mark in :c:type:`struct sk_buff <sk_buff>`
+corresponding to the segment. Networking stack makes sure decrypted
+and non-decrypted segments do not get coalesced (e.g. by GRO or socket layer)
+and takes care of partial decryption.
+Resync handling
+===============
+In presence of packet drops or network packet reordering, the device may lose
+synchronization with the TLS stream, and require a resync with the kernel's
+TCP stack.
+Note that resync is only attempted for connections which were successfully
+added to the device table and are in TLS_HW mode. For example,
+if the table was full when cryptographic state was installed in the kernel,
+such connection will never get offloaded. Therefore the resync request
+does not carry any cryptographic connection state.
+TX
+--
+Segments transmitted from an offloaded socket can get out of sync
+in similar ways to the receive side-retransmissions - local drops
+are possible, though network reorders are not.
+Whenever an out of order segment is transmitted the driver provides
+the device with enough information to perform cryptographic operations.
+This means most likely that the part of the record preceding the current
+segment has to be passed to the device as part of the packet context,
+together with its TCP sequence number and TLS record number. The device
+can then initialize its crypto state, process and discard the preceding
+data (to be able to insert the authentication tag) and move onto handling
+the actual packet.
+In this mode depending on the implementation the driver can either ask
+for a continuation with the crypto state and the new sequence number
+(next expected segment is the one after the out of order one), or continue
+with the previous stream state - assuming that the out of order segment
+was just a retransmission. The former is simpler, and does not require
+retransmission detection therefore it is the recommended method until
+such time it is proven inefficient.
+RX
+--
+A small amount of RX reorder events may not require a full resynchronization.
+In particular the device should not lose synchronization
+when record boundary can be recovered:
+.. kernel-figure::  tls-offload-reorder-good.svg
+   :alt:        reorder of non-header segment
+   :align:      center
+   Reorder of non-header segment
+Green segments are successfully decrypted, blue ones are passed
+as received on wire, red stripes mark start of new records.
+In above case segment 1 is received and decrypted successfully.
+Segment 2 was dropped so 3 arrives out of order. The device knows
+the next record starts inside 3, based on record length in segment 1.
+Segment 3 is passed untouched, because due to lack of data from segment 2
+the remainder of the previous record inside segment 3 cannot be handled.
+The device can, however, collect the authentication algorithm's state
+and partial block from the new record in segment 3 and when 4 and 5
+arrive continue decryption. Finally when 2 arrives it's completely outside
+of expected window of the device so it's passed as is without special
+handling. ``ktls`` software fallback handles the decryption of record
+spanning segments 1, 2 and 3. The device did not get out of sync,
+even though two segments did not get decrypted.
+Kernel synchronization may be necessary if the lost segment contained
+a record header and arrived after the next record header has already passed:
+.. kernel-figure::  tls-offload-reorder-bad.svg
+   :alt:        reorder of header segment
+   :align:      center
+   Reorder of segment with a TLS header
+In this example segment 2 gets dropped, and it contains a record header.
+Device can only detect that segment 4 also contains a TLS header
+if it knows the length of the previous record from segment 2. In this case
+the device will lose synchronization with the stream.
+When the device gets out of sync and the stream reaches TCP sequence
+numbers more than a max size record past the expected TCP sequence number,
+the device starts scanning for a known header pattern. For example
+for TLS 1.2 and TLS 1.3 subsequent bytes of value ``0x03 0x03`` occur
+in the SSL/TLS version field of the header. Once pattern is matched
+the device continues attempting parsing headers at expected locations
+(based on the length fields at guessed locations).
+Whenever the expected location does not contain a valid header the scan
+is restarted.
+When the header is matched the device sends a confirmation request
+to the kernel, asking if the guessed location is correct (if a TLS record
+really starts there), and which record sequence number the given header had.
+The kernel confirms the guessed location was correct and tells the device
+the record sequence number. Meanwhile, the device had been parsing
+and counting all records since the just-confirmed one, it adds the number
+of records it had seen to the record number provided by the kernel.
+At this point the device is in sync and can resume decryption at next
+segment boundary.
+In a pathological case the device may latch onto a sequence of matching
+headers and never hear back from the kernel (there is no negative
+confirmation from the kernel). The implementation may choose to periodically
+restart scan. Given how unlikely falsely-matching stream is, however,
+periodic restart is not deemed necessary.
+Special care has to be taken if the confirmation request is passed
+asynchronously to the packet stream and record may get processed
+by the kernel before the confirmation request.
+Error handling
+==============
+TX
+--
+Packets may be redirected or rerouted by the stack to a different
+device than the selected TLS offload device. The stack will handle
+such condition using the :c:func:`sk_validate_xmit_skb` helper
+(TLS offload code installs :c:func:`tls_validate_xmit_skb` at this hook).
+Offload maintains information about all records until the data is
+fully acknowledged, so if skbs reach the wrong device they can be handled
+by software fallback.
+Any device TLS offload handling error on the transmission side must result
+in the packet being dropped. For example if a packet got out of order
+due to a bug in the stack or the device, reached the device and can't
+be encrypted such packet must be dropped.
+RX
+--
+If the device encounters any problems with TLS offload on the receive
+side it should pass the packet to the host's networking stack as it was
+received on the wire.
+For example authentication failure for any record in the segment should
+result in passing the unmodified packet to the software fallback. This means
+packets should not be modified "in place". Splitting segments to handle partial
+decryption is not advised. In other words either all records in the packet
+had been handled successfully and authenticated or the packet has to be passed
+to the host's stack as it was on the wire (recovering original packet in the
+driver if device provides precise error is sufficient).
+The Linux networking stack does not provide a way of reporting per-packet
+decryption and authentication errors, packets with errors must simply not
+have the :c:member:`decrypted` mark set.
+A packet should also not be handled by the TLS offload if it contains
+incorrect checksums.
+Performance metrics
+===================
+TLS offload can be characterized by the following basic metrics:
+ * max connection count
+ * connection installation rate
+ * connection installation latency
+ * total cryptographic performance
+Note that each TCP connection requires a TLS session in both directions,
+the performance may be reported treating each direction separately.
+Max connection count
+--------------------
+The number of connections device can support can be exposed via
+``devlink resource`` API.
+Total cryptographic performance
+-------------------------------
+Offload performance may depend on segment and record size.
+Overload of the cryptographic subsystem of the device should not have
+significant performance impact on non-offloaded streams.
+Statistics
+==========
+Following minimum set of TLS-related statistics should be reported
+by the driver:
+ * ``rx_tls_decrypted`` - number of successfully decrypted TLS segments
+ * ``tx_tls_encrypted`` - number of in-order TLS segments passed to device
+   for encryption
+ * ``tx_tls_ooo`` - number of TX packets which were part of a TLS stream
+   but did not arrive in the expected order
+ * ``tx_tls_drop_no_sync_data`` - number of TX packets dropped because
+   they arrived out of order and associated record could not be found
+   (see also :ref:`pre_tls_data`)
+Notable corner cases, exceptions and additional requirements
+============================================================
+.. _5tuple_problems:
+5-tuple matching limitations
+----------------------------
+The device can only recognize received packets based on the 5-tuple
+of the socket. Current ``ktls`` implementation will not offload sockets
+routed through software interfaces such as those used for tunneling
+or virtual networking. However, many packet transformations performed
+by the networking stack (most notably any BPF logic) do not require
+any intermediate software device, therefore a 5-tuple match may
+consistently miss at the device level. In such cases the device
+should still be able to perform TX offload (encryption) and should
+fallback cleanly to software decryption (RX).
+Out of order
+------------
+Introducing extra processing in NICs should not cause packets to be
+transmitted or received out of order, for example pure ACK packets
+should not be reordered with respect to data segments.
+Ingress reorder
+---------------
+A device is permitted to perform packet reordering for consecutive
+TCP segments (i.e. placing packets in the correct order) but any form
+of additional buffering is disallowed.
+Coexistence with standard networking offload features
+-----------------------------------------------------
+Offloaded ``ktls`` sockets should support standard TCP stack features
+transparently. Enabling device TLS offload should not cause any difference
+in packets as seen on the wire.
+Transport layer transparency
+----------------------------
+The device should not modify any packet headers for the purpose
+of the simplifying TLS offload.
+The device should not depend on any packet headers beyond what is strictly
+necessary for TLS offload.
+Segment drops
+-------------
+Dropping packets is acceptable only in the event of catastrophic
+system errors and should never be used as an error handling mechanism
+in cases arising from normal operation. In other words, reliance
+on TCP retransmissions to handle corner cases is not acceptable.
+TLS device features
+-------------------
+Drivers should ignore the changes to TLS the device feature flags.
+These flags will be acted upon accordingly by the core ``ktls`` code.
+TLS device feature flags only control adding of new TLS connection
+offloads, old connections will remain active after flags are cleared.
+Known bugs
+==========
+skb_orphan() leaks clear text
+-----------------------------
+Currently drivers depend on the :c:member:`sk` member of
+:c:type:`struct sk_buff <sk_buff>` to identify segments requiring
+encryption. Any operation which removes or does not preserve the socket
+association such as :c:func:`skb_orphan` or :c:func:`skb_clone`
+will cause the driver to miss the packets and lead to clear text leaks.
+Redirects leak clear text
+-------------------------
+In the RX direction, if segment has already been decrypted by the device
+and it gets redirected or mirrored - clear text will be transmitted out.
+.. _pre_tls_data:
+Transmission of pre-TLS data
+----------------------------
+User can enqueue some already encrypted and framed records before enabling
+``ktls`` on the socket. Those records have to get sent as they are. This is
+perfectly easy to handle in the software case - such data will be waiting
+in the TCP layer, TLS ULP won't see it. In the offloaded case when pre-queued
+segment reaches transmission point it appears to be out of order (before the
+expected TCP sequence number) and the stack does not have a record information
+associated.
+All segments without record information cannot, however, be assumed to be
+pre-queued data, because a race condition exists between TCP stack queuing
+a retransmission, the driver seeing the retransmission and TCP ACK arriving
+for the retransmitted data.
diff --git a/Documentation/networking/tls.txt b/Documentation/networking/tls.rst
index 58b5ef75f1b7..5bcbf75e2025 100644
--- a/Documentation/networking/tls.txt
+++ b/Documentation/networking/tls.rst
@@ -1,3 +1,9 @@
+.. _kernel_tls:
+==========
+Kernel TLS
+==========
 Overview
 ========
@@ -12,6 +18,8 @@ Creating a TLS connection
 First create a new TCP socket and set the TLS ULP.
+.. code-block:: c
  sock = socket(AF_INET, SOCK_STREAM, 0);
  setsockopt(sock, SOL_TCP, TCP_ULP, "tls", sizeof("tls"));
@@ -21,6 +29,8 @@ handshake is complete, we have all the parameters required to move the
 data-path to the kernel. There is a separate socket option for moving
 the transmit and the receive into the kernel.
+.. code-block:: c
  /* From linux/tls.h */
  struct tls_crypto_info {
          unsigned short version;
@@ -58,6 +68,8 @@ After setting the TLS_TX socket option all application data sent over this
 socket is encrypted using TLS and the parameters provided in the socket option.
 For example, we can send an encrypted hello world record as follows:
+.. code-block:: c
  const char *msg = "hello world\n";
  send(sock, msg, strlen(msg));
@@ -67,6 +79,8 @@ to the encrypted kernel send buffer if possible.
 The sendfile system call will send the file's data over TLS records of maximum
 length (2^14).
+.. code-block:: c
  file = open(filename, O_RDONLY);
  fstat(file, &stat);
  sendfile(sock, file, &offset, stat.st_size);
@@ -89,6 +103,8 @@ After setting the TLS_RX socket option, all recv family socket calls
 are decrypted using TLS parameters provided.  A full TLS record must
 be received before decryption can happen.
+.. code-block:: c
  char buffer[16384];
  recv(sock, buffer, 16384);
@@ -97,12 +113,12 @@ large enough, and no additional allocations occur.  If the userspace
 buffer is too small, data is decrypted in the kernel and copied to
 userspace.
-EINVAL is returned if the TLS version in the received message does not
+``EINVAL`` is returned if the TLS version in the received message does not
 match the version passed in setsockopt.
-EMSGSIZE is returned if the received message is too big.
+``EMSGSIZE`` is returned if the received message is too big.
-EBADMSG is returned if decryption failed for any other reason.
+``EBADMSG`` is returned if decryption failed for any other reason.
 Send TLS control messages
 -------------------------
@@ -113,9 +129,11 @@ These messages can be sent over the socket by providing the TLS record type
 via a CMSG. For example the following function sends @data of @length bytes
 using a record of type @record_type.
-/* send TLS control message using record_type */
+.. code-block:: c
+  /* send TLS control message using record_type */
  static int klts_send_ctrl_message(int sock, unsigned char record_type,
-                                  void *data, size_t length)
+                                    void *data, size_t length)
  {
        struct msghdr msg = {0};
        int cmsg_len = sizeof(record_type);
@@ -151,6 +169,8 @@ type passed via cmsg.  If no cmsg buffer is provided, an error is
 returned if a control message is received.  Data messages may be
 received without a cmsg buffer set.
+.. code-block:: c
  char buffer[16384];
  char cmsg[CMSG_SPACE(sizeof(unsigned char))];
  struct msghdr msg = {0};
@@ -186,12 +206,10 @@ Integrating in to userspace TLS library
 At a high level, the kernel TLS ULP is a replacement for the record
 layer of a userspace TLS library.
-A patchset to OpenSSL to use ktls as the record layer is here:
+A patchset to OpenSSL to use ktls as the record layer is
+`here <https://github.com/Mellanox/openssl/commits/tls_rx2>`_.
-https://github.com/Mellanox/openssl/commits/tls_rx2
-An example of calling send directly after a handshake using
-gnutls.  Since it doesn't implement a full record layer, control
-messages are not supported:
-https://github.com/ktls/af_ktls-tool/commits/RX
+`An example <https://github.com/ktls/af_ktls-tool/commits/RX>`_
+of calling send directly after a handshake using gnutls.
+Since it doesn't implement a full record layer, control
+messages are not supported.
diff --git a/Documentation/sphinx/kerneldoc.py b/Documentation/sphinx/kerneldoc.py
index 9d0a7f08f93b..1159405cb920 100644
--- a/Documentation/sphinx/kerneldoc.py
+++ b/Documentation/sphinx/kerneldoc.py
@@ -37,7 +37,19 @@ import glob
 from docutils import nodes, statemachine
 from docutils.statemachine import ViewList
 from docutils.parsers.rst import directives, Directive
-from sphinx.ext.autodoc import AutodocReporter
+#
+# AutodocReporter is only good up to Sphinx 1.7
+#
+import sphinx
+Use_SSI = sphinx.__version__[:3] >= '1.7'
+if Use_SSI:
+    from sphinx.util.docutils import switch_source_input
+else:
+    from sphinx.ext.autodoc import AutodocReporter
+import kernellog
 __version__  = '1.0'
@@ -90,7 +102,8 @@ class KernelDocDirective(Directive):
        cmd += [filename]
        try:
-            env.app.verbose('calling kernel-doc \'%s\'' % (" ".join(cmd)))
+            kernellog.verbose(env.app,
+                              'calling kernel-doc \'%s\'' % (" ".join(cmd)))
            p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
            out, err = p.communicate()
@@ -100,7 +113,8 @@ class KernelDocDirective(Directive):
            if p.returncode != 0:
                sys.stderr.write(err)
-                env.app.warn('kernel-doc \'%s\' failed with return code %d' % (" ".join(cmd), p.returncode))
+                kernellog.warn(env.app,
+                               'kernel-doc \'%s\' failed with return code %d' % (" ".join(cmd), p.returncode))
                return [nodes.error(None, nodes.paragraph(text = "kernel-doc missing"))]
            elif env.config.kerneldoc_verbosity > 0:
                sys.stderr.write(err)
@@ -121,20 +135,28 @@ class KernelDocDirective(Directive):
                    lineoffset += 1
            node = nodes.section()
-            buf = self.state.memo.title_styles, self.state.memo.section_level, self.state.memo.reporter
+            self.do_parse(result, node)
+            return node.children
+        except Exception as e:  # pylint: disable=W0703
+            kernellog.warn(env.app, 'kernel-doc \'%s\' processing failed with: %s' %
+                           (" ".join(cmd), str(e)))
+            return [nodes.error(None, nodes.paragraph(text = "kernel-doc missing"))]
+    def do_parse(self, result, node):
+        if Use_SSI:
+            with switch_source_input(self.state, result):
+                self.state.nested_parse(result, 0, node, match_titles=1)
+        else:
+            save = self.state.memo.title_styles, self.state.memo.section_level, self.state.memo.reporter
            self.state.memo.reporter = AutodocReporter(result, self.state.memo.reporter)
            self.state.memo.title_styles, self.state.memo.section_level = [], 0
            try:
                self.state.nested_parse(result, 0, node, match_titles=1)
            finally:
-                self.state.memo.title_styles, self.state.memo.section_level, self.state.memo.reporter = buf
+                self.state.memo.title_styles, self.state.memo.section_level, self.state.memo.reporter = save
-            return node.children
-        except Exception as e:  # pylint: disable=W0703
-            env.app.warn('kernel-doc \'%s\' processing failed with: %s' %
-                         (" ".join(cmd), str(e)))
-            return [nodes.error(None, nodes.paragraph(text = "kernel-doc missing"))]
 def setup(app):
    app.add_config_value('kerneldoc_bin', None, 'env')
diff --git a/Documentation/sphinx/kernellog.py b/Documentation/sphinx/kernellog.py
new file mode 100644
index 000000000000..af924f51a7dc
--- /dev/null
+++ b/Documentation/sphinx/kernellog.py
@@ -0,0 +1,28 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Sphinx has deprecated its older logging interface, but the replacement
+# only goes back to 1.6.  So here's a wrapper layer to keep around for
+# as long as we support 1.4.
+#
+import sphinx
+if sphinx.__version__[:3] >= '1.6':
+    UseLogging = True
+    from sphinx.util import logging
+    logger = logging.getLogger('kerneldoc')
+else:
+    UseLogging = False
+def warn(app, message):
+    if UseLogging:
+        logger.warning(message)
+    else:
+        app.warn(message)
+def verbose(app, message):
+    if UseLogging:
+        logger.verbose(message)
+    else:
+        app.verbose(message)
diff --git a/Documentation/sphinx/kfigure.py b/Documentation/sphinx/kfigure.py
index b97228d2cc0e..fbfe6693bb60 100644
--- a/Documentation/sphinx/kfigure.py
+++ b/Documentation/sphinx/kfigure.py
@@ -60,6 +60,8 @@ import sphinx
 from sphinx.util.nodes import clean_astext
 from six import iteritems
+import kernellog
 PY3 = sys.version_info[0] == 3
 if PY3:
@@ -171,20 +173,20 @@ def setupTools(app):
    This function is called once, when the builder is initiated.
    """
    global dot_cmd, convert_cmd   # pylint: disable=W0603
-    app.verbose("kfigure: check installed tools ...")
+    kernellog.verbose(app, "kfigure: check installed tools ...")
    dot_cmd = which('dot')
    convert_cmd = which('convert')
    if dot_cmd:
-        app.verbose("use dot(1) from: " + dot_cmd)
+        kernellog.verbose(app, "use dot(1) from: " + dot_cmd)
    else:
-        app.warn("dot(1) not found, for better output quality install "
+        kernellog.warn(app, "dot(1) not found, for better output quality install "
-                 "graphviz from http://www.graphviz.org")
+                       "graphviz from http://www.graphviz.org")
    if convert_cmd:
-        app.verbose("use convert(1) from: " + convert_cmd)
+        kernellog.verbose(app, "use convert(1) from: " + convert_cmd)
    else:
-        app.warn(
+        kernellog.warn(app,
            "convert(1) not found, for SVG to PDF conversion install "
            "ImageMagick (https://www.imagemagick.org)")
@@ -220,12 +222,13 @@ def convert_image(img_node, translator, src_fname=None):
    # in kernel builds, use 'make SPHINXOPTS=-v' to see verbose messages
-    app.verbose('assert best format for: ' + img_node['uri'])
+    kernellog.verbose(app, 'assert best format for: ' + img_node['uri'])
    if in_ext == '.dot':
        if not dot_cmd:
-            app.verbose("dot from graphviz not available / include DOT raw.")
+            kernellog.verbose(app,
+                              "dot from graphviz not available / include DOT raw.")
            img_node.replace_self(file2literal(src_fname))
        elif translator.builder.format == 'latex':
@@ -252,7 +255,8 @@ def convert_image(img_node, translator, src_fname=None):
        if translator.builder.format == 'latex':
            if convert_cmd is None:
-                app.verbose("no SVG to PDF conversion available / include SVG raw.")
+                kernellog.verbose(app,
+                                  "no SVG to PDF conversion available / include SVG raw.")
                img_node.replace_self(file2literal(src_fname))
            else:
                dst_fname = path.join(translator.builder.outdir, fname + '.pdf')
@@ -265,18 +269,19 @@ def convert_image(img_node, translator, src_fname=None):
        _name = dst_fname[len(translator.builder.outdir) + 1:]
        if isNewer(dst_fname, src_fname):
-            app.verbose("convert: {out}/%s already exists and is newer" % _name)
+            kernellog.verbose(app,
+                              "convert: {out}/%s already exists and is newer" % _name)
        else:
            ok = False
            mkdir(path.dirname(dst_fname))
            if in_ext == '.dot':
-                app.verbose('convert DOT to: {out}/' + _name)
+                kernellog.verbose(app, 'convert DOT to: {out}/' + _name)
                ok = dot2format(app, src_fname, dst_fname)
            elif in_ext == '.svg':
-                app.verbose('convert SVG to: {out}/' + _name)
+                kernellog.verbose(app, 'convert SVG to: {out}/' + _name)
                ok = svg2pdf(app, src_fname, dst_fname)
            if not ok:
@@ -305,7 +310,8 @@ def dot2format(app, dot_fname, out_fname):
    with open(out_fname, "w") as out:
        exit_code = subprocess.call(cmd, stdout = out)
        if exit_code != 0:
-            app.warn("Error #%d when calling: %s" % (exit_code, " ".join(cmd)))
+            kernellog.warn(app,
+                          "Error #%d when calling: %s" % (exit_code, " ".join(cmd)))
    return bool(exit_code == 0)
 def svg2pdf(app, svg_fname, pdf_fname):
@@ -322,7 +328,7 @@ def svg2pdf(app, svg_fname, pdf_fname):
    # use stdout and stderr from parent
    exit_code = subprocess.call(cmd)
    if exit_code != 0:
-        app.warn("Error #%d when calling: %s" % (exit_code, " ".join(cmd)))
+        kernellog.warn(app, "Error #%d when calling: %s" % (exit_code, " ".join(cmd)))
    return bool(exit_code == 0)
@@ -415,15 +421,15 @@ def visit_kernel_render(self, node):
    app = self.builder.app
    srclang = node.get('srclang')
-    app.verbose('visit kernel-render node lang: "%s"' % (srclang))
+    kernellog.verbose(app, 'visit kernel-render node lang: "%s"' % (srclang))
    tmp_ext = RENDER_MARKUP_EXT.get(srclang, None)
    if tmp_ext is None:
-        app.warn('kernel-render: "%s" unknown / include raw.' % (srclang))
+        kernellog.warn(app, 'kernel-render: "%s" unknown / include raw.' % (srclang))
        return
    if not dot_cmd and tmp_ext == '.dot':
-        app.verbose("dot from graphviz not available / include raw.")
+        kernellog.verbose(app, "dot from graphviz not available / include raw.")
        return
    literal_block = node[0]
diff --git a/Documentation/usb/rio.txt b/Documentation/usb/rio.txt
index ca9adcf56355..ea73475471db 100644
--- a/Documentation/usb/rio.txt
+++ b/Documentation/usb/rio.txt
@@ -76,70 +76,30 @@ Additional Information and userspace tools
 Requirements
 ============
-A host with a USB port.  Ideally, either a UHCI (Intel) or OHCI
+A host with a USB port running a Linux kernel with RIO 500 support enabled.
-(Compaq and others) hardware port should work.
-A Linux development kernel (2.3.x) with USB support enabled or a
+The driver is a module called rio500, which should be automatically loaded
-backported version to linux-2.2.x.  See http://www.linux-usb.org for
+as you plug in your device. If that fails you can manually load it with
-more information on accomplishing this.
-A Linux kernel with RIO 500 support enabled.
+  modprobe rio500
-'lspci' which is only needed to determine the type of USB hardware
+Udev should automatically create a device node as soon as plug in your device.
-available in your machine.
+If that fails, you can manually add a device for the USB rio500::
-Configuration
-Using `lspci -v`, determine the type of USB hardware available.
-  If you see something like::
-    USB Controller: ......
-    Flags: .....
-    I/O ports at ....
-  Then you have a UHCI based controller.
-  If you see something like::
-     USB Controller: .....
-     Flags: ....
-     Memory at .....
-  Then you have a OHCI based controller.
-Using `make menuconfig` or your preferred method for configuring the
-kernel, select 'Support for USB', 'OHCI/UHCI' depending on your
-hardware (determined from the steps above), 'USB Diamond Rio500 support', and
-'Preliminary USB device filesystem'.  Compile and install the modules
-(you may need to execute `depmod -a` to update the module
-dependencies).
-Add a device for the USB rio500::
  mknod /dev/usb/rio500 c 180 64
-Set appropriate permissions for /dev/usb/rio500 (don't forget about
+In that case, set appropriate permissions for /dev/usb/rio500 (don't forget
-group and world permissions).  Both read and write permissions are
+about group and world permissions).  Both read and write permissions are
 required for proper operation.
-Load the appropriate modules (if compiled as modules):
-  OHCI::
-    modprobe usbcore
-    modprobe usb-ohci
-    modprobe rio500
-  UHCI::
-    modprobe usbcore
-    modprobe usb-uhci  (or uhci)
-    modprobe rio500
 That's it.  The Rio500 Utils at: http://rio500.sourceforge.net should
 be able to access the rio500.
+Limits
+======
+You can use only a single rio500 device at a time with your computer.
 Bugs
 ====
diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h
index a65167f5cded..e8bcb9ecede9 100644
--- a/arch/arm64/include/asm/syscall.h
+++ b/arch/arm64/include/asm/syscall.h
@@ -20,7 +20,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
-typedef long (*syscall_fn_t)(struct pt_regs *regs);
+typedef long (*syscall_fn_t)(const struct pt_regs *regs);
 extern const syscall_fn_t sys_call_table[];
diff --git a/arch/arm64/include/asm/syscall_wrapper.h b/arch/arm64/include/asm/syscall_wrapper.h
index a4477e515b79..507d0ee6bc69 100644
--- a/arch/arm64/include/asm/syscall_wrapper.h
+++ b/arch/arm64/include/asm/syscall_wrapper.h
@@ -30,10 +30,10 @@
        }                                                                               \
        static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
-#define COMPAT_SYSCALL_DEFINE0(sname)                                   \
+#define COMPAT_SYSCALL_DEFINE0(sname)                                                   \
-        asmlinkage long __arm64_compat_sys_##sname(void);               \
+        asmlinkage long __arm64_compat_sys_##sname(const struct pt_regs *__unused);     \
-        ALLOW_ERROR_INJECTION(__arm64_compat_sys_##sname, ERRNO);       \
+        ALLOW_ERROR_INJECTION(__arm64_compat_sys_##sname, ERRNO);                       \
-        asmlinkage long __arm64_compat_sys_##sname(void)
+        asmlinkage long __arm64_compat_sys_##sname(const struct pt_regs *__unused)
 #define COND_SYSCALL_COMPAT(name) \
        cond_syscall(__arm64_compat_sys_##name);
@@ -62,11 +62,11 @@
        static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
 #ifndef SYSCALL_DEFINE0
-#define SYSCALL_DEFINE0(sname)                                  \
+#define SYSCALL_DEFINE0(sname)                                                  \
-        SYSCALL_METADATA(_##sname, 0);                          \
+        SYSCALL_METADATA(_##sname, 0);                                          \
-        asmlinkage long __arm64_sys_##sname(void);              \
+        asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused);    \
-        ALLOW_ERROR_INJECTION(__arm64_sys_##sname, ERRNO);      \
+        ALLOW_ERROR_INJECTION(__arm64_sys_##sname, ERRNO);                      \
-        asmlinkage long __arm64_sys_##sname(void)
+        asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused)
 #endif
 #ifndef COND_SYSCALL
diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c
index f32359cffb01..dd080837e6a9 100644
--- a/arch/arm64/kernel/module.c
+++ b/arch/arm64/kernel/module.c
@@ -98,10 +98,10 @@ static int reloc_data(enum aarch64_reloc_op op, void *place, u64 val, int len)
        /*
         * The ELF psABI for AArch64 documents the 16-bit and 32-bit place
-         * relative relocations as having a range of [-2^15, 2^16) or
+         * relative and absolute relocations as having a range of [-2^15, 2^16)
-         * [-2^31, 2^32), respectively. However, in order to be able to detect
+         * or [-2^31, 2^32), respectively. However, in order to be able to
-         * overflows reliably, we have to choose whether we interpret such
+         * detect overflows reliably, we have to choose whether we interpret
-         * quantities as signed or as unsigned, and stick with it.
+         * such quantities as signed or as unsigned, and stick with it.
         * The way we organize our address space requires a signed
         * interpretation of 32-bit relative references, so let's use that
         * for all R_AARCH64_PRELxx relocations. This means our upper
@@ -111,13 +111,35 @@ static int reloc_data(enum aarch64_reloc_op op, void *place, u64 val, int len)
        switch (len) {
        case 16:
                *(s16 *)place = sval;
-                if (sval < S16_MIN || sval > S16_MAX)
+                switch (op) {
-                        return -ERANGE;
+                case RELOC_OP_ABS:
+                        if (sval < 0 || sval > U16_MAX)
+                                return -ERANGE;
+                        break;
+                case RELOC_OP_PREL:
+                        if (sval < S16_MIN || sval > S16_MAX)
+                                return -ERANGE;
+                        break;
+                default:
+                        pr_err("Invalid 16-bit data relocation (%d)\n", op);
+                        return 0;
+                }
                break;
        case 32:
                *(s32 *)place = sval;
-                if (sval < S32_MIN || sval > S32_MAX)
+                switch (op) {
-                        return -ERANGE;
+                case RELOC_OP_ABS:
+                        if (sval < 0 || sval > U32_MAX)
+                                return -ERANGE;
+                        break;
+                case RELOC_OP_PREL:
+                        if (sval < S32_MIN || sval > S32_MAX)
+                                return -ERANGE;
+                        break;
+                default:
+                        pr_err("Invalid 32-bit data relocation (%d)\n", op);
+                        return 0;
+                }
                break;
        case 64:
                *(s64 *)place = sval;
diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c
index 6f91e8116514..fe20c461582a 100644
--- a/arch/arm64/kernel/sys.c
+++ b/arch/arm64/kernel/sys.c
@@ -47,22 +47,26 @@ SYSCALL_DEFINE1(arm64_personality, unsigned int, personality)
        return ksys_personality(personality);
 }
+asmlinkage long sys_ni_syscall(void);
+asmlinkage long __arm64_sys_ni_syscall(const struct pt_regs *__unused)
+{
+        return sys_ni_syscall();
+}
 /*
 * Wrappers to pass the pt_regs argument.
 */
-#define sys_personality         sys_arm64_personality
+#define __arm64_sys_personality         __arm64_sys_arm64_personality
-asmlinkage long sys_ni_syscall(const struct pt_regs *);
-#define __arm64_sys_ni_syscall  sys_ni_syscall
 #undef __SYSCALL
 #define __SYSCALL(nr, sym)      asmlinkage long __arm64_##sym(const struct pt_regs *);
 #include <asm/unistd.h>
 #undef __SYSCALL
-#define __SYSCALL(nr, sym)      [nr] = (syscall_fn_t)__arm64_##sym,
+#define __SYSCALL(nr, sym)      [nr] = __arm64_##sym,
 const syscall_fn_t sys_call_table[__NR_syscalls] = {
-        [0 ... __NR_syscalls - 1] = (syscall_fn_t)sys_ni_syscall,
+        [0 ... __NR_syscalls - 1] = __arm64_sys_ni_syscall,
 #include <asm/unistd.h>
 };
diff --git a/arch/arm64/kernel/sys32.c b/arch/arm64/kernel/sys32.c
index 0f8bcb7de700..3c80a40c1c9d 100644
--- a/arch/arm64/kernel/sys32.c
+++ b/arch/arm64/kernel/sys32.c
@@ -133,17 +133,14 @@ COMPAT_SYSCALL_DEFINE6(aarch32_fallocate, int, fd, int, mode,
        return ksys_fallocate(fd, mode, arg_u64(offset), arg_u64(len));
 }
-asmlinkage long sys_ni_syscall(const struct pt_regs *);
-#define __arm64_sys_ni_syscall  sys_ni_syscall
 #undef __SYSCALL
 #define __SYSCALL(nr, sym)      asmlinkage long __arm64_##sym(const struct pt_regs *);
 #include <asm/unistd32.h>
 #undef __SYSCALL
-#define __SYSCALL(nr, sym)      [nr] = (syscall_fn_t)__arm64_##sym,
+#define __SYSCALL(nr, sym)      [nr] = __arm64_##sym,
 const syscall_fn_t compat_sys_call_table[__NR_compat_syscalls] = {
-        [0 ... __NR_compat_syscalls - 1] = (syscall_fn_t)sys_ni_syscall,
+        [0 ... __NR_compat_syscalls - 1] = __arm64_sys_ni_syscall,
 #include <asm/unistd32.h>
 };
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index e6be1a6efc0a..177c0f6ebabf 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -252,7 +252,10 @@ void arm64_force_sig_fault(int signo, int code, void __user *addr,
                           const char *str)
 {
        arm64_show_signal(signo, str);
-        force_sig_fault(signo, code, addr, current);
+        if (signo == SIGKILL)
+                force_sig(SIGKILL, current);
+        else
+                force_sig_fault(signo, code, addr, current);
 }
 void arm64_force_sig_mceerr(int code, void __user *addr, short lsb,
diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c
index a03803506b0c..5e1015eb6d0d 100644
--- a/arch/ia64/mm/numa.c
+++ b/arch/ia64/mm/numa.c
@@ -55,6 +55,7 @@ paddr_to_nid(unsigned long paddr)
        return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0);
 }
+EXPORT_SYMBOL(paddr_to_nid);
 #if defined(CONFIG_SPARSEMEM) && defined(CONFIG_NUMA)
 /*
diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c
index 1ef8438e3d6d..122a81ab8e48 100644
--- a/drivers/clk/imx/clk-imx8mm.c
+++ b/drivers/clk/imx/clk-imx8mm.c
@@ -449,12 +449,12 @@ static int __init imx8mm_clocks_init(struct device_node *ccm_node)
        clks[IMX8MM_AUDIO_PLL2_OUT] = imx_clk_gate("audio_pll2_out", "audio_pll2_bypass", base + 0x14, 13);
        clks[IMX8MM_VIDEO_PLL1_OUT] = imx_clk_gate("video_pll1_out", "video_pll1_bypass", base + 0x28, 13);
        clks[IMX8MM_DRAM_PLL_OUT] = imx_clk_gate("dram_pll_out", "dram_pll_bypass", base + 0x50, 13);
-        clks[IMX8MM_GPU_PLL_OUT] = imx_clk_gate("gpu_pll_out", "gpu_pll_bypass", base + 0x64, 13);
+        clks[IMX8MM_GPU_PLL_OUT] = imx_clk_gate("gpu_pll_out", "gpu_pll_bypass", base + 0x64, 11);
-        clks[IMX8MM_VPU_PLL_OUT] = imx_clk_gate("vpu_pll_out", "vpu_pll_bypass", base + 0x74, 13);
+        clks[IMX8MM_VPU_PLL_OUT] = imx_clk_gate("vpu_pll_out", "vpu_pll_bypass", base + 0x74, 11);
-        clks[IMX8MM_ARM_PLL_OUT] = imx_clk_gate("arm_pll_out", "arm_pll_bypass", base + 0x84, 13);
+        clks[IMX8MM_ARM_PLL_OUT] = imx_clk_gate("arm_pll_out", "arm_pll_bypass", base + 0x84, 11);
-        clks[IMX8MM_SYS_PLL1_OUT] = imx_clk_gate("sys_pll1_out", "sys_pll1_bypass", base + 0x94, 13);
+        clks[IMX8MM_SYS_PLL1_OUT] = imx_clk_gate("sys_pll1_out", "sys_pll1_bypass", base + 0x94, 11);
-        clks[IMX8MM_SYS_PLL2_OUT] = imx_clk_gate("sys_pll2_out", "sys_pll2_bypass", base + 0x104, 13);
+        clks[IMX8MM_SYS_PLL2_OUT] = imx_clk_gate("sys_pll2_out", "sys_pll2_bypass", base + 0x104, 11);
-        clks[IMX8MM_SYS_PLL3_OUT] = imx_clk_gate("sys_pll3_out", "sys_pll3_bypass", base + 0x114, 13);
+        clks[IMX8MM_SYS_PLL3_OUT] = imx_clk_gate("sys_pll3_out", "sys_pll3_bypass", base + 0x114, 11);
        /* SYS PLL fixed output */
        clks[IMX8MM_SYS_PLL1_40M] = imx_clk_fixed_factor("sys_pll1_40m", "sys_pll1_out", 1, 20);
diff --git a/drivers/clk/sifive/Kconfig b/drivers/clk/sifive/Kconfig
index 8db4a3eb4782..f3b4eb9cb0f5 100644
--- a/drivers/clk/sifive/Kconfig
+++ b/drivers/clk/sifive/Kconfig
@@ -2,6 +2,7 @@
 menuconfig CLK_SIFIVE
        bool "SiFive SoC driver support"
+        depends on RISCV || COMPILE_TEST
        help
          SoC drivers for SiFive Linux-capable SoCs.
diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c
index 96d65a1cf7be..8e834317c97d 100644
--- a/drivers/clk/ti/clkctrl.c
+++ b/drivers/clk/ti/clkctrl.c
@@ -137,9 +137,6 @@ static int _omap4_clkctrl_clk_enable(struct clk_hw *hw)
        int ret;
        union omap4_timeout timeout = { 0 };
-        if (!clk->enable_bit)
-                return 0;
        if (clk->clkdm) {
                ret = ti_clk_ll_ops->clkdm_clk_enable(clk->clkdm, hw->clk);
                if (ret) {
@@ -151,6 +148,9 @@ static int _omap4_clkctrl_clk_enable(struct clk_hw *hw)
                }
        }
+        if (!clk->enable_bit)
+                return 0;
        val = ti_clk_ll_ops->clk_readl(&clk->enable_reg);
        val &= ~OMAP4_MODULEMODE_MASK;
@@ -179,7 +179,7 @@ static void _omap4_clkctrl_clk_disable(struct clk_hw *hw)
        union omap4_timeout timeout = { 0 };
        if (!clk->enable_bit)
-                return;
+                goto exit;
        val = ti_clk_ll_ops->clk_readl(&clk->enable_reg);
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index be832eb73627..acd40eb51c46 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -823,6 +823,7 @@ config GPIO_ADP5588
 config GPIO_ADP5588_IRQ
        bool "Interrupt controller support for ADP5588"
        depends on GPIO_ADP5588=y
+        select GPIOLIB_IRQCHIP
        help
          Say yes here to enable the adp5588 to be used as an interrupt
          controller. It requires the driver to be built in the kernel.
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 3b7370d914a5..72837b8c7031 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -624,9 +624,8 @@ static bool gmc_v9_0_keep_stolen_memory(struct amdgpu_device *adev)
         */
        switch (adev->asic_type) {
        case CHIP_VEGA10:
-                return true;
        case CHIP_RAVEN:
-                return (adev->pdev->device == 0x15d8);
+                return true;
        case CHIP_VEGA12:
        case CHIP_VEGA20:
        default:
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 995f9df66142..bcb1a93c0b4c 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -29,6 +29,7 @@
 #include "dm_services_types.h"
 #include "dc.h"
 #include "dc/inc/core_types.h"
+#include "dal_asic_id.h"
 #include "vid.h"
 #include "amdgpu.h"
@@ -640,7 +641,7 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev)
 static int load_dmcu_fw(struct amdgpu_device *adev)
 {
-        const char *fw_name_dmcu;
+        const char *fw_name_dmcu = NULL;
        int r;
        const struct dmcu_firmware_header_v1_0 *hdr;
@@ -663,7 +664,14 @@ static int load_dmcu_fw(struct amdgpu_device *adev)
        case CHIP_VEGA20:
                return 0;
        case CHIP_RAVEN:
-                fw_name_dmcu = FIRMWARE_RAVEN_DMCU;
+#if defined(CONFIG_DRM_AMD_DC_DCN1_01)
+                if (ASICREV_IS_PICASSO(adev->external_rev_id))
+                        fw_name_dmcu = FIRMWARE_RAVEN_DMCU;
+                else if (ASICREV_IS_RAVEN2(adev->external_rev_id))
+                        fw_name_dmcu = FIRMWARE_RAVEN_DMCU;
+                else
+#endif
+                        return 0;
                break;
        default:
                DRM_ERROR("Unsupported ASIC type: 0x%X\n", adev->asic_type);
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_dump.c b/drivers/gpu/drm/etnaviv/etnaviv_dump.c
index 33854c94cb85..515515ef24f9 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_dump.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_dump.c
@@ -125,6 +125,8 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)
                return;
        etnaviv_dump_core = false;
+        mutex_lock(&gpu->mmu->lock);
        mmu_size = etnaviv_iommu_dump_size(gpu->mmu);
        /* We always dump registers, mmu, ring and end marker */
@@ -167,6 +169,7 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)
        iter.start = __vmalloc(file_size, GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY,
                               PAGE_KERNEL);
        if (!iter.start) {
+                mutex_unlock(&gpu->mmu->lock);
                dev_warn(gpu->dev, "failed to allocate devcoredump file\n");
                return;
        }
@@ -234,6 +237,8 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)
                                         obj->base.size);
        }
+        mutex_unlock(&gpu->mmu->lock);
        etnaviv_core_dump_header(&iter, ETDUMP_BUF_END, iter.data);
        dev_coredumpv(gpu->dev, iter.start, iter.data - iter.start, GFP_KERNEL);
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index b74824f0b5b1..249d35c12a75 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -35,7 +35,7 @@
 * macros. Do **not** mass change existing definitions just to update the style.
 *
 * Layout
- * ''''''
+ * ~~~~~~
 *
 * Keep helper macros near the top. For example, _PIPE() and friends.
 *
@@ -79,7 +79,7 @@
 * style. Use lower case in hexadecimal values.
 *
 * Naming
- * ''''''
+ * ~~~~~~
 *
 * Try to name registers according to the specs. If the register name changes in
 * the specs from platform to another, stick to the original name.
@@ -97,7 +97,7 @@
 * suffix to the name. For example, ``_SKL`` or ``_GEN8``.
 *
 * Examples
- * ''''''''
+ * ~~~~~~~~
 *
 * (Note that the values in the example are indented using spaces instead of
 * TABs to avoid misalignment in generated documentation. Use TABs in the
diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
index 9682dd575152..6decd432f4d3 100644
--- a/drivers/gpu/drm/i915/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/intel_workarounds.c
@@ -37,7 +37,7 @@
 *    costly and simplifies things. We can revisit this in the future.
 *
 * Layout
- * ''''''
+ * ~~~~~~
 *
 * Keep things in this file ordered by WA type, as per the above (context, GT,
 * display, register whitelist, batchbuffer). Then, inside each type, keep the
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
index d7a727a6e3d7..91edfe2498a6 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3-plane.c
@@ -605,7 +605,6 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
                active = ipu_idmac_get_current_buffer(ipu_plane->ipu_ch);
                ipu_cpmem_set_buffer(ipu_plane->ipu_ch, !active, eba);
                ipu_idmac_select_buffer(ipu_plane->ipu_ch, !active);
-                ipu_plane->next_buf = !active;
                if (ipu_plane_separate_alpha(ipu_plane)) {
                        active = ipu_idmac_get_current_buffer(ipu_plane->alpha_ch);
                        ipu_cpmem_set_buffer(ipu_plane->alpha_ch, !active,
@@ -710,7 +709,6 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
        ipu_cpmem_set_buffer(ipu_plane->ipu_ch, 1, eba);
        ipu_idmac_lock_enable(ipu_plane->ipu_ch, num_bursts);
        ipu_plane_enable(ipu_plane);
-        ipu_plane->next_buf = -1;
 }
 static const struct drm_plane_helper_funcs ipu_plane_helper_funcs = {
@@ -732,10 +730,15 @@ bool ipu_plane_atomic_update_pending(struct drm_plane *plane)
        if (ipu_state->use_pre)
                return ipu_prg_channel_configure_pending(ipu_plane->ipu_ch);
-        else if (ipu_plane->next_buf >= 0)
-                return ipu_idmac_get_current_buffer(ipu_plane->ipu_ch) !=
-                       ipu_plane->next_buf;
+        /*
+         * Pretend no update is pending in the non-PRE/PRG case. For this to
+         * happen, an atomic update would have to be deferred until after the
+         * start of the next frame and simultaneously interrupt latency would
+         * have to be high enough to let the atomic update finish and issue an
+         * event before the previous end of frame interrupt handler can be
+         * executed.
+         */
        return false;
 }
 int ipu_planes_assign_pre(struct drm_device *dev,
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.h b/drivers/gpu/drm/imx/ipuv3-plane.h
index 15e85e15d35c..ffacbcdd2f98 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.h
+++ b/drivers/gpu/drm/imx/ipuv3-plane.h
@@ -27,7 +27,6 @@ struct ipu_plane {
        int                     dp_flow;
        bool                    disabling;
-        int                     next_buf;
 };
 struct ipu_plane *ipu_plane_init(struct drm_device *dev, struct ipu_soc *ipu,
diff --git a/drivers/gpu/drm/qxl/qxl_prime.c b/drivers/gpu/drm/qxl/qxl_prime.c
index 114653b471c6..7d3816fca5a8 100644
--- a/drivers/gpu/drm/qxl/qxl_prime.c
+++ b/drivers/gpu/drm/qxl/qxl_prime.c
@@ -77,6 +77,5 @@ void qxl_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)
 int qxl_gem_prime_mmap(struct drm_gem_object *obj,
                       struct vm_area_struct *area)
 {
-        WARN_ONCE(1, "not implemented");
        return -ENOSYS;
 }
diff --git a/drivers/iio/adc/npcm_adc.c b/drivers/iio/adc/npcm_adc.c
index 9e25bbec9c70..193b3b81de4d 100644
--- a/drivers/iio/adc/npcm_adc.c
+++ b/drivers/iio/adc/npcm_adc.c
@@ -149,7 +149,7 @@ static int npcm_adc_read_raw(struct iio_dev *indio_dev,
                }
                return IIO_VAL_INT;
        case IIO_CHAN_INFO_SCALE:
-                if (info->vref) {
+                if (!IS_ERR(info->vref)) {
                        vref_uv = regulator_get_voltage(info->vref);
                        *val = vref_uv / 1000;
                } else {
diff --git a/drivers/iio/adc/ti-ads124s08.c b/drivers/iio/adc/ti-ads124s08.c
index 53f17e4f2f23..552c2be8d87a 100644
--- a/drivers/iio/adc/ti-ads124s08.c
+++ b/drivers/iio/adc/ti-ads124s08.c
@@ -202,7 +202,7 @@ static int ads124s_read(struct iio_dev *indio_dev, unsigned int chan)
        };
        priv->data[0] = ADS124S08_CMD_RDATA;
-        memset(&priv->data[1], ADS124S08_CMD_NOP, sizeof(priv->data));
+        memset(&priv->data[1], ADS124S08_CMD_NOP, sizeof(priv->data) - 1);
        ret = spi_sync_transfer(priv->spi, t, ARRAY_SIZE(t));
        if (ret < 0)
diff --git a/drivers/iio/adc/ti-ads8688.c b/drivers/iio/adc/ti-ads8688.c
index f9461070a74a..8cb7a2034982 100644
--- a/drivers/iio/adc/ti-ads8688.c
+++ b/drivers/iio/adc/ti-ads8688.c
@@ -397,7 +397,7 @@ static irqreturn_t ads8688_trigger_handler(int irq, void *p)
        }
        iio_push_to_buffers_with_timestamp(indio_dev, buffer,
-                        pf->timestamp);
+                        iio_get_time_ns(indio_dev));
        iio_trigger_notify_done(indio_dev->trig);
diff --git a/drivers/iio/dac/ds4424.c b/drivers/iio/dac/ds4424.c
index 883a47562055..714a97f91319 100644
--- a/drivers/iio/dac/ds4424.c
+++ b/drivers/iio/dac/ds4424.c
@@ -166,7 +166,7 @@ static int ds4424_verify_chip(struct iio_dev *indio_dev)
 {
        int ret, val;
-        ret = ds4424_get_value(indio_dev, &val, DS4424_DAC_ADDR(0));
+        ret = ds4424_get_value(indio_dev, &val, 0);
        if (ret < 0)
                dev_err(&indio_dev->dev,
                                "%s failed. ret: %d\n", __func__, ret);
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
index 6138a6d86afb..c2916d2d552c 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -471,7 +471,10 @@ inv_mpu6050_read_raw(struct iio_dev *indio_dev,
                        return IIO_VAL_INT_PLUS_MICRO;
                case IIO_TEMP:
                        *val = 0;
-                        *val2 = INV_MPU6050_TEMP_SCALE;
+                        if (st->chip_type == INV_ICM20602)
+                                *val2 = INV_ICM20602_TEMP_SCALE;
+                        else
+                                *val2 = INV_MPU6050_TEMP_SCALE;
                        return IIO_VAL_INT_PLUS_MICRO;
                default:
@@ -480,7 +483,10 @@ inv_mpu6050_read_raw(struct iio_dev *indio_dev,
        case IIO_CHAN_INFO_OFFSET:
                switch (chan->type) {
                case IIO_TEMP:
-                        *val = INV_MPU6050_TEMP_OFFSET;
+                        if (st->chip_type == INV_ICM20602)
+                                *val = INV_ICM20602_TEMP_OFFSET;
+                        else
+                                *val = INV_MPU6050_TEMP_OFFSET;
                        return IIO_VAL_INT;
                default:
@@ -847,6 +853,32 @@ static const struct iio_chan_spec inv_mpu_channels[] = {
        INV_MPU6050_CHAN(IIO_ACCEL, IIO_MOD_Z, INV_MPU6050_SCAN_ACCL_Z),
 };
+static const struct iio_chan_spec inv_icm20602_channels[] = {
+        IIO_CHAN_SOFT_TIMESTAMP(INV_ICM20602_SCAN_TIMESTAMP),
+        {
+                .type = IIO_TEMP,
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW)
+                                | BIT(IIO_CHAN_INFO_OFFSET)
+                                | BIT(IIO_CHAN_INFO_SCALE),
+                .scan_index = INV_ICM20602_SCAN_TEMP,
+                .scan_type = {
+                                .sign = 's',
+                                .realbits = 16,
+                                .storagebits = 16,
+                                .shift = 0,
+                                .endianness = IIO_BE,
+                             },
+        },
+        INV_MPU6050_CHAN(IIO_ANGL_VEL, IIO_MOD_X, INV_ICM20602_SCAN_GYRO_X),
+        INV_MPU6050_CHAN(IIO_ANGL_VEL, IIO_MOD_Y, INV_ICM20602_SCAN_GYRO_Y),
+        INV_MPU6050_CHAN(IIO_ANGL_VEL, IIO_MOD_Z, INV_ICM20602_SCAN_GYRO_Z),
+        INV_MPU6050_CHAN(IIO_ACCEL, IIO_MOD_Y, INV_ICM20602_SCAN_ACCL_Y),
+        INV_MPU6050_CHAN(IIO_ACCEL, IIO_MOD_X, INV_ICM20602_SCAN_ACCL_X),
+        INV_MPU6050_CHAN(IIO_ACCEL, IIO_MOD_Z, INV_ICM20602_SCAN_ACCL_Z),
+};
 /*
 * The user can choose any frequency between INV_MPU6050_MIN_FIFO_RATE and
 * INV_MPU6050_MAX_FIFO_RATE, but only these frequencies are matched by the
@@ -1102,8 +1134,14 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name,
                indio_dev->name = name;
        else
                indio_dev->name = dev_name(dev);
-        indio_dev->channels = inv_mpu_channels;
-        indio_dev->num_channels = ARRAY_SIZE(inv_mpu_channels);
+        if (chip_type == INV_ICM20602) {
+                indio_dev->channels = inv_icm20602_channels;
+                indio_dev->num_channels = ARRAY_SIZE(inv_icm20602_channels);
+        } else {
+                indio_dev->channels = inv_mpu_channels;
+                indio_dev->num_channels = ARRAY_SIZE(inv_mpu_channels);
+        }
        indio_dev->info = &mpu_info;
        indio_dev->modes = INDIO_BUFFER_TRIGGERED;
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h b/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h
index 325afd9f5f61..3d5fe4474378 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h
@@ -208,6 +208,9 @@ struct inv_mpu6050_state {
 #define INV_MPU6050_BYTES_PER_3AXIS_SENSOR   6
 #define INV_MPU6050_FIFO_COUNT_BYTE          2
+/* ICM20602 FIFO samples include temperature readings */
+#define INV_ICM20602_BYTES_PER_TEMP_SENSOR   2
 /* mpu6500 registers */
 #define INV_MPU6500_REG_ACCEL_CONFIG_2      0x1D
 #define INV_MPU6500_REG_ACCEL_OFFSET        0x77
@@ -229,6 +232,9 @@ struct inv_mpu6050_state {
 #define INV_MPU6050_GYRO_CONFIG_FSR_SHIFT    3
 #define INV_MPU6050_ACCL_CONFIG_FSR_SHIFT    3
+#define INV_ICM20602_TEMP_OFFSET             8170
+#define INV_ICM20602_TEMP_SCALE              3060
 /* 6 + 6 round up and plus 8 */
 #define INV_MPU6050_OUTPUT_DATA_SIZE         24
@@ -270,7 +276,7 @@ struct inv_mpu6050_state {
 #define INV_ICM20608_WHOAMI_VALUE               0xAF
 #define INV_ICM20602_WHOAMI_VALUE               0x12
-/* scan element definition */
+/* scan element definition for generic MPU6xxx devices */
 enum inv_mpu6050_scan {
        INV_MPU6050_SCAN_ACCL_X,
        INV_MPU6050_SCAN_ACCL_Y,
@@ -281,6 +287,18 @@ enum inv_mpu6050_scan {
        INV_MPU6050_SCAN_TIMESTAMP,
 };
+/* scan element definition for ICM20602, which includes temperature */
+enum inv_icm20602_scan {
+        INV_ICM20602_SCAN_ACCL_X,
+        INV_ICM20602_SCAN_ACCL_Y,
+        INV_ICM20602_SCAN_ACCL_Z,
+        INV_ICM20602_SCAN_TEMP,
+        INV_ICM20602_SCAN_GYRO_X,
+        INV_ICM20602_SCAN_GYRO_Y,
+        INV_ICM20602_SCAN_GYRO_Z,
+        INV_ICM20602_SCAN_TIMESTAMP,
+};
 enum inv_mpu6050_filter_e {
        INV_MPU6050_FILTER_256HZ_NOLPF2 = 0,
        INV_MPU6050_FILTER_188HZ,
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
index 548e042f7b5b..57bd11bde56b 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
@@ -207,6 +207,9 @@ irqreturn_t inv_mpu6050_read_fifo(int irq, void *p)
        if (st->chip_config.gyro_fifo_enable)
                bytes_per_datum += INV_MPU6050_BYTES_PER_3AXIS_SENSOR;
+        if (st->chip_type == INV_ICM20602)
+                bytes_per_datum += INV_ICM20602_BYTES_PER_TEMP_SENSOR;
        /*
         * read fifo_count register to know how many bytes are inside the FIFO
         * right now
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
index d4b6f01a3f0e..6d2088fbaf69 100644
--- a/drivers/isdn/mISDN/dsp_cmx.c
+++ b/drivers/isdn/mISDN/dsp_cmx.c
@@ -1676,9 +1676,9 @@ dsp_cmx_send(void *arg)
 #ifdef CMX_CONF_DEBUG
                        if (conf->software && members > 1)
 #else
-                                if (conf->software && members > 2)
+                        if (conf->software && members > 2)
 #endif
-                                        mustmix = 1;
+                                mustmix = 1;
                }
                /* transmission required */
@@ -1699,263 +1699,262 @@ dsp_cmx_send(void *arg)
 #ifdef CMX_CONF_DEBUG
                if (conf->software && members > 1) {
 #else
-                        if (conf->software && members > 2) {
+                if (conf->software && members > 2) {
 #endif
-                                /* check for hdlc conf */
+                        /* check for hdlc conf */
-                                member = list_entry(conf->mlist.next,
+                        member = list_entry(conf->mlist.next,
-                                                    struct dsp_conf_member, list);
+                                            struct dsp_conf_member, list);
-                                if (member->dsp->hdlc)
+                        if (member->dsp->hdlc)
-                                        continue;
+                                continue;
-                                /* mix all data */
+                        /* mix all data */
-                                memset(mixbuffer, 0, length * sizeof(s32));
+                        memset(mixbuffer, 0, length * sizeof(s32));
-                                list_for_each_entry(member, &conf->mlist, list) {
+                        list_for_each_entry(member, &conf->mlist, list) {
-                                        dsp = member->dsp;
+                                dsp = member->dsp;
-                                        /* get range of data to mix */
+                                /* get range of data to mix */
-                                        c = mixbuffer;
+                                c = mixbuffer;
-                                        q = dsp->rx_buff;
+                                q = dsp->rx_buff;
-                                        r = dsp->rx_R;
+                                r = dsp->rx_R;
-                                        rr = (r + length) & CMX_BUFF_MASK;
+                                rr = (r + length) & CMX_BUFF_MASK;
-                                        /* add member's data */
+                                /* add member's data */
-                                        while (r != rr) {
+                                while (r != rr) {
-                                                *c++ += dsp_audio_law_to_s32[q[r]];
+                                        *c++ += dsp_audio_law_to_s32[q[r]];
-                                                r = (r + 1) & CMX_BUFF_MASK;
+                                        r = (r + 1) & CMX_BUFF_MASK;
-                                        }
                                }
+                        }
-                                /* process each member */
+                        /* process each member */
-                                list_for_each_entry(member, &conf->mlist, list) {
+                        list_for_each_entry(member, &conf->mlist, list) {
-                                        /* transmission */
+                                /* transmission */
-                                        dsp_cmx_send_member(member->dsp, length,
+                                dsp_cmx_send_member(member->dsp, length,
-                                                            mixbuffer, members);
+                                                    mixbuffer, members);
-                                }
+                        }
+                }
+        }
+        /* delete rx-data, increment buffers, change pointers */
+        list_for_each_entry(dsp, &dsp_ilist, list) {
+                if (dsp->hdlc)
+                        continue;
+                p = dsp->rx_buff;
+                q = dsp->tx_buff;
+                r = dsp->rx_R;
+                /* move receive pointer when receiving */
+                if (!dsp->rx_is_off) {
+                        rr = (r + length) & CMX_BUFF_MASK;
+                        /* delete rx-data */
+                        while (r != rr) {
+                                p[r] = dsp_silence;
+                                r = (r + 1) & CMX_BUFF_MASK;
                        }
+                        /* increment rx-buffer pointer */
+                        dsp->rx_R = r; /* write incremented read pointer */
                }
-                /* delete rx-data, increment buffers, change pointers */
+                /* check current rx_delay */
-                list_for_each_entry(dsp, &dsp_ilist, list) {
+                delay = (dsp->rx_W-dsp->rx_R) & CMX_BUFF_MASK;
-                        if (dsp->hdlc)
+                if (delay >= CMX_BUFF_HALF)
-                                continue;
+                        delay = 0; /* will be the delay before next write */
-                        p = dsp->rx_buff;
+                /* check for lower delay */
-                        q = dsp->tx_buff;
+                if (delay < dsp->rx_delay[0])
-                        r = dsp->rx_R;
+                        dsp->rx_delay[0] = delay;
-                        /* move receive pointer when receiving */
+                /* check current tx_delay */
-                        if (!dsp->rx_is_off) {
+                delay = (dsp->tx_W-dsp->tx_R) & CMX_BUFF_MASK;
-                                rr = (r + length) & CMX_BUFF_MASK;
+                if (delay >= CMX_BUFF_HALF)
+                        delay = 0; /* will be the delay before next write */
+                /* check for lower delay */
+                if (delay < dsp->tx_delay[0])
+                        dsp->tx_delay[0] = delay;
+                if (jittercheck) {
+                        /* find the lowest of all rx_delays */
+                        delay = dsp->rx_delay[0];
+                        i = 1;
+                        while (i < MAX_SECONDS_JITTER_CHECK) {
+                                if (delay > dsp->rx_delay[i])
+                                        delay = dsp->rx_delay[i];
+                                i++;
+                        }
+                        /*
+                         * remove rx_delay only if we have delay AND we
+                         * have not preset cmx_delay AND
+                         * the delay is greater dsp_poll
+                         */
+                        if (delay > dsp_poll && !dsp->cmx_delay) {
+                                if (dsp_debug & DEBUG_DSP_CLOCK)
+                                        printk(KERN_DEBUG
+                                               "%s lowest rx_delay of %d bytes for"
+                                               " dsp %s are now removed.\n",
+                                               __func__, delay,
+                                               dsp->name);
+                                r = dsp->rx_R;
+                                rr = (r + delay - (dsp_poll >> 1))
+                                        & CMX_BUFF_MASK;
                                /* delete rx-data */
                                while (r != rr) {
                                        p[r] = dsp_silence;
                                        r = (r + 1) & CMX_BUFF_MASK;
                                }
                                /* increment rx-buffer pointer */
-                                dsp->rx_R = r; /* write incremented read pointer */
+                                dsp->rx_R = r;
+                                /* write incremented read pointer */
                        }
+                        /* find the lowest of all tx_delays */
-                        /* check current rx_delay */
+                        delay = dsp->tx_delay[0];
-                        delay = (dsp->rx_W-dsp->rx_R) & CMX_BUFF_MASK;
+                        i = 1;
-                        if (delay >= CMX_BUFF_HALF)
+                        while (i < MAX_SECONDS_JITTER_CHECK) {
-                                delay = 0; /* will be the delay before next write */
+                                if (delay > dsp->tx_delay[i])
-                        /* check for lower delay */
+                                        delay = dsp->tx_delay[i];
-                        if (delay < dsp->rx_delay[0])
+                                i++;
-                                dsp->rx_delay[0] = delay;
+                        }
-                        /* check current tx_delay */
+                        /*
-                        delay = (dsp->tx_W-dsp->tx_R) & CMX_BUFF_MASK;
+                         * remove delay only if we have delay AND we
-                        if (delay >= CMX_BUFF_HALF)
+                         * have enabled tx_dejitter
-                                delay = 0; /* will be the delay before next write */
+                         */
-                        /* check for lower delay */
+                        if (delay > dsp_poll && dsp->tx_dejitter) {
-                        if (delay < dsp->tx_delay[0])
+                                if (dsp_debug & DEBUG_DSP_CLOCK)
-                                dsp->tx_delay[0] = delay;
+                                        printk(KERN_DEBUG
-                        if (jittercheck) {
+                                               "%s lowest tx_delay of %d bytes for"
-                                /* find the lowest of all rx_delays */
+                                               " dsp %s are now removed.\n",
-                                delay = dsp->rx_delay[0];
+                                               __func__, delay,
-                                i = 1;
+                                               dsp->name);
-                                while (i < MAX_SECONDS_JITTER_CHECK) {
+                                r = dsp->tx_R;
-                                        if (delay > dsp->rx_delay[i])
+                                rr = (r + delay - (dsp_poll >> 1))
-                                                delay = dsp->rx_delay[i];
+                                        & CMX_BUFF_MASK;
-                                        i++;
+                                /* delete tx-data */
-                                }
+                                while (r != rr) {
-                                /*
+                                        q[r] = dsp_silence;
-                                 * remove rx_delay only if we have delay AND we
+                                        r = (r + 1) & CMX_BUFF_MASK;
-                                 * have not preset cmx_delay AND
-                                 * the delay is greater dsp_poll
-                                 */
-                                if (delay > dsp_poll && !dsp->cmx_delay) {
-                                        if (dsp_debug & DEBUG_DSP_CLOCK)
-                                                printk(KERN_DEBUG
-                                                       "%s lowest rx_delay of %d bytes for"
-                                                       " dsp %s are now removed.\n",
-                                                       __func__, delay,
-                                                       dsp->name);
-                                        r = dsp->rx_R;
-                                        rr = (r + delay - (dsp_poll >> 1))
-                                                & CMX_BUFF_MASK;
-                                        /* delete rx-data */
-                                        while (r != rr) {
-                                                p[r] = dsp_silence;
-                                                r = (r + 1) & CMX_BUFF_MASK;
-                                        }
-                                        /* increment rx-buffer pointer */
-                                        dsp->rx_R = r;
-                                        /* write incremented read pointer */
-                                }
-                                /* find the lowest of all tx_delays */
-                                delay = dsp->tx_delay[0];
-                                i = 1;
-                                while (i < MAX_SECONDS_JITTER_CHECK) {
-                                        if (delay > dsp->tx_delay[i])
-                                                delay = dsp->tx_delay[i];
-                                        i++;
-                                }
-                                /*
-                                 * remove delay only if we have delay AND we
-                                 * have enabled tx_dejitter
-                                 */
-                                if (delay > dsp_poll && dsp->tx_dejitter) {
-                                        if (dsp_debug & DEBUG_DSP_CLOCK)
-                                                printk(KERN_DEBUG
-                                                       "%s lowest tx_delay of %d bytes for"
-                                                       " dsp %s are now removed.\n",
-                                                       __func__, delay,
-                                                       dsp->name);
-                                        r = dsp->tx_R;
-                                        rr = (r + delay - (dsp_poll >> 1))
-                                                & CMX_BUFF_MASK;
-                                        /* delete tx-data */
-                                        while (r != rr) {
-                                                q[r] = dsp_silence;
-                                                r = (r + 1) & CMX_BUFF_MASK;
-                                        }
-                                        /* increment rx-buffer pointer */
-                                        dsp->tx_R = r;
-                                        /* write incremented read pointer */
-                                }
-                                /* scroll up delays */
-                                i = MAX_SECONDS_JITTER_CHECK - 1;
-                                while (i) {
-                                        dsp->rx_delay[i] = dsp->rx_delay[i - 1];
-                                        dsp->tx_delay[i] = dsp->tx_delay[i - 1];
-                                        i--;
                                }
-                                dsp->tx_delay[0] = CMX_BUFF_HALF; /* (infinite) delay */
+                                /* increment rx-buffer pointer */
-                                dsp->rx_delay[0] = CMX_BUFF_HALF; /* (infinite) delay */
+                                dsp->tx_R = r;
+                                /* write incremented read pointer */
                        }
+                        /* scroll up delays */
+                        i = MAX_SECONDS_JITTER_CHECK - 1;
+                        while (i) {
+                                dsp->rx_delay[i] = dsp->rx_delay[i - 1];
+                                dsp->tx_delay[i] = dsp->tx_delay[i - 1];
+                                i--;
+                        }
+                        dsp->tx_delay[0] = CMX_BUFF_HALF; /* (infinite) delay */
+                        dsp->rx_delay[0] = CMX_BUFF_HALF; /* (infinite) delay */
                }
+        }
-                /* if next event would be in the past ... */
+        /* if next event would be in the past ... */
-                if ((s32)(dsp_spl_jiffies + dsp_tics-jiffies) <= 0)
+        if ((s32)(dsp_spl_jiffies + dsp_tics-jiffies) <= 0)
-                        dsp_spl_jiffies = jiffies + 1;
+                dsp_spl_jiffies = jiffies + 1;
-                else
+        else
-                        dsp_spl_jiffies += dsp_tics;
+                dsp_spl_jiffies += dsp_tics;
-                dsp_spl_tl.expires = dsp_spl_jiffies;
+        dsp_spl_tl.expires = dsp_spl_jiffies;
-                add_timer(&dsp_spl_tl);
+        add_timer(&dsp_spl_tl);
-                /* unlock */
+        /* unlock */
-                spin_unlock_irqrestore(&dsp_lock, flags);
+        spin_unlock_irqrestore(&dsp_lock, flags);
-        }
+}
 /*
 * audio data is transmitted from upper layer to the dsp
 */
-        void
+void
-                dsp_cmx_transmit(struct dsp *dsp, struct sk_buff *skb)
+dsp_cmx_transmit(struct dsp *dsp, struct sk_buff *skb)
-        {
+{
-                u_int w, ww;
+        u_int w, ww;
-                u8 *d, *p;
+        u8 *d, *p;
-                int space; /* todo: , l = skb->len; */
+        int space; /* todo: , l = skb->len; */
 #ifdef CMX_TX_DEBUG
-                char debugbuf[256] = "";
+        char debugbuf[256] = "";
 #endif
-                /* check if there is enough space, and then copy */
+        /* check if there is enough space, and then copy */
-                w = dsp->tx_W;
+        w = dsp->tx_W;
-                ww = dsp->tx_R;
+        ww = dsp->tx_R;
-                p = dsp->tx_buff;
+        p = dsp->tx_buff;
-                d = skb->data;
+        d = skb->data;
-                space = (ww - w - 1) & CMX_BUFF_MASK;
+        space = (ww - w - 1) & CMX_BUFF_MASK;
-                /* write-pointer should not overrun nor reach read pointer */
+        /* write-pointer should not overrun nor reach read pointer */
-                if (space < skb->len) {
+        if (space < skb->len) {
-                        /* write to the space we have left */
+                /* write to the space we have left */
-                        ww = (ww - 1) & CMX_BUFF_MASK; /* end one byte prior tx_R */
+                ww = (ww - 1) & CMX_BUFF_MASK; /* end one byte prior tx_R */
-                        if (dsp_debug & DEBUG_DSP_CLOCK)
+                if (dsp_debug & DEBUG_DSP_CLOCK)
-                                printk(KERN_DEBUG "%s: TX overflow space=%d skb->len="
+                        printk(KERN_DEBUG "%s: TX overflow space=%d skb->len="
-                                       "%d, w=0x%04x, ww=0x%04x\n", __func__, space,
+                               "%d, w=0x%04x, ww=0x%04x\n", __func__, space,
-                                       skb->len, w, ww);
+                               skb->len, w, ww);
-                } else
+        } else
-                        /* write until all byte are copied */
+                /* write until all byte are copied */
-                        ww = (w + skb->len) & CMX_BUFF_MASK;
+                ww = (w + skb->len) & CMX_BUFF_MASK;
-                dsp->tx_W = ww;
+        dsp->tx_W = ww;
                /* show current buffer */
 #ifdef CMX_DEBUG
-                printk(KERN_DEBUG
+        printk(KERN_DEBUG
-                       "cmx_transmit(dsp=%lx) %d bytes to 0x%x-0x%x. %s\n",
+               "cmx_transmit(dsp=%lx) %d bytes to 0x%x-0x%x. %s\n",
-                       (u_long)dsp, (ww - w) & CMX_BUFF_MASK, w, ww, dsp->name);
+               (u_long)dsp, (ww - w) & CMX_BUFF_MASK, w, ww, dsp->name);
 #endif
-                /* copy transmit data to tx-buffer */
+        /* copy transmit data to tx-buffer */
 #ifdef CMX_TX_DEBUG
-                sprintf(debugbuf, "TX getting (%04x-%04x)%p: ", w, ww, p);
+        sprintf(debugbuf, "TX getting (%04x-%04x)%p: ", w, ww, p);
 #endif
-                while (w != ww) {
+        while (w != ww) {
 #ifdef CMX_TX_DEBUG
-                        if (strlen(debugbuf) < 48)
+                if (strlen(debugbuf) < 48)
-                                sprintf(debugbuf + strlen(debugbuf), " %02x", *d);
+                        sprintf(debugbuf + strlen(debugbuf), " %02x", *d);
 #endif
-                        p[w] = *d++;
+                p[w] = *d++;
-                        w = (w + 1) & CMX_BUFF_MASK;
+                w = (w + 1) & CMX_BUFF_MASK;
-                }
+        }
 #ifdef CMX_TX_DEBUG
-                printk(KERN_DEBUG "%s\n", debugbuf);
+        printk(KERN_DEBUG "%s\n", debugbuf);
 #endif
-        }
+}
 /*
 * hdlc data is received from card and sent to all members.
 */
-        void
+void
-                dsp_cmx_hdlc(struct dsp *dsp, struct sk_buff *skb)
+dsp_cmx_hdlc(struct dsp *dsp, struct sk_buff *skb)
-        {
+{
-                struct sk_buff *nskb = NULL;
+        struct sk_buff *nskb = NULL;
-                struct dsp_conf_member *member;
+        struct dsp_conf_member *member;
-                struct mISDNhead *hh;
+        struct mISDNhead *hh;
-                /* not if not active */
-                if (!dsp->b_active)
-                        return;
-                /* check if we have sompen */
+        /* not if not active */
-                if (skb->len < 1)
+        if (!dsp->b_active)
-                        return;
+                return;
-                /* no conf */
+        /* check if we have sompen */
-                if (!dsp->conf) {
+        if (skb->len < 1)
-                        /* in case of software echo */
+                return;
-                        if (dsp->echo.software) {
-                                nskb = skb_clone(skb, GFP_ATOMIC);
+        /* no conf */
-                                if (nskb) {
+        if (!dsp->conf) {
-                                        hh = mISDN_HEAD_P(nskb);
+                /* in case of software echo */
-                                        hh->prim = PH_DATA_REQ;
+                if (dsp->echo.software) {
-                                        hh->id = 0;
+                        nskb = skb_clone(skb, GFP_ATOMIC);
-                                        skb_queue_tail(&dsp->sendq, nskb);
+                        if (nskb) {
-                                        schedule_work(&dsp->workq);
+                                hh = mISDN_HEAD_P(nskb);
-                                }
+                                hh->prim = PH_DATA_REQ;
+                                hh->id = 0;
+                                skb_queue_tail(&dsp->sendq, nskb);
+                                schedule_work(&dsp->workq);
                        }
-                        return;
                }
-                /* in case of hardware conference */
+                return;
-                if (dsp->conf->hardware)
+        }
-                        return;
+        /* in case of hardware conference */
-                list_for_each_entry(member, &dsp->conf->mlist, list) {
+        if (dsp->conf->hardware)
-                        if (dsp->echo.software || member->dsp != dsp) {
+                return;
-                                nskb = skb_clone(skb, GFP_ATOMIC);
+        list_for_each_entry(member, &dsp->conf->mlist, list) {
-                                if (nskb) {
+                if (dsp->echo.software || member->dsp != dsp) {
-                                        hh = mISDN_HEAD_P(nskb);
+                        nskb = skb_clone(skb, GFP_ATOMIC);
-                                        hh->prim = PH_DATA_REQ;
+                        if (nskb) {
-                                        hh->id = 0;
+                                hh = mISDN_HEAD_P(nskb);
-                                        skb_queue_tail(&member->dsp->sendq, nskb);
+                                hh->prim = PH_DATA_REQ;
-                                        schedule_work(&member->dsp->workq);
+                                hh->id = 0;
-                                }
+                                skb_queue_tail(&member->dsp->sendq, nskb);
+                                schedule_work(&member->dsp->workq);
                        }
                }
        }
+}
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index dc44ba7bceca..c6ba37df4b9d 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -384,7 +384,7 @@ data_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                        memcpy(di.channelmap, dev->channelmap,
                               sizeof(di.channelmap));
                        di.nrbchan = dev->nrbchan;
-                        strcpy(di.name, dev_name(&dev->dev));
+                        strscpy(di.name, dev_name(&dev->dev), sizeof(di.name));
                        if (copy_to_user((void __user *)arg, &di, sizeof(di)))
                                err = -EFAULT;
                } else
@@ -667,7 +667,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                        memcpy(di.channelmap, dev->channelmap,
                               sizeof(di.channelmap));
                        di.nrbchan = dev->nrbchan;
-                        strcpy(di.name, dev_name(&dev->dev));
+                        strscpy(di.name, dev_name(&dev->dev), sizeof(di.name));
                        if (copy_to_user((void __user *)arg, &di, sizeof(di)))
                                err = -EFAULT;
                } else
@@ -681,6 +681,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                        err = -EFAULT;
                        break;
                }
+                dn.name[sizeof(dn.name) - 1] = '\0';
                dev = get_mdevice(dn.id);
                if (dev)
                        err = device_rename(&dev->dev, dn.name);
diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c
index e13d77bfc222..9ba3a2ae36e5 100644
--- a/drivers/media/usb/siano/smsusb.c
+++ b/drivers/media/usb/siano/smsusb.c
@@ -389,6 +389,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
        struct smsusb_device_t *dev;
        void *mdev;
        int i, rc;
+        int align = 0;
        /* create device object */
        dev = kzalloc(sizeof(struct smsusb_device_t), GFP_KERNEL);
@@ -400,6 +401,24 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
        dev->udev = interface_to_usbdev(intf);
        dev->state = SMSUSB_DISCONNECTED;
+        for (i = 0; i < intf->cur_altsetting->desc.bNumEndpoints; i++) {
+                struct usb_endpoint_descriptor *desc =
+                                &intf->cur_altsetting->endpoint[i].desc;
+                if (desc->bEndpointAddress & USB_DIR_IN) {
+                        dev->in_ep = desc->bEndpointAddress;
+                        align = usb_endpoint_maxp(desc) - sizeof(struct sms_msg_hdr);
+                } else {
+                        dev->out_ep = desc->bEndpointAddress;
+                }
+        }
+        pr_debug("in_ep = %02x, out_ep = %02x\n", dev->in_ep, dev->out_ep);
+        if (!dev->in_ep || !dev->out_ep || align < 0) {  /* Missing endpoints? */
+                smsusb_term_device(intf);
+                return -ENODEV;
+        }
        params.device_type = sms_get_board(board_id)->type;
        switch (params.device_type) {
@@ -414,24 +433,12 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
                /* fall-thru */
        default:
                dev->buffer_size = USB2_BUFFER_SIZE;
-                dev->response_alignment =
+                dev->response_alignment = align;
-                    le16_to_cpu(dev->udev->ep_in[1]->desc.wMaxPacketSize) -
-                    sizeof(struct sms_msg_hdr);
                params.flags |= SMS_DEVICE_FAMILY2;
                break;
        }
-        for (i = 0; i < intf->cur_altsetting->desc.bNumEndpoints; i++) {
-                if (intf->cur_altsetting->endpoint[i].desc. bEndpointAddress & USB_DIR_IN)
-                        dev->in_ep = intf->cur_altsetting->endpoint[i].desc.bEndpointAddress;
-                else
-                        dev->out_ep = intf->cur_altsetting->endpoint[i].desc.bEndpointAddress;
-        }
-        pr_debug("in_ep = %02x, out_ep = %02x\n",
-                dev->in_ep, dev->out_ep);
        params.device = &dev->udev->dev;
        params.usb_device = dev->udev;
        params.buffer_size = dev->buffer_size;
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 062fa7e3af4c..407f4095a37a 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3122,13 +3122,18 @@ static int bond_slave_netdev_event(unsigned long event,
        case NETDEV_CHANGE:
                /* For 802.3ad mode only:
                 * Getting invalid Speed/Duplex values here will put slave
-                 * in weird state. So mark it as link-fail for the time
+                 * in weird state. Mark it as link-fail if the link was
-                 * being and let link-monitoring (miimon) set it right when
+                 * previously up or link-down if it hasn't yet come up, and
-                 * correct speeds/duplex are available.
+                 * let link-monitoring (miimon) set it right when correct
+                 * speeds/duplex are available.
                 */
                if (bond_update_speed_duplex(slave) &&
-                    BOND_MODE(bond) == BOND_MODE_8023AD)
+                    BOND_MODE(bond) == BOND_MODE_8023AD) {
-                        slave->link = BOND_LINK_FAIL;
+                        if (slave->last_link_up)
+                                slave->link = BOND_LINK_FAIL;
+                        else
+                                slave->link = BOND_LINK_DOWN;
+                }
                if (BOND_MODE(bond) == BOND_MODE_8023AD)
                        bond_3ad_adapter_speed_duplex_changed(slave);
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index b4bcbb6461e1..42da3f1bff5b 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -781,7 +781,7 @@ static uint64_t _mv88e6xxx_get_ethtool_stat(struct mv88e6xxx_chip *chip,
                        err = mv88e6xxx_port_read(chip, port, s->reg + 1, &reg);
                        if (err)
                                return U64_MAX;
-                        high = reg;
+                        low |= ((u32)reg) << 16;
                }
                break;
        case STATS_TYPE_BANK1:
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
index 350e385528fd..941b0beb87ef 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
@@ -223,10 +223,10 @@ void aq_ring_queue_stop(struct aq_ring_s *ring)
 bool aq_ring_tx_clean(struct aq_ring_s *self)
 {
        struct device *dev = aq_nic_get_dev(self->aq_nic);
-        unsigned int budget = AQ_CFG_TX_CLEAN_BUDGET;
+        unsigned int budget;
-        for (; self->sw_head != self->hw_head && budget--;
+        for (budget = AQ_CFG_TX_CLEAN_BUDGET;
-                self->sw_head = aq_ring_next_dx(self, self->sw_head)) {
+             budget && self->sw_head != self->hw_head; budget--) {
                struct aq_ring_buff_s *buff = &self->buff_ring[self->sw_head];
                if (likely(buff->is_mapped)) {
@@ -251,6 +251,7 @@ bool aq_ring_tx_clean(struct aq_ring_s *self)
                buff->pa = 0U;
                buff->eop_index = 0xffffU;
+                self->sw_head = aq_ring_next_dx(self, self->sw_head);
        }
        return !!budget;
@@ -298,35 +299,47 @@ int aq_ring_rx_clean(struct aq_ring_s *self,
                unsigned int i = 0U;
                u16 hdr_len;
-                if (buff->is_error)
-                        continue;
                if (buff->is_cleaned)
                        continue;
                if (!buff->is_eop) {
-                        for (next_ = buff->next,
+                        buff_ = buff;
-                             buff_ = &self->buff_ring[next_]; true;
+                        do {
-                             next_ = buff_->next,
+                                next_ = buff_->next,
-                             buff_ = &self->buff_ring[next_]) {
+                                buff_ = &self->buff_ring[next_];
                                is_rsc_completed =
                                        aq_ring_dx_in_range(self->sw_head,
                                                            next_,
                                                            self->hw_head);
-                                if (unlikely(!is_rsc_completed)) {
+                                if (unlikely(!is_rsc_completed))
-                                        is_rsc_completed = false;
                                        break;
-                                }
-                                if (buff_->is_eop)
+                                buff->is_error |= buff_->is_error;
-                                        break;
-                        }
+                        } while (!buff_->is_eop);
                        if (!is_rsc_completed) {
                                err = 0;
                                goto err_exit;
                        }
+                        if (buff->is_error) {
+                                buff_ = buff;
+                                do {
+                                        next_ = buff_->next,
+                                        buff_ = &self->buff_ring[next_];
+                                        buff_->is_cleaned = true;
+                                } while (!buff_->is_eop);
+                                ++self->stats.rx.errors;
+                                continue;
+                        }
+                }
+                if (buff->is_error) {
+                        ++self->stats.rx.errors;
+                        continue;
                }
                dma_sync_single_range_for_cpu(aq_nic_get_dev(self->aq_nic),
@@ -389,6 +402,12 @@ int aq_ring_rx_clean(struct aq_ring_s *self,
                                                        AQ_CFG_RX_FRAME_MAX);
                                        page_ref_inc(buff_->rxdata.page);
                                        buff_->is_cleaned = 1;
+                                        buff->is_ip_cso &= buff_->is_ip_cso;
+                                        buff->is_udp_cso &= buff_->is_udp_cso;
+                                        buff->is_tcp_cso &= buff_->is_tcp_cso;
+                                        buff->is_cso_err |= buff_->is_cso_err;
                                } while (!buff_->is_eop);
                        }
                }
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 bfcda12d73de..5c3065bdfddf 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
@@ -266,12 +266,11 @@ static int hw_atl_b0_hw_offload_set(struct aq_hw_s *self,
                 */
                hw_atl_rpo_lro_max_coalescing_interval_set(self, 50);
                hw_atl_rpo_lro_qsessions_lim_set(self, 1U);
                hw_atl_rpo_lro_total_desc_lim_set(self, 2U);
-                hw_atl_rpo_lro_patch_optimization_en_set(self, 0U);
+                hw_atl_rpo_lro_patch_optimization_en_set(self, 1U);
                hw_atl_rpo_lro_min_pay_of_first_pkt_set(self, 10U);
@@ -713,38 +712,41 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self,
                if ((rx_stat & BIT(0)) || rxd_wb->type & 0x1000U) {
                        /* MAC error or DMA error */
                        buff->is_error = 1U;
-                } else {
+                }
-                        if (self->aq_nic_cfg->is_rss) {
+                if (self->aq_nic_cfg->is_rss) {
-                                /* last 4 byte */
+                        /* last 4 byte */
-                                u16 rss_type = rxd_wb->type & 0xFU;
+                        u16 rss_type = rxd_wb->type & 0xFU;
-                                if (rss_type && rss_type < 0x8U) {
+                        if (rss_type && rss_type < 0x8U) {
-                                        buff->is_hash_l4 = (rss_type == 0x4 ||
+                                buff->is_hash_l4 = (rss_type == 0x4 ||
-                                        rss_type == 0x5);
+                                rss_type == 0x5);
-                                        buff->rss_hash = rxd_wb->rss_hash;
+                                buff->rss_hash = rxd_wb->rss_hash;
-                                }
                        }
+                }
-                        if (HW_ATL_B0_RXD_WB_STAT2_EOP & rxd_wb->status) {
+                if (HW_ATL_B0_RXD_WB_STAT2_EOP & rxd_wb->status) {
-                                buff->len = rxd_wb->pkt_len %
+                        buff->len = rxd_wb->pkt_len %
-                                        AQ_CFG_RX_FRAME_MAX;
+                                AQ_CFG_RX_FRAME_MAX;
-                                buff->len = buff->len ?
+                        buff->len = buff->len ?
-                                        buff->len : AQ_CFG_RX_FRAME_MAX;
+                                buff->len : AQ_CFG_RX_FRAME_MAX;
-                                buff->next = 0U;
+                        buff->next = 0U;
-                                buff->is_eop = 1U;
+                        buff->is_eop = 1U;
+                } else {
+                        buff->len =
+                                rxd_wb->pkt_len > AQ_CFG_RX_FRAME_MAX ?
+                                AQ_CFG_RX_FRAME_MAX : rxd_wb->pkt_len;
+                        if (HW_ATL_B0_RXD_WB_STAT2_RSCCNT &
+                                rxd_wb->status) {
+                                /* LRO */
+                                buff->next = rxd_wb->next_desc_ptr;
+                                ++ring->stats.rx.lro_packets;
                        } else {
-                                if (HW_ATL_B0_RXD_WB_STAT2_RSCCNT &
+                                /* jumbo */
-                                        rxd_wb->status) {
+                                buff->next =
-                                        /* LRO */
+                                        aq_ring_next_dx(ring,
-                                        buff->next = rxd_wb->next_desc_ptr;
+                                                        ring->hw_head);
-                                        ++ring->stats.rx.lro_packets;
+                                ++ring->stats.rx.jumbo_packets;
-                                } else {
-                                        /* jumbo */
-                                        buff->next =
-                                                aq_ring_next_dx(ring,
-                                                                ring->hw_head);
-                                        ++ring->stats.rx.jumbo_packets;
-                                }
                        }
                }
        }
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 8314c00d7537..f758b2e0591f 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -1642,6 +1642,8 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,
                skb = bnxt_copy_skb(bnapi, data_ptr, len, dma_addr);
                bnxt_reuse_rx_data(rxr, cons, data);
                if (!skb) {
+                        if (agg_bufs)
+                                bnxt_reuse_rx_agg_bufs(cpr, cp_cons, agg_bufs);
                        rc = -ENOMEM;
                        goto next_rx;
                }
@@ -6377,7 +6379,7 @@ static int bnxt_alloc_ctx_mem(struct bnxt *bp)
        if (!ctx || (ctx->flags & BNXT_CTX_FLAG_INITED))
                return 0;
-        if (bp->flags & BNXT_FLAG_ROCE_CAP) {
+        if ((bp->flags & BNXT_FLAG_ROCE_CAP) && !is_kdump_kernel()) {
                pg_lvl = 2;
                extra_qps = 65536;
                extra_srqs = 8192;
@@ -7616,22 +7618,23 @@ static void bnxt_clear_int_mode(struct bnxt *bp)
        bp->flags &= ~BNXT_FLAG_USING_MSIX;
 }
-int bnxt_reserve_rings(struct bnxt *bp)
+int bnxt_reserve_rings(struct bnxt *bp, bool irq_re_init)
 {
        int tcs = netdev_get_num_tc(bp->dev);
-        bool reinit_irq = false;
+        bool irq_cleared = false;
        int rc;
        if (!bnxt_need_reserve_rings(bp))
                return 0;
-        if (BNXT_NEW_RM(bp) && (bnxt_get_num_msix(bp) != bp->total_irqs)) {
+        if (irq_re_init && BNXT_NEW_RM(bp) &&
+            bnxt_get_num_msix(bp) != bp->total_irqs) {
                bnxt_ulp_irq_stop(bp);
                bnxt_clear_int_mode(bp);
-                reinit_irq = true;
+                irq_cleared = true;
        }
        rc = __bnxt_reserve_rings(bp);
-        if (reinit_irq) {
+        if (irq_cleared) {
                if (!rc)
                        rc = bnxt_init_int_mode(bp);
                bnxt_ulp_irq_restart(bp, rc);
@@ -8530,7 +8533,7 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)
                        return rc;
                }
        }
-        rc = bnxt_reserve_rings(bp);
+        rc = bnxt_reserve_rings(bp, irq_re_init);
        if (rc)
                return rc;
        if ((bp->flags & BNXT_FLAG_RFS) &&
@@ -10434,7 +10437,7 @@ static int bnxt_set_dflt_rings(struct bnxt *bp, bool sh)
        if (sh)
                bp->flags |= BNXT_FLAG_SHARED_RINGS;
-        dflt_rings = netif_get_num_default_rss_queues();
+        dflt_rings = is_kdump_kernel() ? 1 : netif_get_num_default_rss_queues();
        /* Reduce default rings on multi-port cards so that total default
         * rings do not exceed CPU count.
         */
@@ -10722,11 +10725,12 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto init_err_pci_clean;
        }
-        /* Read the adapter's DSN to use as the eswitch switch_id */
+        if (BNXT_PF(bp)) {
-        rc = bnxt_pcie_dsn_get(bp, bp->switch_id);
+                /* Read the adapter's DSN to use as the eswitch switch_id */
-        if (rc)
+                rc = bnxt_pcie_dsn_get(bp, bp->switch_id);
-                goto init_err_pci_clean;
+                if (rc)
+                        goto init_err_pci_clean;
+        }
        bnxt_hwrm_func_qcfg(bp);
        bnxt_hwrm_vnic_qcaps(bp);
        bnxt_hwrm_port_led_qcaps(bp);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index eca36dd6b751..be438d82f939 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -20,6 +20,7 @@
 #include <linux/interrupt.h>
 #include <linux/rhashtable.h>
+#include <linux/crash_dump.h>
 #include <net/devlink.h>
 #include <net/dst_metadata.h>
 #include <net/xdp.h>
@@ -1369,7 +1370,8 @@ struct bnxt {
 #define BNXT_CHIP_TYPE_NITRO_A0(bp) ((bp)->flags & BNXT_FLAG_CHIP_NITRO_A0)
 #define BNXT_RX_PAGE_MODE(bp)   ((bp)->flags & BNXT_FLAG_RX_PAGE_MODE)
 #define BNXT_SUPPORTS_TPA(bp)   (!BNXT_CHIP_TYPE_NITRO_A0(bp) &&        \
-                                 !(bp->flags & BNXT_FLAG_CHIP_P5))
+                                 !(bp->flags & BNXT_FLAG_CHIP_P5) &&    \
+                                 !is_kdump_kernel())
 /* Chip class phase 5 */
 #define BNXT_CHIP_P5(bp)                        \
@@ -1790,7 +1792,7 @@ unsigned int bnxt_get_avail_stat_ctxs_for_en(struct bnxt *bp);
 unsigned int bnxt_get_max_func_cp_rings(struct bnxt *bp);
 unsigned int bnxt_get_avail_cp_rings_for_en(struct bnxt *bp);
 int bnxt_get_avail_msix(struct bnxt *bp, int num);
-int bnxt_reserve_rings(struct bnxt *bp);
+int bnxt_reserve_rings(struct bnxt *bp, bool irq_re_init);
 void bnxt_tx_disable(struct bnxt *bp);
 void bnxt_tx_enable(struct bnxt *bp);
 int bnxt_hwrm_set_pause(struct bnxt *);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index b1263821a6e9..a6c7baf38036 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -831,7 +831,7 @@ static int bnxt_set_channels(struct net_device *dev,
                         */
                }
        } else {
-                rc = bnxt_reserve_rings(bp);
+                rc = bnxt_reserve_rings(bp, true);
        }
        return rc;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
index cf475873ce81..bfa342a98d08 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
@@ -147,7 +147,7 @@ static int bnxt_req_msix_vecs(struct bnxt_en_dev *edev, int ulp_id,
                        bnxt_close_nic(bp, true, false);
                        rc = bnxt_open_nic(bp, true, false);
                } else {
-                        rc = bnxt_reserve_rings(bp);
+                        rc = bnxt_reserve_rings(bp, true);
                }
        }
        if (rc) {
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index acc66a7e7b95..00ee5e8e0ff0 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -1080,6 +1080,11 @@ struct macb_ptp_info {
                         struct ifreq *ifr, int cmd);
 };
+struct macb_pm_data {
+        u32 scrt2;
+        u32 usrio;
+};
 struct macb_config {
        u32                     caps;
        unsigned int            dma_burst_length;
@@ -1220,6 +1225,8 @@ struct macb {
        int     tx_bd_rd_prefetch;
        u32     rx_intr_mask;
+        struct macb_pm_data pm_data;
 };
 #ifdef CONFIG_MACB_USE_HWSTAMP
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index bebd9b1aeb64..f825e3960540 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -2849,10 +2849,14 @@ static int macb_get_ts_info(struct net_device *netdev,
 static void gem_enable_flow_filters(struct macb *bp, bool enable)
 {
+        struct net_device *netdev = bp->dev;
        struct ethtool_rx_fs_item *item;
        u32 t2_scr;
        int num_t2_scr;
+        if (!(netdev->features & NETIF_F_NTUPLE))
+                return;
        num_t2_scr = GEM_BFEXT(T2SCR, gem_readl(bp, DCFG8));
        list_for_each_entry(item, &bp->rx_fs_list.list, list) {
@@ -3012,8 +3016,7 @@ static int gem_add_flow_filter(struct net_device *netdev,
        gem_prog_cmp_regs(bp, fs);
        bp->rx_fs_list.count++;
        /* enable filtering if NTUPLE on */
-        if (netdev->features & NETIF_F_NTUPLE)
+        gem_enable_flow_filters(bp, 1);
-                gem_enable_flow_filters(bp, 1);
        spin_unlock_irqrestore(&bp->rx_fs_lock, flags);
        return 0;
@@ -3201,6 +3204,50 @@ static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        }
 }
+static inline void macb_set_txcsum_feature(struct macb *bp,
+                                           netdev_features_t features)
+{
+        u32 val;
+        if (!macb_is_gem(bp))
+                return;
+        val = gem_readl(bp, DMACFG);
+        if (features & NETIF_F_HW_CSUM)
+                val |= GEM_BIT(TXCOEN);
+        else
+                val &= ~GEM_BIT(TXCOEN);
+        gem_writel(bp, DMACFG, val);
+}
+static inline void macb_set_rxcsum_feature(struct macb *bp,
+                                           netdev_features_t features)
+{
+        struct net_device *netdev = bp->dev;
+        u32 val;
+        if (!macb_is_gem(bp))
+                return;
+        val = gem_readl(bp, NCFGR);
+        if ((features & NETIF_F_RXCSUM) && !(netdev->flags & IFF_PROMISC))
+                val |= GEM_BIT(RXCOEN);
+        else
+                val &= ~GEM_BIT(RXCOEN);
+        gem_writel(bp, NCFGR, val);
+}
+static inline void macb_set_rxflow_feature(struct macb *bp,
+                                           netdev_features_t features)
+{
+        if (!macb_is_gem(bp))
+                return;
+        gem_enable_flow_filters(bp, !!(features & NETIF_F_NTUPLE));
+}
 static int macb_set_features(struct net_device *netdev,
                             netdev_features_t features)
 {
@@ -3208,39 +3255,35 @@ static int macb_set_features(struct net_device *netdev,
        netdev_features_t changed = features ^ netdev->features;
        /* TX checksum offload */
-        if ((changed & NETIF_F_HW_CSUM) && macb_is_gem(bp)) {
+        if (changed & NETIF_F_HW_CSUM)
-                u32 dmacfg;
+                macb_set_txcsum_feature(bp, features);
-                dmacfg = gem_readl(bp, DMACFG);
-                if (features & NETIF_F_HW_CSUM)
-                        dmacfg |= GEM_BIT(TXCOEN);
-                else
-                        dmacfg &= ~GEM_BIT(TXCOEN);
-                gem_writel(bp, DMACFG, dmacfg);
-        }
        /* RX checksum offload */
-        if ((changed & NETIF_F_RXCSUM) && macb_is_gem(bp)) {
+        if (changed & NETIF_F_RXCSUM)
-                u32 netcfg;
+                macb_set_rxcsum_feature(bp, features);
-                netcfg = gem_readl(bp, NCFGR);
-                if (features & NETIF_F_RXCSUM &&
-                    !(netdev->flags & IFF_PROMISC))
-                        netcfg |= GEM_BIT(RXCOEN);
-                else
-                        netcfg &= ~GEM_BIT(RXCOEN);
-                gem_writel(bp, NCFGR, netcfg);
-        }
        /* RX Flow Filters */
-        if ((changed & NETIF_F_NTUPLE) && macb_is_gem(bp)) {
+        if (changed & NETIF_F_NTUPLE)
-                bool turn_on = features & NETIF_F_NTUPLE;
+                macb_set_rxflow_feature(bp, features);
-                gem_enable_flow_filters(bp, turn_on);
-        }
        return 0;
 }
+static void macb_restore_features(struct macb *bp)
+{
+        struct net_device *netdev = bp->dev;
+        netdev_features_t features = netdev->features;
+        /* TX checksum offload */
+        macb_set_txcsum_feature(bp, features);
+        /* RX checksum offload */
+        macb_set_rxcsum_feature(bp, features);
+        /* RX Flow Filters */
+        macb_set_rxflow_feature(bp, features);
+}
 static const struct net_device_ops macb_netdev_ops = {
        .ndo_open               = macb_open,
        .ndo_stop               = macb_close,
@@ -4273,6 +4316,12 @@ static int __maybe_unused macb_suspend(struct device *dev)
                spin_lock_irqsave(&bp->lock, flags);
                macb_reset_hw(bp);
                spin_unlock_irqrestore(&bp->lock, flags);
+                if (!(bp->caps & MACB_CAPS_USRIO_DISABLED))
+                        bp->pm_data.usrio = macb_or_gem_readl(bp, USRIO);
+                if (netdev->hw_features & NETIF_F_NTUPLE)
+                        bp->pm_data.scrt2 = gem_readl_n(bp, ETHT, SCRT2_ETHT);
        }
        netif_carrier_off(netdev);
@@ -4301,6 +4350,13 @@ static int __maybe_unused macb_resume(struct device *dev)
                disable_irq_wake(bp->queues[0].irq);
        } else {
                macb_writel(bp, NCR, MACB_BIT(MPE));
+                if (netdev->hw_features & NETIF_F_NTUPLE)
+                        gem_writel_n(bp, ETHT, SCRT2_ETHT, bp->pm_data.scrt2);
+                if (!(bp->caps & MACB_CAPS_USRIO_DISABLED))
+                        macb_or_gem_writel(bp, USRIO, bp->pm_data.usrio);
                for (q = 0, queue = bp->queues; q < bp->num_queues;
                     ++q, ++queue)
                        napi_enable(&queue->napi);
@@ -4312,6 +4368,7 @@ static int __maybe_unused macb_resume(struct device *dev)
        bp->macbgem_ops.mog_init_rings(bp);
        macb_init_hw(bp);
        macb_set_rx_mode(netdev);
+        macb_restore_features(bp);
        netif_device_attach(netdev);
        if (bp->ptp_info)
                bp->ptp_info->ptp_init(netdev);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
index 6e2d80008a79..cfaf8f618d1f 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
@@ -197,6 +197,9 @@ static void cxgb4_process_flow_match(struct net_device *dev,
                fs->val.ivlan = vlan_tci;
                fs->mask.ivlan = vlan_tci_mask;
+                fs->val.ivlan_vld = 1;
+                fs->mask.ivlan_vld = 1;
                /* Chelsio adapters use ivlan_vld bit to match vlan packets
                 * as 802.1Q. Also, when vlan tag is present in packets,
                 * ethtype match is used then to match on ethtype of inner
@@ -207,8 +210,6 @@ static void cxgb4_process_flow_match(struct net_device *dev,
                 * ethtype value with ethtype of inner header.
                 */
                if (fs->val.ethtype == ETH_P_8021Q) {
-                        fs->val.ivlan_vld = 1;
-                        fs->mask.ivlan_vld = 1;
                        fs->val.ethtype = 0;
                        fs->mask.ethtype = 0;
                }
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index f9b70be59792..93feb258067b 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -7253,10 +7253,21 @@ int t4_fixup_host_params(struct adapter *adap, unsigned int page_size,
                         unsigned int cache_line_size)
 {
        unsigned int page_shift = fls(page_size) - 1;
+        unsigned int sge_hps = page_shift - 10;
        unsigned int stat_len = cache_line_size > 64 ? 128 : 64;
        unsigned int fl_align = cache_line_size < 32 ? 32 : cache_line_size;
        unsigned int fl_align_log = fls(fl_align) - 1;
+        t4_write_reg(adap, SGE_HOST_PAGE_SIZE_A,
+                     HOSTPAGESIZEPF0_V(sge_hps) |
+                     HOSTPAGESIZEPF1_V(sge_hps) |
+                     HOSTPAGESIZEPF2_V(sge_hps) |
+                     HOSTPAGESIZEPF3_V(sge_hps) |
+                     HOSTPAGESIZEPF4_V(sge_hps) |
+                     HOSTPAGESIZEPF5_V(sge_hps) |
+                     HOSTPAGESIZEPF6_V(sge_hps) |
+                     HOSTPAGESIZEPF7_V(sge_hps));
        if (is_t4(adap->params.chip)) {
                t4_set_reg_field(adap, SGE_CONTROL_A,
                                 INGPADBOUNDARY_V(INGPADBOUNDARY_M) |
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
index 66535d1653f6..f16853c3c851 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -2107,7 +2107,6 @@ static struct eisa_driver de4x5_eisa_driver = {
                .remove  = de4x5_eisa_remove,
        }
 };
-MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
 #endif
 #ifdef CONFIG_PCI
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index d3f2408dc9e8..f38c3fa7d705 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -780,7 +780,7 @@ static void dpaa_eth_add_channel(u16 channel)
        struct qman_portal *portal;
        int cpu;
-        for_each_cpu(cpu, cpus) {
+        for_each_cpu_and(cpu, cpus, cpu_online_mask) {
                portal = qman_get_affine_portal(cpu);
                qman_p_static_dequeue_add(portal, pool);
        }
@@ -896,7 +896,7 @@ static void dpaa_fq_setup(struct dpaa_priv *priv,
        u16 channels[NR_CPUS];
        struct dpaa_fq *fq;
-        for_each_cpu(cpu, affine_cpus)
+        for_each_cpu_and(cpu, affine_cpus, cpu_online_mask)
                channels[num_portals++] = qman_affine_channel(cpu);
        if (num_portals == 0)
@@ -2174,7 +2174,6 @@ static int dpaa_eth_poll(struct napi_struct *napi, int budget)
        if (cleaned < budget) {
                napi_complete_done(napi, cleaned);
                qman_p_irqsource_add(np->p, QM_PIRQ_DQRI);
        } else if (np->down) {
                qman_p_irqsource_add(np->p, QM_PIRQ_DQRI);
        }
@@ -2448,7 +2447,7 @@ static void dpaa_eth_napi_enable(struct dpaa_priv *priv)
        struct dpaa_percpu_priv *percpu_priv;
        int i;
-        for_each_possible_cpu(i) {
+        for_each_online_cpu(i) {
                percpu_priv = per_cpu_ptr(priv->percpu_priv, i);
                percpu_priv->np.down = 0;
@@ -2461,7 +2460,7 @@ static void dpaa_eth_napi_disable(struct dpaa_priv *priv)
        struct dpaa_percpu_priv *percpu_priv;
        int i;
-        for_each_possible_cpu(i) {
+        for_each_online_cpu(i) {
                percpu_priv = per_cpu_ptr(priv->percpu_priv, i);
                percpu_priv->np.down = 1;
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
index bdee441bc3b7..7ce2e99b594d 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
@@ -569,7 +569,7 @@ static int dpaa_set_coalesce(struct net_device *dev,
        qman_dqrr_get_ithresh(portal, &prev_thresh);
        /* set new values */
-        for_each_cpu(cpu, cpus) {
+        for_each_cpu_and(cpu, cpus, cpu_online_mask) {
                portal = qman_get_affine_portal(cpu);
                res = qman_portal_set_iperiod(portal, period);
                if (res)
@@ -586,7 +586,7 @@ static int dpaa_set_coalesce(struct net_device *dev,
 revert_values:
        /* restore previous values */
-        for_each_cpu(cpu, cpus) {
+        for_each_cpu_and(cpu, cpus, cpu_online_mask) {
                if (!needs_revert[cpu])
                        continue;
                portal = qman_get_affine_portal(cpu);
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
index 63b1ecc18c26..7d2390e3df77 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -1972,7 +1972,7 @@ alloc_channel(struct dpaa2_eth_priv *priv)
        channel->dpcon = setup_dpcon(priv);
        if (IS_ERR_OR_NULL(channel->dpcon)) {
-                err = PTR_ERR(channel->dpcon);
+                err = PTR_ERR_OR_ZERO(channel->dpcon);
                goto err_setup;
        }
@@ -2028,7 +2028,7 @@ static int setup_dpio(struct dpaa2_eth_priv *priv)
                /* Try to allocate a channel */
                channel = alloc_channel(priv);
                if (IS_ERR_OR_NULL(channel)) {
-                        err = PTR_ERR(channel);
+                        err = PTR_ERR_OR_ZERO(channel);
                        if (err != -EPROBE_DEFER)
                                dev_info(dev,
                                         "No affine channel for cpu %d and above\n", i);
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
index 5fb8f5c0dc9f..e180d5a68c98 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
@@ -467,7 +467,7 @@ enum dpaa2_eth_rx_dist {
 #define DPAA2_ETH_DIST_IPPROTO          BIT(6)
 #define DPAA2_ETH_DIST_L4SRC            BIT(7)
 #define DPAA2_ETH_DIST_L4DST            BIT(8)
-#define DPAA2_ETH_DIST_ALL              (~0U)
+#define DPAA2_ETH_DIST_ALL              (~0ULL)
 static inline
 unsigned int dpaa2_eth_needed_headroom(struct dpaa2_eth_priv *priv,
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
index 76bd8d2872cc..7b182f4b263c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
@@ -4,6 +4,7 @@
 */
 #include <linux/net_tstamp.h>
+#include <linux/nospec.h>
 #include "dpni.h"       /* DPNI_LINK_OPT_* */
 #include "dpaa2-eth.h"
@@ -648,6 +649,8 @@ static int dpaa2_eth_get_rxnfc(struct net_device *net_dev,
        case ETHTOOL_GRXCLSRULE:
                if (rxnfc->fs.location >= max_rules)
                        return -EINVAL;
+                rxnfc->fs.location = array_index_nospec(rxnfc->fs.location,
+                                                        max_rules);
                if (!priv->cls_rules[rxnfc->fs.location].in_use)
                        return -EINVAL;
                rxnfc->fs = priv->cls_rules[rxnfc->fs.location].fs;
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index aa7d4e27c5d1..38f10f7dcbc3 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3556,7 +3556,7 @@ failed_init:
        if (fep->reg_phy)
                regulator_disable(fep->reg_phy);
 failed_reset:
-        pm_runtime_put(&pdev->dev);
+        pm_runtime_put_noidle(&pdev->dev);
        pm_runtime_disable(&pdev->dev);
 failed_regulator:
        clk_disable_unprepare(fep->clk_ahb);
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index e758650b2c26..269bd73be1a0 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -4674,7 +4674,7 @@ static int mvneta_probe(struct platform_device *pdev)
        err = register_netdev(dev);
        if (err < 0) {
                dev_err(&pdev->dev, "failed to register\n");
-                goto err_free_stats;
+                goto err_netdev;
        }
        netdev_info(dev, "Using %s mac address %pM\n", mac_from,
@@ -4685,14 +4685,12 @@ static int mvneta_probe(struct platform_device *pdev)
        return 0;
 err_netdev:
-        unregister_netdev(dev);
        if (pp->bm_priv) {
                mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_long, 1 << pp->id);
                mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_short,
                                       1 << pp->id);
                mvneta_bm_put(pp->bm_priv);
        }
-err_free_stats:
        free_percpu(pp->stats);
 err_free_ports:
        free_percpu(pp->ports);
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
index d046f7a1dcf5..a57d17ab91f0 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
@@ -1271,6 +1271,9 @@ int mvpp2_ethtool_cls_rule_ins(struct mvpp2_port *port,
        if (ret)
                goto clean_eth_rule;
+        ethtool_rx_flow_rule_destroy(ethtool_rule);
+        efs->rule.flow = NULL;
        memcpy(&efs->rxnfc, info, sizeof(*info));
        port->rfs_rules[efs->rule.loc] = efs;
        port->n_rfs_rules++;
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index d38952eb7aa9..7a67e23a2c2b 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -1455,7 +1455,7 @@ static inline void mvpp2_xlg_max_rx_size_set(struct mvpp2_port *port)
 /* Set defaults to the MVPP2 port */
 static void mvpp2_defaults_set(struct mvpp2_port *port)
 {
-        int tx_port_num, val, queue, ptxq, lrxq;
+        int tx_port_num, val, queue, lrxq;
        if (port->priv->hw_version == MVPP21) {
                /* Update TX FIFO MIN Threshold */
@@ -1476,11 +1476,9 @@ static void mvpp2_defaults_set(struct mvpp2_port *port)
        mvpp2_write(port->priv, MVPP2_TXP_SCHED_FIXED_PRIO_REG, 0);
        /* Close bandwidth for all queues */
-        for (queue = 0; queue < MVPP2_MAX_TXQ; queue++) {
+        for (queue = 0; queue < MVPP2_MAX_TXQ; queue++)
-                ptxq = mvpp2_txq_phys(port->id, queue);
                mvpp2_write(port->priv,
-                            MVPP2_TXQ_SCHED_TOKEN_CNTR_REG(ptxq), 0);
+                            MVPP2_TXQ_SCHED_TOKEN_CNTR_REG(queue), 0);
-        }
        /* Set refill period to 1 usec, refill tokens
         * and bucket size to maximum
@@ -2336,7 +2334,7 @@ static void mvpp2_txq_deinit(struct mvpp2_port *port,
        txq->descs_dma         = 0;
        /* Set minimum bandwidth for disabled TXQs */
-        mvpp2_write(port->priv, MVPP2_TXQ_SCHED_TOKEN_CNTR_REG(txq->id), 0);
+        mvpp2_write(port->priv, MVPP2_TXQ_SCHED_TOKEN_CNTR_REG(txq->log_id), 0);
        /* Set Tx descriptors queue starting address and size */
        thread = mvpp2_cpu_to_thread(port->priv, get_cpu());
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 457cc39423f2..c65cefd84eda 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -3687,6 +3687,12 @@ static netdev_features_t mlx5e_fix_features(struct net_device *netdev,
                        netdev_warn(netdev, "Disabling LRO, not supported in legacy RQ\n");
        }
+        if (MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_CQE_COMPRESS)) {
+                features &= ~NETIF_F_RXHASH;
+                if (netdev->features & NETIF_F_RXHASH)
+                        netdev_warn(netdev, "Disabling rxhash, not supported when CQE compress is active\n");
+        }
        mutex_unlock(&priv->state_lock);
        return features;
@@ -3812,6 +3818,9 @@ int mlx5e_hwstamp_set(struct mlx5e_priv *priv, struct ifreq *ifr)
        memcpy(&priv->tstamp, &config, sizeof(config));
        mutex_unlock(&priv->state_lock);
+        /* might need to fix some features */
+        netdev_update_features(priv->netdev);
        return copy_to_user(ifr->ifr_data, &config,
                            sizeof(config)) ? -EFAULT : 0;
 }
@@ -4680,6 +4689,10 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev)
        if (!priv->channels.params.scatter_fcs_en)
                netdev->features  &= ~NETIF_F_RXFCS;
+        /* prefere CQE compression over rxhash */
+        if (MLX5E_GET_PFLAG(&priv->channels.params, MLX5E_PFLAG_RX_CQE_COMPRESS))
+                netdev->features &= ~NETIF_F_RXHASH;
 #define FT_CAP(f) MLX5_CAP_FLOWTABLE(mdev, flow_table_properties_nic_receive.f)
        if (FT_CAP(flow_modify_en) &&
            FT_CAP(modify_root) &&
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 5283e16c69e4..9aea9c5b2ce8 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -813,7 +813,7 @@ static int mlx5e_nic_rep_netdevice_event(struct notifier_block *nb,
        struct net_device *netdev = netdev_notifier_info_to_dev(ptr);
        if (!mlx5e_tc_tun_device_to_offload(priv, netdev) &&
-            !is_vlan_dev(netdev))
+            !(is_vlan_dev(netdev) && vlan_dev_real_dev(netdev) == rpriv->netdev))
                return NOTIFY_OK;
        switch (event) {
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index d7ca7e82a832..fe76c6fd6d80 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -2284,7 +2284,7 @@ static struct mlx5_flow_root_namespace
                cmds = mlx5_fs_cmd_get_default_ipsec_fpga_cmds(table_type);
        /* Create the root namespace */
-        root_ns = kvzalloc(sizeof(*root_ns), GFP_KERNEL);
+        root_ns = kzalloc(sizeof(*root_ns), GFP_KERNEL);
        if (!root_ns)
                return NULL;
@@ -2427,6 +2427,7 @@ static void cleanup_egress_acls_root_ns(struct mlx5_core_dev *dev)
                cleanup_root_ns(steering->esw_egress_root_ns[i]);
        kfree(steering->esw_egress_root_ns);
+        steering->esw_egress_root_ns = NULL;
 }
 static void cleanup_ingress_acls_root_ns(struct mlx5_core_dev *dev)
@@ -2441,6 +2442,7 @@ static void cleanup_ingress_acls_root_ns(struct mlx5_core_dev *dev)
                cleanup_root_ns(steering->esw_ingress_root_ns[i]);
        kfree(steering->esw_ingress_root_ns);
+        steering->esw_ingress_root_ns = NULL;
 }
 void mlx5_cleanup_fs(struct mlx5_core_dev *dev)
@@ -2474,11 +2476,7 @@ static int init_sniffer_tx_root_ns(struct mlx5_flow_steering *steering)
        /* Create single prio */
        prio = fs_create_prio(&steering->sniffer_tx_root_ns->ns, 0, 1);
-        if (IS_ERR(prio)) {
+        return PTR_ERR_OR_ZERO(prio);
-                cleanup_root_ns(steering->sniffer_tx_root_ns);
-                return PTR_ERR(prio);
-        }
-        return 0;
 }
 static int init_sniffer_rx_root_ns(struct mlx5_flow_steering *steering)
@@ -2491,11 +2489,7 @@ static int init_sniffer_rx_root_ns(struct mlx5_flow_steering *steering)
        /* Create single prio */
        prio = fs_create_prio(&steering->sniffer_rx_root_ns->ns, 0, 1);
-        if (IS_ERR(prio)) {
+        return PTR_ERR_OR_ZERO(prio);
-                cleanup_root_ns(steering->sniffer_rx_root_ns);
-                return PTR_ERR(prio);
-        }
-        return 0;
 }
 static int init_rdma_rx_root_ns(struct mlx5_flow_steering *steering)
@@ -2511,11 +2505,7 @@ static int init_rdma_rx_root_ns(struct mlx5_flow_steering *steering)
        /* Create single prio */
        prio = fs_create_prio(&steering->rdma_rx_root_ns->ns, 0, 1);
-        if (IS_ERR(prio)) {
+        return PTR_ERR_OR_ZERO(prio);
-                cleanup_root_ns(steering->rdma_rx_root_ns);
-                return PTR_ERR(prio);
-        }
-        return 0;
 }
 static int init_fdb_root_ns(struct mlx5_flow_steering *steering)
 {
@@ -2637,6 +2627,7 @@ cleanup_root_ns:
        for (i--; i >= 0; i--)
                cleanup_root_ns(steering->esw_egress_root_ns[i]);
        kfree(steering->esw_egress_root_ns);
+        steering->esw_egress_root_ns = NULL;
        return err;
 }
@@ -2664,6 +2655,7 @@ cleanup_root_ns:
        for (i--; i >= 0; i--)
                cleanup_root_ns(steering->esw_ingress_root_ns[i]);
        kfree(steering->esw_ingress_root_ns);
+        steering->esw_ingress_root_ns = NULL;
        return err;
 }
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 61fa1d162d28..23d53163ce15 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -1067,7 +1067,7 @@ static int mlx5_load(struct mlx5_core_dev *dev)
        err = mlx5_core_set_hca_defaults(dev);
        if (err) {
                mlx5_core_err(dev, "Failed to set hca defaults\n");
-                goto err_fs;
+                goto err_sriov;
        }
        err = mlx5_sriov_attach(dev);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index dbb425717f5e..dfe6b44baf63 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -3128,6 +3128,10 @@ mlxsw_sp_port_set_link_ksettings(struct net_device *dev,
        ops->reg_ptys_eth_unpack(mlxsw_sp, ptys_pl, &eth_proto_cap, NULL, NULL);
        autoneg = cmd->base.autoneg == AUTONEG_ENABLE;
+        if (!autoneg && cmd->base.speed == SPEED_56000) {
+                netdev_err(dev, "56G not supported with autoneg off\n");
+                return -EINVAL;
+        }
        eth_proto_new = autoneg ?
                ops->to_ptys_advert_link(mlxsw_sp, cmd) :
                ops->to_ptys_speed(mlxsw_sp, cmd->base.speed);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c
index c1a9cc9a3292..4c98950380d5 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c
@@ -1171,13 +1171,12 @@ mlxsw_sp_acl_erp_delta_fill(const struct mlxsw_sp_acl_erp_key *parent_key,
                        return -EINVAL;
        }
        if (si == -1) {
-                /* The masks are the same, this cannot happen.
+                /* The masks are the same, this can happen in case eRPs with
-                 * That means the caller is broken.
+                 * the same mask were created in both A-TCAM and C-TCAM.
+                 * The only possible condition under which this can happen
+                 * is identical rule insertion. Delta is not possible here.
                 */
-                WARN_ON(1);
+                return -EINVAL;
-                *delta_start = 0;
-                *delta_mask = 0;
-                return 0;
        }
        pmask = (unsigned char) parent_key->mask[__MASK_IDX(si)];
        mask = (unsigned char) key->mask[__MASK_IDX(si)];
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index d715ef4fc92f..02ad11e0b0d8 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -593,45 +593,25 @@ static int ocelot_port_xmit(struct sk_buff *skb, struct net_device *dev)
        return NETDEV_TX_OK;
 }
-static void ocelot_mact_mc_reset(struct ocelot_port *port)
+static int ocelot_mc_unsync(struct net_device *dev, const unsigned char *addr)
 {
-        struct ocelot *ocelot = port->ocelot;
+        struct ocelot_port *port = netdev_priv(dev);
-        struct netdev_hw_addr *ha, *n;
-        /* Free and forget all the MAC addresses stored in the port private mc
+        return ocelot_mact_forget(port->ocelot, addr, port->pvid);
-         * list. These are mc addresses that were previously added by calling
-         * ocelot_mact_mc_add().
-         */
-        list_for_each_entry_safe(ha, n, &port->mc, list) {
-                ocelot_mact_forget(ocelot, ha->addr, port->pvid);
-                list_del(&ha->list);
-                kfree(ha);
-        }
 }
-static int ocelot_mact_mc_add(struct ocelot_port *port,
+static int ocelot_mc_sync(struct net_device *dev, const unsigned char *addr)
-                              struct netdev_hw_addr *hw_addr)
 {
-        struct ocelot *ocelot = port->ocelot;
+        struct ocelot_port *port = netdev_priv(dev);
-        struct netdev_hw_addr *ha = kzalloc(sizeof(*ha), GFP_ATOMIC);
-        if (!ha)
-                return -ENOMEM;
-        memcpy(ha, hw_addr, sizeof(*ha));
-        list_add_tail(&ha->list, &port->mc);
-        ocelot_mact_learn(ocelot, PGID_CPU, ha->addr, port->pvid,
-                          ENTRYTYPE_LOCKED);
-        return 0;
+        return ocelot_mact_learn(port->ocelot, PGID_CPU, addr, port->pvid,
+                                 ENTRYTYPE_LOCKED);
 }
 static void ocelot_set_rx_mode(struct net_device *dev)
 {
        struct ocelot_port *port = netdev_priv(dev);
        struct ocelot *ocelot = port->ocelot;
-        struct netdev_hw_addr *ha;
        int i;
        u32 val;
@@ -643,13 +623,7 @@ static void ocelot_set_rx_mode(struct net_device *dev)
        for (i = ocelot->num_phys_ports + 1; i < PGID_CPU; i++)
                ocelot_write_rix(ocelot, val, ANA_PGID_PGID, i);
-        /* Handle the device multicast addresses. First remove all the
+        __dev_mc_sync(dev, ocelot_mc_sync, ocelot_mc_unsync);
-         * previously installed addresses and then add the latest ones to the
-         * mac table.
-         */
-        ocelot_mact_mc_reset(port);
-        netdev_for_each_mc_addr(ha, dev)
-                ocelot_mact_mc_add(port, ha);
 }
 static int ocelot_port_get_phys_port_name(struct net_device *dev,
@@ -1657,7 +1631,6 @@ int ocelot_probe_port(struct ocelot *ocelot, u8 port,
        ocelot_port->regs = regs;
        ocelot_port->chip_port = port;
        ocelot_port->phy = phy;
-        INIT_LIST_HEAD(&ocelot_port->mc);
        ocelot->ports[port] = ocelot_port;
        dev->netdev_ops = &ocelot_port_netdev_ops;
diff --git a/drivers/net/ethernet/mscc/ocelot.h b/drivers/net/ethernet/mscc/ocelot.h
index ba3b3380b4d0..541fe41e60b0 100644
--- a/drivers/net/ethernet/mscc/ocelot.h
+++ b/drivers/net/ethernet/mscc/ocelot.h
@@ -441,10 +441,6 @@ struct ocelot_port {
        struct phy_device *phy;
        void __iomem *regs;
        u8 chip_port;
-        /* Keep a track of the mc addresses added to the mac table, so that they
-         * can be removed when needed.
-         */
-        struct list_head mc;
        /* Ingress default VLAN (pvid) */
        u16 pvid;
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 8e404186ef87..d06a61f00e78 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -6722,6 +6722,8 @@ static int rtl8169_resume(struct device *device)
        struct net_device *dev = dev_get_drvdata(device);
        struct rtl8169_private *tp = netdev_priv(dev);
+        rtl_rar_set(tp, dev->dev_addr);
        clk_prepare_enable(tp->clk);
        if (netif_running(dev))
@@ -6755,6 +6757,7 @@ static int rtl8169_runtime_resume(struct device *device)
 {
        struct net_device *dev = dev_get_drvdata(device);
        struct rtl8169_private *tp = netdev_priv(dev);
        rtl_rar_set(tp, dev->dev_addr);
        if (!tp->TxDescArray)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 6354f19a31eb..7ba35a0bdb29 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1594,6 +1594,10 @@ static void sh_eth_dev_exit(struct net_device *ndev)
        sh_eth_get_stats(ndev);
        mdp->cd->soft_reset(ndev);
+        /* Set the RMII mode again if required */
+        if (mdp->cd->rmiimode)
+                sh_eth_write(ndev, 0x1, RMIIMODE);
        /* Set MAC address again */
        update_mac_address(ndev);
 }
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
index 3256e5cbad27..5bc224834c77 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
@@ -455,7 +455,11 @@ static int dwc_eth_dwmac_probe(struct platform_device *pdev)
        priv = data->probe(pdev, plat_dat, &stmmac_res);
        if (IS_ERR(priv)) {
                ret = PTR_ERR(priv);
-                dev_err(&pdev->dev, "failed to probe subdriver: %d\n", ret);
+                if (ret != -EPROBE_DEFER)
+                        dev_err(&pdev->dev, "failed to probe subdriver: %d\n",
+                                ret);
                goto remove_config;
        }
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c
index bf2562995fc8..126b66bb73a6 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c
@@ -346,8 +346,6 @@ static int mediatek_dwmac_probe(struct platform_device *pdev)
                return PTR_ERR(plat_dat);
        plat_dat->interface = priv_plat->phy_mode;
-        /* clk_csr_i = 250-300MHz & MDC = clk_csr_i/124 */
-        plat_dat->clk_csr = 5;
        plat_dat->has_gmac4 = 1;
        plat_dat->has_gmac = 0;
        plat_dat->pmt = 0;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 2a1052704885..65e57b9f6887 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3338,6 +3338,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
                entry = STMMAC_GET_ENTRY(entry, DMA_RX_SIZE);
        }
        rx_q->dirty_rx = entry;
+        stmmac_set_rx_tail_ptr(priv, priv->ioaddr, rx_q->rx_tail_addr, queue);
 }
 /**
@@ -4379,10 +4380,10 @@ int stmmac_dvr_probe(struct device *device,
         * set the MDC clock dynamically according to the csr actual
         * clock input.
         */
-        if (!priv->plat->clk_csr)
+        if (priv->plat->clk_csr >= 0)
-                stmmac_clk_csr_set(priv);
-        else
                priv->clk_csr = priv->plat->clk_csr;
+        else
+                stmmac_clk_csr_set(priv);
        stmmac_check_pcs_mode(priv);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index bdd351597b55..093a223fe408 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -267,7 +267,8 @@ int stmmac_mdio_reset(struct mii_bus *bus)
                        of_property_read_u32_array(np,
                                "snps,reset-delays-us", data->delays, 3);
-                        if (gpio_request(data->reset_gpio, "mdio-reset"))
+                        if (devm_gpio_request(priv->device, data->reset_gpio,
+                                              "mdio-reset"))
                                return 0;
                }
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 3031f2bf15d6..f45bfbef97d0 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -408,7 +408,10 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
        /* Default to phy auto-detection */
        plat->phy_addr = -1;
-        /* Get clk_csr from device tree */
+        /* Default to get clk_csr from stmmac_clk_crs_set(),
+         * or get clk_csr from device tree.
+         */
+        plat->clk_csr = -1;
        of_property_read_u32(np, "clk_csr", &plat->clk_csr);
        /* "snps,phy-addr" is not a standard property. Mark it as deprecated
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 72069ec2951e..03ea5a7ed3a4 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -1989,6 +1989,12 @@ static rx_handler_result_t netvsc_vf_handle_frame(struct sk_buff **pskb)
        struct netvsc_vf_pcpu_stats *pcpu_stats
                 = this_cpu_ptr(ndev_ctx->vf_stats);
+        skb = skb_share_check(skb, GFP_ATOMIC);
+        if (unlikely(!skb))
+                return RX_HANDLER_CONSUMED;
+        *pskb = skb;
        skb->dev = ndev;
        u64_stats_update_begin(&pcpu_stats->syncp);
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index fd35131a0c39..c71c7d0f53f0 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -26,10 +26,18 @@
 /* Extended Registers */
 #define DP83867_CFG4            0x0031
+#define DP83867_CFG4_SGMII_ANEG_MASK (BIT(5) | BIT(6))
+#define DP83867_CFG4_SGMII_ANEG_TIMER_11MS   (3 << 5)
+#define DP83867_CFG4_SGMII_ANEG_TIMER_800US  (2 << 5)
+#define DP83867_CFG4_SGMII_ANEG_TIMER_2US    (1 << 5)
+#define DP83867_CFG4_SGMII_ANEG_TIMER_16MS   (0 << 5)
 #define DP83867_RGMIICTL        0x0032
 #define DP83867_STRAP_STS1      0x006E
 #define DP83867_RGMIIDCTL       0x0086
 #define DP83867_IO_MUX_CFG      0x0170
+#define DP83867_10M_SGMII_CFG   0x016F
+#define DP83867_10M_SGMII_RATE_ADAPT_MASK BIT(7)
 #define DP83867_SW_RESET        BIT(15)
 #define DP83867_SW_RESTART      BIT(14)
@@ -247,10 +255,8 @@ static int dp83867_config_init(struct phy_device *phydev)
                ret = phy_write(phydev, MII_DP83867_PHYCTRL, val);
                if (ret)
                        return ret;
-        }
-        if ((phydev->interface >= PHY_INTERFACE_MODE_RGMII_ID) &&
+                /* Set up RGMII delays */
-            (phydev->interface <= PHY_INTERFACE_MODE_RGMII_RXID)) {
                val = phy_read_mmd(phydev, DP83867_DEVADDR, DP83867_RGMIICTL);
                if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
@@ -277,6 +283,33 @@ static int dp83867_config_init(struct phy_device *phydev)
                                       DP83867_IO_MUX_CFG_IO_IMPEDANCE_CTRL);
        }
+        if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
+                /* For support SPEED_10 in SGMII mode
+                 * DP83867_10M_SGMII_RATE_ADAPT bit
+                 * has to be cleared by software. That
+                 * does not affect SPEED_100 and
+                 * SPEED_1000.
+                 */
+                ret = phy_modify_mmd(phydev, DP83867_DEVADDR,
+                                     DP83867_10M_SGMII_CFG,
+                                     DP83867_10M_SGMII_RATE_ADAPT_MASK,
+                                     0);
+                if (ret)
+                        return ret;
+                /* After reset SGMII Autoneg timer is set to 2us (bits 6 and 5
+                 * are 01). That is not enough to finalize autoneg on some
+                 * devices. Increase this timer duration to maximum 16ms.
+                 */
+                ret = phy_modify_mmd(phydev, DP83867_DEVADDR,
+                                     DP83867_CFG4,
+                                     DP83867_CFG4_SGMII_ANEG_MASK,
+                                     DP83867_CFG4_SGMII_ANEG_TIMER_16MS);
+                if (ret)
+                        return ret;
+        }
        /* Enable Interrupt output INT_OE in CFG3 register */
        if (phy_interrupt_is_valid(phydev)) {
                val = phy_read(phydev, DP83867_CFG3);
@@ -307,7 +340,7 @@ static int dp83867_phy_reset(struct phy_device *phydev)
        usleep_range(10, 20);
-        return dp83867_config_init(phydev);
+        return 0;
 }
 static struct phy_driver dp83867_driver[] = {
diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
index 238a20e13d6a..3b99882692e3 100644
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -31,6 +31,9 @@
 #define MV_PHY_ALASKA_NBT_QUIRK_REV     (MARVELL_PHY_ID_88X3310 | 0xa)
 enum {
+        MV_PMA_BOOT             = 0xc050,
+        MV_PMA_BOOT_FATAL       = BIT(0),
        MV_PCS_BASE_T           = 0x0000,
        MV_PCS_BASE_R           = 0x1000,
        MV_PCS_1000BASEX        = 0x2000,
@@ -213,6 +216,16 @@ static int mv3310_probe(struct phy_device *phydev)
            (phydev->c45_ids.devices_in_package & mmd_mask) != mmd_mask)
                return -ENODEV;
+        ret = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MV_PMA_BOOT);
+        if (ret < 0)
+                return ret;
+        if (ret & MV_PMA_BOOT_FATAL) {
+                dev_warn(&phydev->mdio.dev,
+                         "PHY failed to boot firmware, status=%04x\n", ret);
+                return -ENODEV;
+        }
        priv = devm_kzalloc(&phydev->mdio.dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 74983593834b..9044b95d2afe 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -51,6 +51,10 @@ struct phylink {
        /* The link configuration settings */
        struct phylink_link_state link_config;
+        /* The current settings */
+        phy_interface_t cur_interface;
        struct gpio_desc *link_gpio;
        struct timer_list link_poll;
        void (*get_fixed_state)(struct net_device *dev,
@@ -446,12 +450,12 @@ static void phylink_resolve(struct work_struct *w)
                if (!link_state.link) {
                        netif_carrier_off(ndev);
                        pl->ops->mac_link_down(ndev, pl->link_an_mode,
-                                               pl->phy_state.interface);
+                                               pl->cur_interface);
                        netdev_info(ndev, "Link is Down\n");
                } else {
+                        pl->cur_interface = link_state.interface;
                        pl->ops->mac_link_up(ndev, pl->link_an_mode,
-                                             pl->phy_state.interface,
+                                             pl->cur_interface, pl->phydev);
-                                             pl->phydev);
                        netif_carrier_on(ndev);
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 0522c2224147..b372419d61f2 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -277,7 +277,7 @@ config PINCTRL_ST
 config PINCTRL_STMFX
        tristate "STMicroelectronics STMFX GPIO expander pinctrl driver"
        depends on I2C
-        depends on OF || COMPILE_TEST
+        depends on OF_GPIO
        select GENERIC_PINCONF
        select GPIOLIB_IRQCHIP
        select MFD_STMFX
diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index d7acbb79cdf7..a18d6eefe672 100644
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -33,13 +33,13 @@
 #define PADOWN_BITS                     4
 #define PADOWN_SHIFT(p)                 ((p) % 8 * PADOWN_BITS)
-#define PADOWN_MASK(p)                  (0xf << PADOWN_SHIFT(p))
+#define PADOWN_MASK(p)                  (GENMASK(3, 0) << PADOWN_SHIFT(p))
 #define PADOWN_GPP(p)                   ((p) / 8)
 /* Offset from pad_regs */
 #define PADCFG0                         0x000
 #define PADCFG0_RXEVCFG_SHIFT           25
-#define PADCFG0_RXEVCFG_MASK            (3 << PADCFG0_RXEVCFG_SHIFT)
+#define PADCFG0_RXEVCFG_MASK            GENMASK(26, 25)
 #define PADCFG0_RXEVCFG_LEVEL           0
 #define PADCFG0_RXEVCFG_EDGE            1
 #define PADCFG0_RXEVCFG_DISABLED        2
@@ -51,7 +51,7 @@
 #define PADCFG0_GPIROUTSMI              BIT(18)
 #define PADCFG0_GPIROUTNMI              BIT(17)
 #define PADCFG0_PMODE_SHIFT             10
-#define PADCFG0_PMODE_MASK              (0xf << PADCFG0_PMODE_SHIFT)
+#define PADCFG0_PMODE_MASK              GENMASK(13, 10)
 #define PADCFG0_GPIORXDIS               BIT(9)
 #define PADCFG0_GPIOTXDIS               BIT(8)
 #define PADCFG0_GPIORXSTATE             BIT(1)
@@ -60,7 +60,7 @@
 #define PADCFG1                         0x004
 #define PADCFG1_TERM_UP                 BIT(13)
 #define PADCFG1_TERM_SHIFT              10
-#define PADCFG1_TERM_MASK               (7 << PADCFG1_TERM_SHIFT)
+#define PADCFG1_TERM_MASK               GENMASK(12, 10)
 #define PADCFG1_TERM_20K                4
 #define PADCFG1_TERM_2K                 3
 #define PADCFG1_TERM_5K                 2
@@ -914,35 +914,6 @@ static void intel_gpio_irq_ack(struct irq_data *d)
        }
 }
-static void intel_gpio_irq_enable(struct irq_data *d)
-{
-        struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-        struct intel_pinctrl *pctrl = gpiochip_get_data(gc);
-        const struct intel_community *community;
-        const struct intel_padgroup *padgrp;
-        int pin;
-        pin = intel_gpio_to_pin(pctrl, irqd_to_hwirq(d), &community, &padgrp);
-        if (pin >= 0) {
-                unsigned int gpp, gpp_offset, is_offset;
-                unsigned long flags;
-                u32 value;
-                gpp = padgrp->reg_num;
-                gpp_offset = padgroup_offset(padgrp, pin);
-                is_offset = community->is_offset + gpp * 4;
-                raw_spin_lock_irqsave(&pctrl->lock, flags);
-                /* Clear interrupt status first to avoid unexpected interrupt */
-                writel(BIT(gpp_offset), community->regs + is_offset);
-                value = readl(community->regs + community->ie_offset + gpp * 4);
-                value |= BIT(gpp_offset);
-                writel(value, community->regs + community->ie_offset + gpp * 4);
-                raw_spin_unlock_irqrestore(&pctrl->lock, flags);
-        }
-}
 static void intel_gpio_irq_mask_unmask(struct irq_data *d, bool mask)
 {
        struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
@@ -955,15 +926,20 @@ static void intel_gpio_irq_mask_unmask(struct irq_data *d, bool mask)
        if (pin >= 0) {
                unsigned int gpp, gpp_offset;
                unsigned long flags;
-                void __iomem *reg;
+                void __iomem *reg, *is;
                u32 value;
                gpp = padgrp->reg_num;
                gpp_offset = padgroup_offset(padgrp, pin);
                reg = community->regs + community->ie_offset + gpp * 4;
+                is = community->regs + community->is_offset + gpp * 4;
                raw_spin_lock_irqsave(&pctrl->lock, flags);
+                /* Clear interrupt status first to avoid unexpected interrupt */
+                writel(BIT(gpp_offset), is);
                value = readl(reg);
                if (mask)
                        value &= ~BIT(gpp_offset);
@@ -1107,7 +1083,6 @@ static irqreturn_t intel_gpio_irq(int irq, void *data)
 static struct irq_chip intel_gpio_irqchip = {
        .name = "intel-gpio",
-        .irq_enable = intel_gpio_irq_enable,
        .irq_ack = intel_gpio_irq_ack,
        .irq_mask = intel_gpio_irq_mask,
        .irq_unmask = intel_gpio_irq_unmask,
diff --git a/drivers/staging/erofs/super.c b/drivers/staging/erofs/super.c
index 399847d21146..f580d4ef77a1 100644
--- a/drivers/staging/erofs/super.c
+++ b/drivers/staging/erofs/super.c
@@ -457,6 +457,7 @@ static int erofs_read_super(struct super_block *sb,
         */
 err_devname:
        dput(sb->s_root);
+        sb->s_root = NULL;
 err_iget:
 #ifdef EROFS_FS_HAS_MANAGED_CACHE
        iput(sbi->managed_cache);
diff --git a/drivers/staging/kpc2000/Kconfig b/drivers/staging/kpc2000/Kconfig
index fb5922928f47..3bb2efd511c4 100644
--- a/drivers/staging/kpc2000/Kconfig
+++ b/drivers/staging/kpc2000/Kconfig
@@ -2,7 +2,9 @@
 config KPC2000
        bool "Daktronics KPC Device support"
+        select MFD_CORE
        depends on PCI
+        depends on UIO
        help
          Select this if you wish to use the Daktronics KPC PCI devices
diff --git a/drivers/staging/kpc2000/kpc_dma/fileops.c b/drivers/staging/kpc2000/kpc_dma/fileops.c
index 5741d2b49a7d..616658709bd9 100644
--- a/drivers/staging/kpc2000/kpc_dma/fileops.c
+++ b/drivers/staging/kpc2000/kpc_dma/fileops.c
@@ -8,7 +8,7 @@
 #include <linux/errno.h>    /* error codes */
 #include <linux/types.h>    /* size_t */
 #include <linux/cdev.h>
-#include <asm/uaccess.h>    /* copy_*_user */
+#include <linux/uaccess.h>  /* copy_*_user */
 #include <linux/aio.h>      /* aio stuff */
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
@@ -116,13 +116,11 @@ int  kpc_dma_transfer(struct dev_private_data *priv, struct kiocb *kcb, unsigned
        if (desc_needed >= ldev->desc_pool_cnt){
                dev_warn(&priv->ldev->pldev->dev, "    mapped_entry_count = %d    num_descrs_needed = %d    num_descrs_avail = %d    TOO MANY to ever complete!\n", acd->mapped_entry_count, desc_needed, num_descrs_avail);
                rv = -EAGAIN;
-                unlock_engine(ldev);
                goto err_descr_too_many;
        }
        if (desc_needed > num_descrs_avail){
                dev_warn(&priv->ldev->pldev->dev, "    mapped_entry_count = %d    num_descrs_needed = %d    num_descrs_avail = %d    Too many to complete right now.\n", acd->mapped_entry_count, desc_needed, num_descrs_avail);
                rv = -EMSGSIZE;
-                unlock_engine(ldev);
                goto err_descr_too_many;
        }
diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
index 9841c30450ce..dade79738a29 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
@@ -572,7 +572,7 @@ exit:
                                dev->colourfx.enable ? "true" : "false",
                                dev->colourfx.u, dev->colourfx.v,
                                ret, (ret == 0 ? 0 : -EINVAL));
-        return (ret == 0 ? 0 : EINVAL);
+        return (ret == 0 ? 0 : -EINVAL);
 }
 static int ctrl_set_colfx(struct bm2835_mmal_dev *dev,
@@ -596,7 +596,7 @@ static int ctrl_set_colfx(struct bm2835_mmal_dev *dev,
                 "%s: After: mmal_ctrl:%p ctrl id:0x%x ctrl val:%d ret %d(%d)\n",
                        __func__, mmal_ctrl, ctrl->id, ctrl->val, ret,
                        (ret == 0 ? 0 : -EINVAL));
-        return (ret == 0 ? 0 : EINVAL);
+        return (ret == 0 ? 0 : -EINVAL);
 }
 static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev,
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index a9a22917ecdb..c557c9953724 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@ -368,9 +368,18 @@ create_pagelist(char __user *buf, size_t count, unsigned short type)
        int dma_buffers;
        dma_addr_t dma_addr;
+        if (count >= INT_MAX - PAGE_SIZE)
+                return NULL;
        offset = ((unsigned int)(unsigned long)buf & (PAGE_SIZE - 1));
        num_pages = DIV_ROUND_UP(count + offset, PAGE_SIZE);
+        if (num_pages > (SIZE_MAX - sizeof(struct pagelist) -
+                         sizeof(struct vchiq_pagelist_info)) /
+                        (sizeof(u32) + sizeof(pages[0]) +
+                         sizeof(struct scatterlist)))
+                return NULL;
        pagelist_size = sizeof(struct pagelist) +
                        (num_pages * sizeof(u32)) +
                        (num_pages * sizeof(pages[0]) +
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 0a713409ea98..95eaf8fdf4f2 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1076,13 +1076,17 @@ void wilc_wlan_cleanup(struct net_device *dev)
        acquire_bus(wilc, WILC_BUS_ACQUIRE_AND_WAKEUP);
        ret = wilc->hif_func->hif_read_reg(wilc, WILC_GP_REG_0, &reg);
-        if (!ret)
+        if (!ret) {
                release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
+                return;
+        }
        ret = wilc->hif_func->hif_write_reg(wilc, WILC_GP_REG_0,
                                        (reg | ABORT_INT));
-        if (!ret)
+        if (!ret) {
                release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
+                return;
+        }
        release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
        wilc->hif_func->hif_deinit(NULL);
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 6fde75d4f064..ab734534093b 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -3119,7 +3119,9 @@ static void hfa384x_usbin_callback(struct urb *urb)
                break;
        }
+        /* Save values from the RX URB before reposting overwrites it. */
        urb_status = urb->status;
+        usbin = (union hfa384x_usbin *)urb->transfer_buffer;
        if (action != ABORT) {
                /* Repost the RX URB */
@@ -3136,7 +3138,6 @@ static void hfa384x_usbin_callback(struct urb *urb)
        /* Note: the check of the sw_support field, the type field doesn't
         *       have bit 12 set like the docs suggest.
         */
-        usbin = (union hfa384x_usbin *)urb->transfer_buffer;
        type = le16_to_cpu(usbin->type);
        if (HFA384x_USB_ISRXFRM(type)) {
                if (action == HANDLE) {
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index dff75dc94731..8b752e895053 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1165,7 +1165,6 @@ static void imx_uart_clear_rx_errors(struct imx_port *sport)
                        sport->port.icount.buf_overrun++;
                tty_flip_buffer_push(port);
        } else {
-                dev_err(sport->port.dev, "DMA transaction error.\n");
                if (usr1 & USR1_FRAMERR) {
                        sport->port.icount.frame++;
                        imx_uart_writel(sport, USR1_FRAMERR, USR1);
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index 450ba6d7996c..e5aebbf5f302 100644
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -581,7 +581,7 @@ static int max310x_set_ref_clk(struct device *dev, struct max310x_port *s,
        }
        /* Configure clock source */
-        clksrc = xtal ? MAX310X_CLKSRC_CRYST_BIT : MAX310X_CLKSRC_EXTCLK_BIT;
+        clksrc = MAX310X_CLKSRC_EXTCLK_BIT | (xtal ? MAX310X_CLKSRC_CRYST_BIT : 0);
        /* Configure PLL */
        if (pllcfg) {
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index 109096033bb1..23833ad952ba 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -860,6 +860,7 @@ static void msm_handle_tx(struct uart_port *port)
        struct circ_buf *xmit = &msm_port->uart.state->xmit;
        struct msm_dma *dma = &msm_port->tx_dma;
        unsigned int pio_count, dma_count, dma_min;
+        char buf[4] = { 0 };
        void __iomem *tf;
        int err = 0;
@@ -869,10 +870,12 @@ static void msm_handle_tx(struct uart_port *port)
                else
                        tf = port->membase + UART_TF;
+                buf[0] = port->x_char;
                if (msm_port->is_uartdm)
                        msm_reset_dm_count(port, 1);
-                iowrite8_rep(tf, &port->x_char, 1);
+                iowrite32_rep(tf, buf, 1);
                port->icount.tx++;
                port->x_char = 0;
                return;
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 3cd139752d3f..abc705716aa0 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1557,6 +1557,13 @@ static void sci_request_dma(struct uart_port *port)
        dev_dbg(port->dev, "%s: port %d\n", __func__, port->line);
+        /*
+         * DMA on console may interfere with Kernel log messages which use
+         * plain putchar(). So, simply don't use it with a console.
+         */
+        if (uart_console(port))
+                return;
        if (!port->dev->of_node)
                return;
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index fdd12f8c3deb..5c0ca1c24b6f 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -1056,6 +1056,13 @@ static void visual_init(struct vc_data *vc, int num, int init)
        vc->vc_screenbuf_size = vc->vc_rows * vc->vc_size_row;
 }
+static void visual_deinit(struct vc_data *vc)
+{
+        vc->vc_sw->con_deinit(vc);
+        module_put(vc->vc_sw->owner);
+}
 int vc_allocate(unsigned int currcons)  /* return 0 on success */
 {
        struct vt_notifier_param param;
@@ -1103,6 +1110,7 @@ int vc_allocate(unsigned int currcons)	/* return 0 on success */
        return 0;
 err_free:
+        visual_deinit(vc);
        kfree(vc);
        vc_cons[currcons].d = NULL;
        return -ENOMEM;
@@ -1331,9 +1339,8 @@ struct vc_data *vc_deallocate(unsigned int currcons)
                param.vc = vc = vc_cons[currcons].d;
                atomic_notifier_call_chain(&vt_notifier_list, VT_DEALLOCATE, &param);
                vcs_remove_sysfs(currcons);
-                vc->vc_sw->con_deinit(vc);
+                visual_deinit(vc);
                put_pid(vc->vt_pid);
-                module_put(vc->vc_sw->owner);
                vc_uniscr_set(vc, NULL);
                kfree(vc->vc_screenbuf);
                vc_cons[currcons].d = NULL;
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 20ff036b4c22..9d6cb709ca7b 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -932,8 +932,8 @@ int usb_get_bos_descriptor(struct usb_device *dev)
        /* Get BOS descriptor */
        ret = usb_get_descriptor(dev, USB_DT_BOS, 0, bos, USB_DT_BOS_SIZE);
-        if (ret < USB_DT_BOS_SIZE) {
+        if (ret < USB_DT_BOS_SIZE || bos->bLength < USB_DT_BOS_SIZE) {
-                dev_err(ddev, "unable to get BOS descriptor\n");
+                dev_err(ddev, "unable to get BOS descriptor or descriptor too short\n");
                if (ret >= 0)
                        ret = -ENOMSG;
                kfree(bos);
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 8bc35d53408b..6082b008969b 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -209,6 +209,9 @@ static const struct usb_device_id usb_quirk_list[] = {
        /* Microsoft LifeCam-VX700 v2.0 */
        { USB_DEVICE(0x045e, 0x0770), .driver_info = USB_QUIRK_RESET_RESUME },
+        /* Microsoft Surface Dock Ethernet (RTL8153 GigE) */
+        { USB_DEVICE(0x045e, 0x07c6), .driver_info = USB_QUIRK_NO_LPM },
        /* Cherry Stream G230 2.0 (G85-231) and 3.0 (G85-232) */
        { USB_DEVICE(0x046a, 0x0023), .driver_info = USB_QUIRK_RESET_RESUME },
diff --git a/drivers/usb/host/xhci-debugfs.c b/drivers/usb/host/xhci-debugfs.c
index cadc01336bf8..7ba6afc7ef23 100644
--- a/drivers/usb/host/xhci-debugfs.c
+++ b/drivers/usb/host/xhci-debugfs.c
@@ -440,6 +440,9 @@ void xhci_debugfs_create_endpoint(struct xhci_hcd *xhci,
        struct xhci_ep_priv     *epriv;
        struct xhci_slot_priv   *spriv = dev->debugfs_private;
+        if (!spriv)
+                return;
        if (spriv->eps[ep_index])
                return;
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index fed3385aeac0..feffceb31e8a 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -656,6 +656,7 @@ static void xhci_unmap_td_bounce_buffer(struct xhci_hcd *xhci,
        struct device *dev = xhci_to_hcd(xhci)->self.controller;
        struct xhci_segment *seg = td->bounce_seg;
        struct urb *urb = td->urb;
+        size_t len;
        if (!ring || !seg || !urb)
                return;
@@ -666,11 +667,14 @@ static void xhci_unmap_td_bounce_buffer(struct xhci_hcd *xhci,
                return;
        }
-        /* for in tranfers we need to copy the data from bounce to sg */
-        sg_pcopy_from_buffer(urb->sg, urb->num_mapped_sgs, seg->bounce_buf,
-                             seg->bounce_len, seg->bounce_offs);
        dma_unmap_single(dev, seg->bounce_dma, ring->bounce_buf_len,
                         DMA_FROM_DEVICE);
+        /* for in tranfers we need to copy the data from bounce to sg */
+        len = sg_pcopy_from_buffer(urb->sg, urb->num_sgs, seg->bounce_buf,
+                             seg->bounce_len, seg->bounce_offs);
+        if (len != seg->bounce_len)
+                xhci_warn(xhci, "WARN Wrong bounce buffer read length: %zu != %d\n",
+                                len, seg->bounce_len);
        seg->bounce_len = 0;
        seg->bounce_offs = 0;
 }
@@ -3127,6 +3131,7 @@ static int xhci_align_td(struct xhci_hcd *xhci, struct urb *urb, u32 enqd_len,
        unsigned int unalign;
        unsigned int max_pkt;
        u32 new_buff_len;
+        size_t len;
        max_pkt = usb_endpoint_maxp(&urb->ep->desc);
        unalign = (enqd_len + *trb_buff_len) % max_pkt;
@@ -3157,8 +3162,12 @@ static int xhci_align_td(struct xhci_hcd *xhci, struct urb *urb, u32 enqd_len,
        /* create a max max_pkt sized bounce buffer pointed to by last trb */
        if (usb_urb_dir_out(urb)) {
-                sg_pcopy_to_buffer(urb->sg, urb->num_mapped_sgs,
+                len = sg_pcopy_to_buffer(urb->sg, urb->num_sgs,
                                   seg->bounce_buf, new_buff_len, enqd_len);
+                if (len != seg->bounce_len)
+                        xhci_warn(xhci,
+                                "WARN Wrong bounce buffer write length: %zu != %d\n",
+                                len, seg->bounce_len);
                seg->bounce_dma = dma_map_single(dev, seg->bounce_buf,
                                                 max_pkt, DMA_TO_DEVICE);
        } else {
@@ -3423,11 +3432,14 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
        if (urb->transfer_buffer_length > 0) {
                u32 length_field, remainder;
+                u64 addr;
                if (xhci_urb_suitable_for_idt(urb)) {
-                        memcpy(&urb->transfer_dma, urb->transfer_buffer,
+                        memcpy(&addr, urb->transfer_buffer,
                               urb->transfer_buffer_length);
                        field |= TRB_IDT;
+                } else {
+                        addr = (u64) urb->transfer_dma;
                }
                remainder = xhci_td_remainder(xhci, 0,
@@ -3440,8 +3452,8 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                if (setup->bRequestType & USB_DIR_IN)
                        field |= TRB_DIR_IN;
                queue_trb(xhci, ep_ring, true,
-                                lower_32_bits(urb->transfer_dma),
+                                lower_32_bits(addr),
-                                upper_32_bits(urb->transfer_dma),
+                                upper_32_bits(addr),
                                length_field,
                                field | ep_ring->cycle_state);
        }
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index a9bb796794e3..20db378a6012 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -9,6 +9,7 @@
 */
 #include <linux/pci.h>
+#include <linux/iopoll.h>
 #include <linux/irq.h>
 #include <linux/log2.h>
 #include <linux/module.h>
@@ -52,7 +53,6 @@ static bool td_on_ring(struct xhci_td *td, struct xhci_ring *ring)
        return false;
 }
-/* TODO: copied from ehci-hcd.c - can this be refactored? */
 /*
 * xhci_handshake - spin reading hc until handshake completes or fails
 * @ptr: address of hc register to be read
@@ -69,18 +69,16 @@ static bool td_on_ring(struct xhci_td *td, struct xhci_ring *ring)
 int xhci_handshake(void __iomem *ptr, u32 mask, u32 done, int usec)
 {
        u32     result;
+        int     ret;
-        do {
+        ret = readl_poll_timeout_atomic(ptr, result,
-                result = readl(ptr);
+                                        (result & mask) == done ||
-                if (result == ~(u32)0)          /* card removed */
+                                        result == U32_MAX,
-                        return -ENODEV;
+                                        1, usec);
-                result &= mask;
+        if (result == U32_MAX)          /* card removed */
-                if (result == done)
+                return -ENODEV;
-                        return 0;
-                udelay(1);
+        return ret;
-                usec--;
-        } while (usec > 0);
-        return -ETIMEDOUT;
 }
 /*
@@ -4320,7 +4318,6 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,
        pm_addr = ports[port_num]->addr + PORTPMSC;
        pm_val = readl(pm_addr);
        hlpm_addr = ports[port_num]->addr + PORTHLPMC;
-        field = le32_to_cpu(udev->bos->ext_cap->bmAttributes);
        xhci_dbg(xhci, "%s port %d USB2 hardware LPM\n",
                        enable ? "enable" : "disable", port_num + 1);
@@ -4332,6 +4329,7 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,
                         * default one which works with mixed HIRD and BESL
                         * systems. See XHCI_DEFAULT_BESL definition in xhci.h
                         */
+                        field = le32_to_cpu(udev->bos->ext_cap->bmAttributes);
                        if ((field & USB_BESL_SUPPORT) &&
                            (field & USB_BESL_BASELINE_VALID))
                                hird = USB_GET_BESL_BASELINE(field);
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index a450a99e90eb..7f8b950d1a73 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -2160,7 +2160,8 @@ static inline bool xhci_urb_suitable_for_idt(struct urb *urb)
 {
        if (!usb_endpoint_xfer_isoc(&urb->ep->desc) && usb_urb_dir_out(urb) &&
            usb_endpoint_maxp(&urb->ep->desc) >= TRB_IDT_MAX_SIZE &&
-            urb->transfer_buffer_length <= TRB_IDT_MAX_SIZE)
+            urb->transfer_buffer_length <= TRB_IDT_MAX_SIZE &&
+            !(urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP))
                return true;
        return false;
diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c
index 7b9adeb3e7aa..27e9c78a791e 100644
--- a/drivers/usb/misc/rio500.c
+++ b/drivers/usb/misc/rio500.c
@@ -51,7 +51,6 @@ struct rio_usb_data {
        char *obuf, *ibuf;              /* transfer buffers */
        char bulk_in_ep, bulk_out_ep;   /* Endpoint assignments */
        wait_queue_head_t wait_q;       /* for timeouts */
-        struct mutex lock;          /* general race avoidance */
 };
 static DEFINE_MUTEX(rio500_mutex);
@@ -63,10 +62,8 @@ static int open_rio(struct inode *inode, struct file *file)
        /* against disconnect() */
        mutex_lock(&rio500_mutex);
-        mutex_lock(&(rio->lock));
        if (rio->isopen || !rio->present) {
-                mutex_unlock(&(rio->lock));
                mutex_unlock(&rio500_mutex);
                return -EBUSY;
        }
@@ -74,7 +71,6 @@ static int open_rio(struct inode *inode, struct file *file)
        init_waitqueue_head(&rio->wait_q);
-        mutex_unlock(&(rio->lock));
        dev_info(&rio->rio_dev->dev, "Rio opened.\n");
        mutex_unlock(&rio500_mutex);
@@ -86,9 +82,20 @@ static int close_rio(struct inode *inode, struct file *file)
 {
        struct rio_usb_data *rio = &rio_instance;
-        rio->isopen = 0;
+        /* against disconnect() */
+        mutex_lock(&rio500_mutex);
-        dev_info(&rio->rio_dev->dev, "Rio closed.\n");
+        rio->isopen = 0;
+        if (!rio->present) {
+                /* cleanup has been delayed */
+                kfree(rio->ibuf);
+                kfree(rio->obuf);
+                rio->ibuf = NULL;
+                rio->obuf = NULL;
+        } else {
+                dev_info(&rio->rio_dev->dev, "Rio closed.\n");
+        }
+        mutex_unlock(&rio500_mutex);
        return 0;
 }
@@ -102,7 +109,7 @@ static long ioctl_rio(struct file *file, unsigned int cmd, unsigned long arg)
        int retries;
        int retval=0;
-        mutex_lock(&(rio->lock));
+        mutex_lock(&rio500_mutex);
        /* Sanity check to make sure rio is connected, powered, etc */
        if (rio->present == 0 || rio->rio_dev == NULL) {
                retval = -ENODEV;
@@ -246,7 +253,7 @@ static long ioctl_rio(struct file *file, unsigned int cmd, unsigned long arg)
 err_out:
-        mutex_unlock(&(rio->lock));
+        mutex_unlock(&rio500_mutex);
        return retval;
 }
@@ -266,12 +273,12 @@ write_rio(struct file *file, const char __user *buffer,
        int errn = 0;
        int intr;
-        intr = mutex_lock_interruptible(&(rio->lock));
+        intr = mutex_lock_interruptible(&rio500_mutex);
        if (intr)
                return -EINTR;
        /* Sanity check to make sure rio is connected, powered, etc */
        if (rio->present == 0 || rio->rio_dev == NULL) {
-                mutex_unlock(&(rio->lock));
+                mutex_unlock(&rio500_mutex);
                return -ENODEV;
        }
@@ -294,7 +301,7 @@ write_rio(struct file *file, const char __user *buffer,
                                goto error;
                        }
                        if (signal_pending(current)) {
-                                mutex_unlock(&(rio->lock));
+                                mutex_unlock(&rio500_mutex);
                                return bytes_written ? bytes_written : -EINTR;
                        }
@@ -332,12 +339,12 @@ write_rio(struct file *file, const char __user *buffer,
                buffer += copy_size;
        } while (count > 0);
-        mutex_unlock(&(rio->lock));
+        mutex_unlock(&rio500_mutex);
        return bytes_written ? bytes_written : -EIO;
 error:
-        mutex_unlock(&(rio->lock));
+        mutex_unlock(&rio500_mutex);
        return errn;
 }
@@ -354,12 +361,12 @@ read_rio(struct file *file, char __user *buffer, size_t count, loff_t * ppos)
        char *ibuf;
        int intr;
-        intr = mutex_lock_interruptible(&(rio->lock));
+        intr = mutex_lock_interruptible(&rio500_mutex);
        if (intr)
                return -EINTR;
        /* Sanity check to make sure rio is connected, powered, etc */
        if (rio->present == 0 || rio->rio_dev == NULL) {
-                mutex_unlock(&(rio->lock));
+                mutex_unlock(&rio500_mutex);
                return -ENODEV;
        }
@@ -370,11 +377,11 @@ read_rio(struct file *file, char __user *buffer, size_t count, loff_t * ppos)
        while (count > 0) {
                if (signal_pending(current)) {
-                        mutex_unlock(&(rio->lock));
+                        mutex_unlock(&rio500_mutex);
                        return read_count ? read_count : -EINTR;
                }
                if (!rio->rio_dev) {
-                        mutex_unlock(&(rio->lock));
+                        mutex_unlock(&rio500_mutex);
                        return -ENODEV;
                }
                this_read = (count >= IBUF_SIZE) ? IBUF_SIZE : count;
@@ -392,7 +399,7 @@ read_rio(struct file *file, char __user *buffer, size_t count, loff_t * ppos)
                        count = this_read = partial;
                } else if (result == -ETIMEDOUT || result == 15) {      /* FIXME: 15 ??? */
                        if (!maxretry--) {
-                                mutex_unlock(&(rio->lock));
+                                mutex_unlock(&rio500_mutex);
                                dev_err(&rio->rio_dev->dev,
                                        "read_rio: maxretry timeout\n");
                                return -ETIME;
@@ -402,19 +409,19 @@ read_rio(struct file *file, char __user *buffer, size_t count, loff_t * ppos)
                        finish_wait(&rio->wait_q, &wait);
                        continue;
                } else if (result != -EREMOTEIO) {
-                        mutex_unlock(&(rio->lock));
+                        mutex_unlock(&rio500_mutex);
                        dev_err(&rio->rio_dev->dev,
                                "Read Whoops - result:%d partial:%u this_read:%u\n",
                                result, partial, this_read);
                        return -EIO;
                } else {
-                        mutex_unlock(&(rio->lock));
+                        mutex_unlock(&rio500_mutex);
                        return (0);
                }
                if (this_read) {
                        if (copy_to_user(buffer, ibuf, this_read)) {
-                                mutex_unlock(&(rio->lock));
+                                mutex_unlock(&rio500_mutex);
                                return -EFAULT;
                        }
                        count -= this_read;
@@ -422,7 +429,7 @@ read_rio(struct file *file, char __user *buffer, size_t count, loff_t * ppos)
                        buffer += this_read;
                }
        }
-        mutex_unlock(&(rio->lock));
+        mutex_unlock(&rio500_mutex);
        return read_count;
 }
@@ -447,15 +454,23 @@ static int probe_rio(struct usb_interface *intf,
 {
        struct usb_device *dev = interface_to_usbdev(intf);
        struct rio_usb_data *rio = &rio_instance;
-        int retval;
+        int retval = 0;
-        dev_info(&intf->dev, "USB Rio found at address %d\n", dev->devnum);
+        mutex_lock(&rio500_mutex);
+        if (rio->present) {
+                dev_info(&intf->dev, "Second USB Rio at address %d refused\n", dev->devnum);
+                retval = -EBUSY;
+                goto bail_out;
+        } else {
+                dev_info(&intf->dev, "USB Rio found at address %d\n", dev->devnum);
+        }
        retval = usb_register_dev(intf, &usb_rio_class);
        if (retval) {
                dev_err(&dev->dev,
                        "Not able to get a minor for this device.\n");
-                return -ENOMEM;
+                retval = -ENOMEM;
+                goto bail_out;
        }
        rio->rio_dev = dev;
@@ -464,7 +479,8 @@ static int probe_rio(struct usb_interface *intf,
                dev_err(&dev->dev,
                        "probe_rio: Not enough memory for the output buffer\n");
                usb_deregister_dev(intf, &usb_rio_class);
-                return -ENOMEM;
+                retval = -ENOMEM;
+                goto bail_out;
        }
        dev_dbg(&intf->dev, "obuf address:%p\n", rio->obuf);
@@ -473,16 +489,17 @@ static int probe_rio(struct usb_interface *intf,
                        "probe_rio: Not enough memory for the input buffer\n");
                usb_deregister_dev(intf, &usb_rio_class);
                kfree(rio->obuf);
-                return -ENOMEM;
+                retval = -ENOMEM;
+                goto bail_out;
        }
        dev_dbg(&intf->dev, "ibuf address:%p\n", rio->ibuf);
-        mutex_init(&(rio->lock));
        usb_set_intfdata (intf, rio);
        rio->present = 1;
+bail_out:
+        mutex_unlock(&rio500_mutex);
-        return 0;
+        return retval;
 }
 static void disconnect_rio(struct usb_interface *intf)
@@ -494,12 +511,10 @@ static void disconnect_rio(struct usb_interface *intf)
        if (rio) {
                usb_deregister_dev(intf, &usb_rio_class);
-                mutex_lock(&(rio->lock));
                if (rio->isopen) {
                        rio->isopen = 0;
                        /* better let it finish - the release will do whats needed */
                        rio->rio_dev = NULL;
-                        mutex_unlock(&(rio->lock));
                        mutex_unlock(&rio500_mutex);
                        return;
                }
@@ -509,7 +524,6 @@ static void disconnect_rio(struct usb_interface *intf)
                dev_info(&intf->dev, "USB Rio disconnected.\n");
                rio->present = 0;
-                mutex_unlock(&(rio->lock));
        }
        mutex_unlock(&rio500_mutex);
 }
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 9560fde621ee..ea06f1fed6fa 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -3029,6 +3029,13 @@ static int sisusb_probe(struct usb_interface *intf,
        mutex_init(&(sisusb->lock));
+        sisusb->sisusb_dev = dev;
+        sisusb->vrambase   = SISUSB_PCI_MEMBASE;
+        sisusb->mmiobase   = SISUSB_PCI_MMIOBASE;
+        sisusb->mmiosize   = SISUSB_PCI_MMIOSIZE;
+        sisusb->ioportbase = SISUSB_PCI_IOPORTBASE;
+        /* Everything else is zero */
        /* Register device */
        retval = usb_register_dev(intf, &usb_sisusb_class);
        if (retval) {
@@ -3039,13 +3046,7 @@ static int sisusb_probe(struct usb_interface *intf,
                goto error_1;
        }
-        sisusb->sisusb_dev = dev;
+        sisusb->minor = intf->minor;
-        sisusb->minor      = intf->minor;
-        sisusb->vrambase   = SISUSB_PCI_MEMBASE;
-        sisusb->mmiobase   = SISUSB_PCI_MMIOBASE;
-        sisusb->mmiosize   = SISUSB_PCI_MMIOSIZE;
-        sisusb->ioportbase = SISUSB_PCI_IOPORTBASE;
-        /* Everything else is zero */
        /* Allocate buffers */
        sisusb->ibufsize = SISUSB_IBUF_SIZE;
diff --git a/drivers/usb/mtu3/mtu3_debugfs.c b/drivers/usb/mtu3/mtu3_debugfs.c
index 62c57ddc554e..b7c86ccd50b4 100644
--- a/drivers/usb/mtu3/mtu3_debugfs.c
+++ b/drivers/usb/mtu3/mtu3_debugfs.c
@@ -528,8 +528,7 @@ void ssusb_dr_debugfs_init(struct ssusb_mtk *ssusb)
 void ssusb_debugfs_create_root(struct ssusb_mtk *ssusb)
 {
-        ssusb->dbgfs_root =
+        ssusb->dbgfs_root = debugfs_create_dir(dev_name(ssusb->dev), NULL);
-                debugfs_create_dir(dev_name(ssusb->dev), usb_debug_root);
 }
 void ssusb_debugfs_remove_root(struct ssusb_mtk *ssusb)
diff --git a/drivers/usb/usbip/stub_dev.c b/drivers/usb/usbip/stub_dev.c
index c0d6ff1baa72..7931e6cecc70 100644
--- a/drivers/usb/usbip/stub_dev.c
+++ b/drivers/usb/usbip/stub_dev.c
@@ -301,9 +301,17 @@ static int stub_probe(struct usb_device *udev)
        const char *udev_busid = dev_name(&udev->dev);
        struct bus_id_priv *busid_priv;
        int rc = 0;
+        char save_status;
        dev_dbg(&udev->dev, "Enter probe\n");
+        /* Not sure if this is our device. Allocate here to avoid
+         * calling alloc while holding busid_table lock.
+         */
+        sdev = stub_device_alloc(udev);
+        if (!sdev)
+                return -ENOMEM;
        /* check we should claim or not by busid_table */
        busid_priv = get_busid_priv(udev_busid);
        if (!busid_priv || (busid_priv->status == STUB_BUSID_REMOV) ||
@@ -318,6 +326,9 @@ static int stub_probe(struct usb_device *udev)
                 * See driver_probe_device() in driver/base/dd.c
                 */
                rc = -ENODEV;
+                if (!busid_priv)
+                        goto sdev_free;
                goto call_put_busid_priv;
        }
@@ -337,12 +348,6 @@ static int stub_probe(struct usb_device *udev)
                goto call_put_busid_priv;
        }
-        /* ok, this is my device */
-        sdev = stub_device_alloc(udev);
-        if (!sdev) {
-                rc = -ENOMEM;
-                goto call_put_busid_priv;
-        }
        dev_info(&udev->dev,
                "usbip-host: register new device (bus %u dev %u)\n",
@@ -352,9 +357,16 @@ static int stub_probe(struct usb_device *udev)
        /* set private data to usb_device */
        dev_set_drvdata(&udev->dev, sdev);
        busid_priv->sdev = sdev;
        busid_priv->udev = udev;
+        save_status = busid_priv->status;
+        busid_priv->status = STUB_BUSID_ALLOC;
+        /* release the busid_lock */
+        put_busid_priv(busid_priv);
        /*
         * Claim this hub port.
         * It doesn't matter what value we pass as owner
@@ -372,10 +384,8 @@ static int stub_probe(struct usb_device *udev)
                dev_err(&udev->dev, "stub_add_files for %s\n", udev_busid);
                goto err_files;
        }
-        busid_priv->status = STUB_BUSID_ALLOC;
-        rc = 0;
+        return 0;
-        goto call_put_busid_priv;
 err_files:
        usb_hub_release_port(udev->parent, udev->portnum,
@@ -384,23 +394,30 @@ err_port:
        dev_set_drvdata(&udev->dev, NULL);
        usb_put_dev(udev);
+        /* we already have busid_priv, just lock busid_lock */
+        spin_lock(&busid_priv->busid_lock);
        busid_priv->sdev = NULL;
-        stub_device_free(sdev);
+        busid_priv->status = save_status;
+        spin_unlock(&busid_priv->busid_lock);
+        /* lock is released - go to free */
+        goto sdev_free;
 call_put_busid_priv:
+        /* release the busid_lock */
        put_busid_priv(busid_priv);
+sdev_free:
+        stub_device_free(sdev);
        return rc;
 }
 static void shutdown_busid(struct bus_id_priv *busid_priv)
 {
-        if (busid_priv->sdev && !busid_priv->shutdown_busid) {
+        usbip_event_add(&busid_priv->sdev->ud, SDEV_EVENT_REMOVED);
-                busid_priv->shutdown_busid = 1;
-                usbip_event_add(&busid_priv->sdev->ud, SDEV_EVENT_REMOVED);
-                /* wait for the stop of the event handler */
+        /* wait for the stop of the event handler */
-                usbip_stop_eh(&busid_priv->sdev->ud);
+        usbip_stop_eh(&busid_priv->sdev->ud);
-        }
 }
 /*
@@ -427,11 +444,16 @@ static void stub_disconnect(struct usb_device *udev)
        /* get stub_device */
        if (!sdev) {
                dev_err(&udev->dev, "could not get device");
-                goto call_put_busid_priv;
+                /* release busid_lock */
+                put_busid_priv(busid_priv);
+                return;
        }
        dev_set_drvdata(&udev->dev, NULL);
+        /* release busid_lock before call to remove device files */
+        put_busid_priv(busid_priv);
        /*
         * NOTE: rx/tx threads are invoked for each usb_device.
         */
@@ -442,27 +464,36 @@ static void stub_disconnect(struct usb_device *udev)
                                  (struct usb_dev_state *) udev);
        if (rc) {
                dev_dbg(&udev->dev, "unable to release port\n");
-                goto call_put_busid_priv;
+                return;
        }
        /* If usb reset is called from event handler */
        if (usbip_in_eh(current))
-                goto call_put_busid_priv;
+                return;
+        /* we already have busid_priv, just lock busid_lock */
+        spin_lock(&busid_priv->busid_lock);
+        if (!busid_priv->shutdown_busid)
+                busid_priv->shutdown_busid = 1;
+        /* release busid_lock */
+        spin_unlock(&busid_priv->busid_lock);
        /* shutdown the current connection */
        shutdown_busid(busid_priv);
        usb_put_dev(sdev->udev);
+        /* we already have busid_priv, just lock busid_lock */
+        spin_lock(&busid_priv->busid_lock);
        /* free sdev */
        busid_priv->sdev = NULL;
        stub_device_free(sdev);
        if (busid_priv->status == STUB_BUSID_ALLOC)
                busid_priv->status = STUB_BUSID_ADDED;
+        /* release busid_lock */
-call_put_busid_priv:
+        spin_unlock(&busid_priv->busid_lock);
-        put_busid_priv(busid_priv);
+        return;
 }
 #ifdef CONFIG_PM
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index 786f9aab55df..a9c69ae30878 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -1248,7 +1248,7 @@ finished:
        if (free_font)
                vc->vc_font.data = NULL;
-        if (vc->vc_hi_font_mask)
+        if (vc->vc_hi_font_mask && vc->vc_screenbuf)
                set_vc_hi_font(vc, false);
        if (!con_is_bound(&fb_con))
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 55c15f31d00d..ee0989c7e3a9 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -603,17 +603,33 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
        }
        btrfs_wait_ordered_roots(fs_info, U64_MAX, 0, (u64)-1);
-        trans = btrfs_start_transaction(root, 0);
+        /*
-        if (IS_ERR(trans)) {
+         * We have to use this loop approach because at this point src_device
-                mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);
+         * has to be available for transaction commit to complete, yet new
-                return PTR_ERR(trans);
+         * chunks shouldn't be allocated on the device.
+         */
+        while (1) {
+                trans = btrfs_start_transaction(root, 0);
+                if (IS_ERR(trans)) {
+                        mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);
+                        return PTR_ERR(trans);
+                }
+                ret = btrfs_commit_transaction(trans);
+                WARN_ON(ret);
+                /* Prevent write_all_supers() during the finishing procedure */
+                mutex_lock(&fs_info->fs_devices->device_list_mutex);
+                /* Prevent new chunks being allocated on the source device */
+                mutex_lock(&fs_info->chunk_mutex);
+                if (!list_empty(&src_device->post_commit_list)) {
+                        mutex_unlock(&fs_info->fs_devices->device_list_mutex);
+                        mutex_unlock(&fs_info->chunk_mutex);
+                } else {
+                        break;
+                }
        }
-        ret = btrfs_commit_transaction(trans);
-        WARN_ON(ret);
-        /* keep away write_all_supers() during the finishing procedure */
-        mutex_lock(&fs_info->fs_devices->device_list_mutex);
-        mutex_lock(&fs_info->chunk_mutex);
        down_write(&dev_replace->rwsem);
        dev_replace->replace_state =
                scrub_ret ? BTRFS_IOCTL_DEV_REPLACE_STATE_CANCELED
@@ -662,7 +678,6 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
        btrfs_device_set_disk_total_bytes(tgt_device,
                                          src_device->disk_total_bytes);
        btrfs_device_set_bytes_used(tgt_device, src_device->bytes_used);
-        ASSERT(list_empty(&src_device->post_commit_list));
        tgt_device->commit_total_bytes = src_device->commit_total_bytes;
        tgt_device->commit_bytes_used = src_device->bytes_used;
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 9aba9660efe5..a2aabdb85226 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6433,8 +6433,18 @@ int btrfs_add_link(struct btrfs_trans_handle *trans,
        btrfs_i_size_write(parent_inode, parent_inode->vfs_inode.i_size +
                           name_len * 2);
        inode_inc_iversion(&parent_inode->vfs_inode);
-        parent_inode->vfs_inode.i_mtime = parent_inode->vfs_inode.i_ctime =
+        /*
-                current_time(&parent_inode->vfs_inode);
+         * If we are replaying a log tree, we do not want to update the mtime
+         * and ctime of the parent directory with the current time, since the
+         * log replay procedure is responsible for setting them to their correct
+         * values (the ones it had when the fsync was done).
+         */
+        if (!test_bit(BTRFS_FS_LOG_RECOVERING, &root->fs_info->flags)) {
+                struct timespec64 now = current_time(&parent_inode->vfs_inode);
+                parent_inode->vfs_inode.i_mtime = now;
+                parent_inode->vfs_inode.i_ctime = now;
+        }
        ret = btrfs_update_inode(trans, root, &parent_inode->vfs_inode);
        if (ret)
                btrfs_abort_transaction(trans, ret);
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 2f708f2c4e67..3e6ffbbd8b0a 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -3830,7 +3830,13 @@ int btrfs_qgroup_add_swapped_blocks(struct btrfs_trans_handle *trans,
                                                            subvol_slot);
        block->last_snapshot = last_snapshot;
        block->level = level;
-        if (bg->flags & BTRFS_BLOCK_GROUP_DATA)
+        /*
+         * If we have bg == NULL, we're called from btrfs_recover_relocation(),
+         * no one else can modify tree blocks thus we qgroup will not change
+         * no matter the value of trace_leaf.
+         */
+        if (bg && bg->flags & BTRFS_BLOCK_GROUP_DATA)
                block->trace_leaf = true;
        else
                block->trace_leaf = false;
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index a459ecddcce4..22a3c69864fa 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2177,22 +2177,30 @@ static int clean_dirty_subvols(struct reloc_control *rc)
        struct btrfs_root *root;
        struct btrfs_root *next;
        int ret = 0;
+        int ret2;
        list_for_each_entry_safe(root, next, &rc->dirty_subvol_roots,
                                 reloc_dirty_list) {
-                struct btrfs_root *reloc_root = root->reloc_root;
+                if (root->root_key.objectid != BTRFS_TREE_RELOC_OBJECTID) {
+                        /* Merged subvolume, cleanup its reloc root */
+                        struct btrfs_root *reloc_root = root->reloc_root;
-                clear_bit(BTRFS_ROOT_DEAD_RELOC_TREE, &root->state);
+                        clear_bit(BTRFS_ROOT_DEAD_RELOC_TREE, &root->state);
-                list_del_init(&root->reloc_dirty_list);
+                        list_del_init(&root->reloc_dirty_list);
-                root->reloc_root = NULL;
+                        root->reloc_root = NULL;
-                if (reloc_root) {
+                        if (reloc_root) {
-                        int ret2;
-                        ret2 = btrfs_drop_snapshot(reloc_root, NULL, 0, 1);
+                                ret2 = btrfs_drop_snapshot(reloc_root, NULL, 0, 1);
+                                if (ret2 < 0 && !ret)
+                                        ret = ret2;
+                        }
+                        btrfs_put_fs_root(root);
+                } else {
+                        /* Orphan reloc tree, just clean it up */
+                        ret2 = btrfs_drop_snapshot(root, NULL, 0, 1);
                        if (ret2 < 0 && !ret)
                                ret = ret2;
                }
-                btrfs_put_fs_root(root);
        }
        return ret;
 }
@@ -2480,6 +2488,9 @@ again:
                        }
                } else {
                        list_del_init(&reloc_root->root_list);
+                        /* Don't forget to queue this reloc root for cleanup */
+                        list_add_tail(&reloc_root->reloc_dirty_list,
+                                      &rc->dirty_subvol_roots);
                }
        }
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index dd38dfe174df..f7fe4770f0e5 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -4999,6 +4999,12 @@ static int send_hole(struct send_ctx *sctx, u64 end)
        if (offset >= sctx->cur_inode_size)
                return 0;
+        /*
+         * Don't go beyond the inode's i_size due to prealloc extents that start
+         * after the i_size.
+         */
+        end = min_t(u64, end, sctx->cur_inode_size);
        if (sctx->flags & BTRFS_SEND_FLAG_NO_FILE_DATA)
                return send_update_extent(sctx, offset, end - offset);
@@ -5218,10 +5224,50 @@ static int clone_range(struct send_ctx *sctx,
                clone_len = min_t(u64, ext_len, len);
                if (btrfs_file_extent_disk_bytenr(leaf, ei) == disk_byte &&
-                    clone_data_offset == data_offset)
+                    clone_data_offset == data_offset) {
-                        ret = send_clone(sctx, offset, clone_len, clone_root);
+                        const u64 src_end = clone_root->offset + clone_len;
-                else
+                        const u64 sectorsize = SZ_64K;
+                        /*
+                         * We can't clone the last block, when its size is not
+                         * sector size aligned, into the middle of a file. If we
+                         * do so, the receiver will get a failure (-EINVAL) when
+                         * trying to clone or will silently corrupt the data in
+                         * the destination file if it's on a kernel without the
+                         * fix introduced by commit ac765f83f1397646
+                         * ("Btrfs: fix data corruption due to cloning of eof
+                         * block).
+                         *
+                         * So issue a clone of the aligned down range plus a
+                         * regular write for the eof block, if we hit that case.
+                         *
+                         * Also, we use the maximum possible sector size, 64K,
+                         * because we don't know what's the sector size of the
+                         * filesystem that receives the stream, so we have to
+                         * assume the largest possible sector size.
+                         */
+                        if (src_end == clone_src_i_size &&
+                            !IS_ALIGNED(src_end, sectorsize) &&
+                            offset + clone_len < sctx->cur_inode_size) {
+                                u64 slen;
+                                slen = ALIGN_DOWN(src_end - clone_root->offset,
+                                                  sectorsize);
+                                if (slen > 0) {
+                                        ret = send_clone(sctx, offset, slen,
+                                                         clone_root);
+                                        if (ret < 0)
+                                                goto out;
+                                }
+                                ret = send_extent_data(sctx, offset + slen,
+                                                       clone_len - slen);
+                        } else {
+                                ret = send_clone(sctx, offset, clone_len,
+                                                 clone_root);
+                        }
+                } else {
                        ret = send_extent_data(sctx, offset, clone_len);
+                }
                if (ret < 0)
                        goto out;
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 6c47f6ed3e94..3fc8d854d7fb 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -3110,6 +3110,12 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
        log->log_transid = root->log_transid;
        root->log_start_pid = 0;
        /*
+         * Update or create log root item under the root's log_mutex to prevent
+         * races with concurrent log syncs that can lead to failure to update
+         * log root item because it was not created yet.
+         */
+        ret = update_log_root(trans, log);
+        /*
         * IO has been started, blocks of the log tree have WRITTEN flag set
         * in their headers. new modifications of the log will be written to
         * new positions. so it's safe to allow log writers to go in.
@@ -3128,8 +3134,6 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
        mutex_unlock(&log_root_tree->log_mutex);
-        ret = update_log_root(trans, log);
        mutex_lock(&log_root_tree->log_mutex);
        if (atomic_dec_and_test(&log_root_tree->log_writers)) {
                /* atomic_dec_and_test implies a barrier */
@@ -5478,7 +5482,6 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans,
 {
        int ret = 0;
        struct dentry *old_parent = NULL;
-        struct btrfs_inode *orig_inode = inode;
        /*
         * for regular files, if its inode is already on disk, we don't
@@ -5498,16 +5501,6 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans,
        }
        while (1) {
-                /*
-                 * If we are logging a directory then we start with our inode,
-                 * not our parent's inode, so we need to skip setting the
-                 * logged_trans so that further down in the log code we don't
-                 * think this inode has already been logged.
-                 */
-                if (inode != orig_inode)
-                        inode->logged_trans = trans->transid;
-                smp_mb();
                if (btrfs_must_commit_transaction(trans, inode)) {
                        ret = 1;
                        break;
@@ -6384,7 +6377,6 @@ void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans,
         * if this directory was already logged any new
         * names for this file/dir will get recorded
         */
-        smp_mb();
        if (dir->logged_trans == trans->transid)
                return;
diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c
index a6ff07cf11d5..3837ca180d52 100644
--- a/fs/btrfs/zstd.c
+++ b/fs/btrfs/zstd.c
@@ -105,10 +105,10 @@ static void zstd_reclaim_timer_fn(struct timer_list *timer)
        unsigned long reclaim_threshold = jiffies - ZSTD_BTRFS_RECLAIM_JIFFIES;
        struct list_head *pos, *next;
-        spin_lock(&wsm.lock);
+        spin_lock_bh(&wsm.lock);
        if (list_empty(&wsm.lru_list)) {
-                spin_unlock(&wsm.lock);
+                spin_unlock_bh(&wsm.lock);
                return;
        }
@@ -137,7 +137,7 @@ static void zstd_reclaim_timer_fn(struct timer_list *timer)
        if (!list_empty(&wsm.lru_list))
                mod_timer(&wsm.timer, jiffies + ZSTD_BTRFS_RECLAIM_JIFFIES);
-        spin_unlock(&wsm.lock);
+        spin_unlock_bh(&wsm.lock);
 }
 /*
@@ -198,7 +198,7 @@ static void zstd_cleanup_workspace_manager(void)
        struct workspace *workspace;
        int i;
-        spin_lock(&wsm.lock);
+        spin_lock_bh(&wsm.lock);
        for (i = 0; i < ZSTD_BTRFS_MAX_LEVEL; i++) {
                while (!list_empty(&wsm.idle_ws[i])) {
                        workspace = container_of(wsm.idle_ws[i].next,
@@ -208,7 +208,7 @@ static void zstd_cleanup_workspace_manager(void)
                        zstd_free_workspace(&workspace->list);
                }
        }
-        spin_unlock(&wsm.lock);
+        spin_unlock_bh(&wsm.lock);
        del_timer_sync(&wsm.timer);
 }
@@ -230,7 +230,7 @@ static struct list_head *zstd_find_workspace(unsigned int level)
        struct workspace *workspace;
        int i = level - 1;
-        spin_lock(&wsm.lock);
+        spin_lock_bh(&wsm.lock);
        for_each_set_bit_from(i, &wsm.active_map, ZSTD_BTRFS_MAX_LEVEL) {
                if (!list_empty(&wsm.idle_ws[i])) {
                        ws = wsm.idle_ws[i].next;
@@ -242,11 +242,11 @@ static struct list_head *zstd_find_workspace(unsigned int level)
                                list_del(&workspace->lru_list);
                        if (list_empty(&wsm.idle_ws[i]))
                                clear_bit(i, &wsm.active_map);
-                        spin_unlock(&wsm.lock);
+                        spin_unlock_bh(&wsm.lock);
                        return ws;
                }
        }
-        spin_unlock(&wsm.lock);
+        spin_unlock_bh(&wsm.lock);
        return NULL;
 }
@@ -305,7 +305,7 @@ static void zstd_put_workspace(struct list_head *ws)
 {
        struct workspace *workspace = list_to_workspace(ws);
-        spin_lock(&wsm.lock);
+        spin_lock_bh(&wsm.lock);
        /* A node is only taken off the lru if we are the corresponding level */
        if (workspace->req_level == workspace->level) {
@@ -325,7 +325,7 @@ static void zstd_put_workspace(struct list_head *ws)
        list_add(&workspace->list, &wsm.idle_ws[workspace->level - 1]);
        workspace->req_level = 0;
-        spin_unlock(&wsm.lock);
+        spin_unlock_bh(&wsm.lock);
        if (workspace->level == ZSTD_BTRFS_MAX_LEVEL)
                cond_wake_up(&wsm.wait);
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 7731c459cfc3..d2ca5287762d 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -44,15 +44,13 @@ static void configfs_d_iput(struct dentry * dentry,
        if (sd) {
                /* Coordinate with configfs_readdir */
                spin_lock(&configfs_dirent_lock);
-                /* Coordinate with configfs_attach_attr where will increase
+                /*
-                 * sd->s_count and update sd->s_dentry to new allocated one.
+                 * Set sd->s_dentry to null only when this dentry is the one
-                 * Only set sd->dentry to null when this dentry is the only
+                 * that is going to be killed.  Otherwise configfs_d_iput may
-                 * sd owner.
+                 * run just after configfs_attach_attr and set sd->s_dentry to
-                 * If not do so, configfs_d_iput may run just after
+                 * NULL even it's still in use.
-                 * configfs_attach_attr and set sd->s_dentry to null
-                 * even it's still in use.
                 */
-                if (atomic_read(&sd->s_count) <= 2)
+                if (sd->s_dentry == dentry)
                        sd->s_dentry = NULL;
                spin_unlock(&configfs_dirent_lock);
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index e6ebc9761822..95991e4300bf 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -260,6 +260,15 @@ bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32,
 *      will remain unchanged.
 *      Returns a negative error code or zero. An error code must be returned
 *      if at least one unsupported change was requested.
+ * @get_rxfh_context: Get the contents of the RX flow hash indirection table,
+ *      hash key, and/or hash function assiciated to the given rss context.
+ *      Returns a negative error code or zero.
+ * @set_rxfh_context: Create, remove and configure RSS contexts. Allows setting
+ *      the contents of the RX flow hash indirection table, hash key, and/or
+ *      hash function associated to the given context. Arguments which are set
+ *      to %NULL or zero will remain unchanged.
+ *      Returns a negative error code or zero. An error code must be returned
+ *      if at least one unsupported change was requested.
 * @get_channels: Get number of channels.
 * @set_channels: Set number of channels.  Returns a negative error code or
 *      zero.
diff --git a/include/net/netfilter/nft_fib.h b/include/net/netfilter/nft_fib.h
index a88f92737308..e4c4d8eaca8c 100644
--- a/include/net/netfilter/nft_fib.h
+++ b/include/net/netfilter/nft_fib.h
@@ -34,5 +34,5 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs,
                   const struct nft_pktinfo *pkt);
 void nft_fib_store_result(void *reg, const struct nft_fib *priv,
-                          const struct nft_pktinfo *pkt, int index);
+                          const struct net_device *dev);
 #endif
diff --git a/include/net/udp.h b/include/net/udp.h
index 9272be5700ce..79d141d2103b 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -467,12 +467,19 @@ void udpv6_encap_enable(void);
 static inline struct sk_buff *udp_rcv_segment(struct sock *sk,
                                              struct sk_buff *skb, bool ipv4)
 {
+        netdev_features_t features = NETIF_F_SG;
        struct sk_buff *segs;
+        /* Avoid csum recalculation by skb_segment unless userspace explicitly
+         * asks for the final checksum values
+         */
+        if (!inet_get_convert_csum(sk))
+                features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
        /* the GSO CB lays after the UDP one, no need to save and restore any
         * CB fragment
         */
-        segs = __skb_gso_segment(skb, NETIF_F_SG, false);
+        segs = __skb_gso_segment(skb, features, false);
        if (unlikely(IS_ERR_OR_NULL(segs))) {
                int segs_nr = skb_shinfo(skb)->gso_segs;
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index d3e59312ef40..5079d1db3754 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -428,7 +428,7 @@ predicate_parse(const char *str, int nr_parens, int nr_preds,
        op_stack = kmalloc_array(nr_parens, sizeof(*op_stack), GFP_KERNEL);
        if (!op_stack)
                return ERR_PTR(-ENOMEM);
-        prog_stack = kmalloc_array(nr_preds, sizeof(*prog_stack), GFP_KERNEL);
+        prog_stack = kcalloc(nr_preds, sizeof(*prog_stack), GFP_KERNEL);
        if (!prog_stack) {
                parse_error(pe, -ENOMEM, 0);
                goto out_free;
@@ -579,7 +579,11 @@ predicate_parse(const char *str, int nr_parens, int nr_preds,
 out_free:
        kfree(op_stack);
        kfree(inverts);
-        kfree(prog_stack);
+        if (prog_stack) {
+                for (i = 0; prog_stack[i].pred; i++)
+                        kfree(prog_stack[i].pred);
+                kfree(prog_stack);
+        }
        return ERR_PTR(ret);
 }
diff --git a/lib/list_sort.c b/lib/list_sort.c
index 06e900c5587b..712ed1f4eb64 100644
--- a/lib/list_sort.c
+++ b/lib/list_sort.c
@@ -120,7 +120,8 @@ static void merge_final(void *priv, cmp_func cmp, struct list_head *head,
 * The latter offers a chance to save a few cycles in the comparison
 * (which is used by e.g. plug_ctx_cmp() in block/blk-mq.c).
 *
- * A good way to write a multi-word comparison is
+ * A good way to write a multi-word comparison is::
+ *
 *      if (a->high != b->high)
 *              return a->high > b->high;
 *      if (a->middle != b->middle)
diff --git a/net/core/dev.c b/net/core/dev.c
index 9c8b3e193e85..140858d4a048 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4498,23 +4498,6 @@ static int netif_rx_internal(struct sk_buff *skb)
        trace_netif_rx(skb);
-        if (static_branch_unlikely(&generic_xdp_needed_key)) {
-                int ret;
-                preempt_disable();
-                rcu_read_lock();
-                ret = do_xdp_generic(rcu_dereference(skb->dev->xdp_prog), skb);
-                rcu_read_unlock();
-                preempt_enable();
-                /* Consider XDP consuming the packet a success from
-                 * the netdev point of view we do not want to count
-                 * this as an error.
-                 */
-                if (ret != XDP_PASS)
-                        return NET_RX_SUCCESS;
-        }
 #ifdef CONFIG_RPS
        if (static_branch_unlikely(&rps_needed)) {
                struct rps_dev_flow voidflow, *rflow = &voidflow;
@@ -4854,6 +4837,18 @@ another_round:
        __this_cpu_inc(softnet_data.processed);
+        if (static_branch_unlikely(&generic_xdp_needed_key)) {
+                int ret2;
+                preempt_disable();
+                ret2 = do_xdp_generic(rcu_dereference(skb->dev->xdp_prog), skb);
+                preempt_enable();
+                if (ret2 != XDP_PASS)
+                        return NET_RX_DROP;
+                skb_reset_mac_len(skb);
+        }
        if (skb->protocol == cpu_to_be16(ETH_P_8021Q) ||
            skb->protocol == cpu_to_be16(ETH_P_8021AD)) {
                skb = skb_vlan_untag(skb);
@@ -5174,19 +5169,6 @@ static int netif_receive_skb_internal(struct sk_buff *skb)
        if (skb_defer_rx_timestamp(skb))
                return NET_RX_SUCCESS;
-        if (static_branch_unlikely(&generic_xdp_needed_key)) {
-                int ret;
-                preempt_disable();
-                rcu_read_lock();
-                ret = do_xdp_generic(rcu_dereference(skb->dev->xdp_prog), skb);
-                rcu_read_unlock();
-                preempt_enable();
-                if (ret != XDP_PASS)
-                        return NET_RX_DROP;
-        }
        rcu_read_lock();
 #ifdef CONFIG_RPS
        if (static_branch_unlikely(&rps_needed)) {
@@ -5207,7 +5189,6 @@ static int netif_receive_skb_internal(struct sk_buff *skb)
 static void netif_receive_skb_list_internal(struct list_head *head)
 {
-        struct bpf_prog *xdp_prog = NULL;
        struct sk_buff *skb, *next;
        struct list_head sublist;
@@ -5220,21 +5201,6 @@ static void netif_receive_skb_list_internal(struct list_head *head)
        }
        list_splice_init(&sublist, head);
-        if (static_branch_unlikely(&generic_xdp_needed_key)) {
-                preempt_disable();
-                rcu_read_lock();
-                list_for_each_entry_safe(skb, next, head, list) {
-                        xdp_prog = rcu_dereference(skb->dev->xdp_prog);
-                        skb_list_del_init(skb);
-                        if (do_xdp_generic(xdp_prog, skb) == XDP_PASS)
-                                list_add_tail(&skb->list, &sublist);
-                }
-                rcu_read_unlock();
-                preempt_enable();
-                /* Put passed packets back on main list */
-                list_splice_init(&sublist, head);
-        }
        rcu_read_lock();
 #ifdef CONFIG_RPS
        if (static_branch_unlikely(&rps_needed)) {
@@ -5805,7 +5771,6 @@ static struct sk_buff *napi_frags_skb(struct napi_struct *napi)
        skb_reset_mac_header(skb);
        skb_gro_reset_offset(skb);
-        eth = skb_gro_header_fast(skb, 0);
        if (unlikely(skb_gro_header_hard(skb, hlen))) {
                eth = skb_gro_header_slow(skb, hlen, 0);
                if (unlikely(!eth)) {
@@ -5815,6 +5780,7 @@ static struct sk_buff *napi_frags_skb(struct napi_struct *napi)
                        return NULL;
                }
        } else {
+                eth = (const struct ethhdr *)skb->data;
                gro_pull_from_frag0(skb, hlen);
                NAPI_GRO_CB(skb)->frag0 += hlen;
                NAPI_GRO_CB(skb)->frag0_len -= hlen;
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index d97f7320dfdc..6dadeff8d39a 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -3006,11 +3006,12 @@ ethtool_rx_flow_rule_create(const struct ethtool_rx_flow_spec_input *input)
                const struct ethtool_flow_ext *ext_h_spec = &fs->h_ext;
                const struct ethtool_flow_ext *ext_m_spec = &fs->m_ext;
-                if (ext_m_spec->vlan_etype &&
+                if (ext_m_spec->vlan_etype) {
-                    ext_m_spec->vlan_tci) {
                        match->key.vlan.vlan_tpid = ext_h_spec->vlan_etype;
                        match->mask.vlan.vlan_tpid = ext_m_spec->vlan_etype;
+                }
+                if (ext_m_spec->vlan_tci) {
                        match->key.vlan.vlan_id =
                                ntohs(ext_h_spec->vlan_tci) & 0x0fff;
                        match->mask.vlan.vlan_id =
@@ -3020,7 +3021,10 @@ ethtool_rx_flow_rule_create(const struct ethtool_rx_flow_spec_input *input)
                                (ntohs(ext_h_spec->vlan_tci) & 0xe000) >> 13;
                        match->mask.vlan.vlan_priority =
                                (ntohs(ext_m_spec->vlan_tci) & 0xe000) >> 13;
+                }
+                if (ext_m_spec->vlan_etype ||
+                    ext_m_spec->vlan_tci) {
                        match->dissector.used_keys |=
                                BIT(FLOW_DISSECTOR_KEY_VLAN);
                        match->dissector.offset[FLOW_DISSECTOR_KEY_VLAN] =
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 7f8657080570..47c1aa9ee045 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -1032,7 +1032,11 @@ struct ubuf_info *sock_zerocopy_realloc(struct sock *sk, size_t size,
                        uarg->len++;
                        uarg->bytelen = bytelen;
                        atomic_set(&sk->sk_zckey, ++next);
-                        sock_zerocopy_get(uarg);
+                        /* no extra ref when appending to datagram (MSG_MORE) */
+                        if (sk->sk_type == SOCK_STREAM)
+                                sock_zerocopy_get(uarg);
                        return uarg;
                }
        }
diff --git a/net/dsa/tag_8021q.c b/net/dsa/tag_8021q.c
index 8ae48c7e1e76..65a35e976d7b 100644
--- a/net/dsa/tag_8021q.c
+++ b/net/dsa/tag_8021q.c
@@ -11,20 +11,59 @@
 #include "dsa_priv.h"
-/* Allocating two VLAN tags per port - one for the RX VID and
+/* Binary structure of the fake 12-bit VID field (when the TPID is
- * the other for the TX VID - see below
+ * ETH_P_DSA_8021Q):
+ *
+ * | 11  | 10  |  9  |  8  |  7  |  6  |  5  |  4  |  3  |  2  |  1  |  0  |
+ * +-----------+-----+-----------------+-----------+-----------------------+
+ * |    DIR    | RSV |    SWITCH_ID    |    RSV    |          PORT         |
+ * +-----------+-----+-----------------+-----------+-----------------------+
+ *
+ * DIR - VID[11:10]:
+ *      Direction flags.
+ *      * 1 (0b01) for RX VLAN,
+ *      * 2 (0b10) for TX VLAN.
+ *      These values make the special VIDs of 0, 1 and 4095 to be left
+ *      unused by this coding scheme.
+ *
+ * RSV - VID[9]:
+ *      To be used for further expansion of SWITCH_ID or for other purposes.
+ *
+ * SWITCH_ID - VID[8:6]:
+ *      Index of switch within DSA tree. Must be between 0 and
+ *      DSA_MAX_SWITCHES - 1.
+ *
+ * RSV - VID[5:4]:
+ *      To be used for further expansion of PORT or for other purposes.
+ *
+ * PORT - VID[3:0]:
+ *      Index of switch port. Must be between 0 and DSA_MAX_PORTS - 1.
 */
-#define DSA_8021Q_VID_RANGE     (DSA_MAX_SWITCHES * DSA_MAX_PORTS)
-#define DSA_8021Q_VID_BASE      (VLAN_N_VID - 2 * DSA_8021Q_VID_RANGE - 1)
+#define DSA_8021Q_DIR_SHIFT             10
-#define DSA_8021Q_RX_VID_BASE   (DSA_8021Q_VID_BASE)
+#define DSA_8021Q_DIR_MASK              GENMASK(11, 10)
-#define DSA_8021Q_TX_VID_BASE   (DSA_8021Q_VID_BASE + DSA_8021Q_VID_RANGE)
+#define DSA_8021Q_DIR(x)                (((x) << DSA_8021Q_DIR_SHIFT) & \
+                                                 DSA_8021Q_DIR_MASK)
+#define DSA_8021Q_DIR_RX                DSA_8021Q_DIR(1)
+#define DSA_8021Q_DIR_TX                DSA_8021Q_DIR(2)
+#define DSA_8021Q_SWITCH_ID_SHIFT       6
+#define DSA_8021Q_SWITCH_ID_MASK        GENMASK(8, 6)
+#define DSA_8021Q_SWITCH_ID(x)          (((x) << DSA_8021Q_SWITCH_ID_SHIFT) & \
+                                                 DSA_8021Q_SWITCH_ID_MASK)
+#define DSA_8021Q_PORT_SHIFT            0
+#define DSA_8021Q_PORT_MASK             GENMASK(3, 0)
+#define DSA_8021Q_PORT(x)               (((x) << DSA_8021Q_PORT_SHIFT) & \
+                                                 DSA_8021Q_PORT_MASK)
 /* Returns the VID to be inserted into the frame from xmit for switch steering
 * instructions on egress. Encodes switch ID and port ID.
 */
 u16 dsa_8021q_tx_vid(struct dsa_switch *ds, int port)
 {
-        return DSA_8021Q_TX_VID_BASE + (DSA_MAX_PORTS * ds->index) + port;
+        return DSA_8021Q_DIR_TX | DSA_8021Q_SWITCH_ID(ds->index) |
+               DSA_8021Q_PORT(port);
 }
 EXPORT_SYMBOL_GPL(dsa_8021q_tx_vid);
@@ -33,21 +72,22 @@ EXPORT_SYMBOL_GPL(dsa_8021q_tx_vid);
 */
 u16 dsa_8021q_rx_vid(struct dsa_switch *ds, int port)
 {
-        return DSA_8021Q_RX_VID_BASE + (DSA_MAX_PORTS * ds->index) + port;
+        return DSA_8021Q_DIR_RX | DSA_8021Q_SWITCH_ID(ds->index) |
+               DSA_8021Q_PORT(port);
 }
 EXPORT_SYMBOL_GPL(dsa_8021q_rx_vid);
 /* Returns the decoded switch ID from the RX VID. */
 int dsa_8021q_rx_switch_id(u16 vid)
 {
-        return ((vid - DSA_8021Q_RX_VID_BASE) / DSA_MAX_PORTS);
+        return (vid & DSA_8021Q_SWITCH_ID_MASK) >> DSA_8021Q_SWITCH_ID_SHIFT;
 }
 EXPORT_SYMBOL_GPL(dsa_8021q_rx_switch_id);
 /* Returns the decoded port ID from the RX VID. */
 int dsa_8021q_rx_source_port(u16 vid)
 {
-        return ((vid - DSA_8021Q_RX_VID_BASE) % DSA_MAX_PORTS);
+        return (vid & DSA_8021Q_PORT_MASK) >> DSA_8021Q_PORT_SHIFT;
 }
 EXPORT_SYMBOL_GPL(dsa_8021q_rx_source_port);
@@ -128,10 +168,7 @@ int dsa_port_setup_8021q_tagging(struct dsa_switch *ds, int port, bool enabled)
                u16 flags;
                if (i == upstream)
-                        /* CPU port needs to see this port's RX VID
+                        continue;
-                         * as tagged egress.
-                         */
-                        flags = 0;
                else if (i == port)
                        /* The RX VID is pvid on this port */
                        flags = BRIDGE_VLAN_INFO_UNTAGGED |
@@ -150,6 +187,20 @@ int dsa_port_setup_8021q_tagging(struct dsa_switch *ds, int port, bool enabled)
                        return err;
                }
        }
+        /* CPU port needs to see this port's RX VID
+         * as tagged egress.
+         */
+        if (enabled)
+                err = dsa_port_vid_add(upstream_dp, rx_vid, 0);
+        else
+                err = dsa_port_vid_del(upstream_dp, rx_vid);
+        if (err) {
+                dev_err(ds->dev, "Failed to apply RX VID %d to port %d: %d\n",
+                        rx_vid, port, err);
+                return err;
+        }
        /* Finally apply the TX VID on this port and on the CPU port */
        if (enabled)
                err = dsa_port_vid_add(dp, tx_vid, BRIDGE_VLAN_INFO_UNTAGGED);
diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c
index 9fa9abd83018..2d7a19750436 100644
--- a/net/hsr/hsr_framereg.c
+++ b/net/hsr/hsr_framereg.c
@@ -365,6 +365,14 @@ void hsr_prune_nodes(struct timer_list *t)
        rcu_read_lock();
        list_for_each_entry_rcu(node, &hsr->node_db, mac_list) {
+                /* Don't prune own node. Neither time_in[HSR_PT_SLAVE_A]
+                 * nor time_in[HSR_PT_SLAVE_B], will ever be updated for
+                 * the master port. Thus the master node will be repeatedly
+                 * pruned leading to packet loss.
+                 */
+                if (hsr_addr_is_self(hsr, node->macaddress_A))
+                        continue;
                /* Shorthand */
                time_a = node->time_in[HSR_PT_SLAVE_A];
                time_b = node->time_in[HSR_PT_SLAVE_B];
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index fb0c3d9869da..52bdb881a506 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -424,8 +424,8 @@ int inet_release(struct socket *sock)
                if (sock_flag(sk, SOCK_LINGER) &&
                    !(current->flags & PF_EXITING))
                        timeout = sk->sk_lingertime;
-                sock->sk = NULL;
                sk->sk_prot->close(sk, timeout);
+                sock->sk = NULL;
        }
        return 0;
 }
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index c0cc3171badc..a57f0d69eadb 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -184,6 +184,17 @@ static void ip_ma_put(struct ip_mc_list *im)
             pmc != NULL;                                       \
             pmc = rtnl_dereference(pmc->next_rcu))
+static void ip_sf_list_clear_all(struct ip_sf_list *psf)
+{
+        struct ip_sf_list *next;
+        while (psf) {
+                next = psf->sf_next;
+                kfree(psf);
+                psf = next;
+        }
+}
 #ifdef CONFIG_IP_MULTICAST
 /*
@@ -629,6 +640,13 @@ static void igmpv3_clear_zeros(struct ip_sf_list **ppsf)
        }
 }
+static void kfree_pmc(struct ip_mc_list *pmc)
+{
+        ip_sf_list_clear_all(pmc->sources);
+        ip_sf_list_clear_all(pmc->tomb);
+        kfree(pmc);
+}
 static void igmpv3_send_cr(struct in_device *in_dev)
 {
        struct ip_mc_list *pmc, *pmc_prev, *pmc_next;
@@ -665,7 +683,7 @@ static void igmpv3_send_cr(struct in_device *in_dev)
                        else
                                in_dev->mc_tomb = pmc_next;
                        in_dev_put(pmc->interface);
-                        kfree(pmc);
+                        kfree_pmc(pmc);
                } else
                        pmc_prev = pmc;
        }
@@ -1211,14 +1229,18 @@ static void igmpv3_del_delrec(struct in_device *in_dev, struct ip_mc_list *im)
                im->interface = pmc->interface;
                if (im->sfmode == MCAST_INCLUDE) {
                        im->tomb = pmc->tomb;
+                        pmc->tomb = NULL;
                        im->sources = pmc->sources;
+                        pmc->sources = NULL;
                        for (psf = im->sources; psf; psf = psf->sf_next)
                                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);
+                kfree_pmc(pmc);
        }
        spin_unlock_bh(&im->lock);
 }
@@ -1239,21 +1261,18 @@ static void igmpv3_clear_delrec(struct in_device *in_dev)
                nextpmc = pmc->next;
                ip_mc_clear_src(pmc);
                in_dev_put(pmc->interface);
-                kfree(pmc);
+                kfree_pmc(pmc);
        }
        /* clear dead sources, too */
        rcu_read_lock();
        for_each_pmc_rcu(in_dev, pmc) {
-                struct ip_sf_list *psf, *psf_next;
+                struct ip_sf_list *psf;
                spin_lock_bh(&pmc->lock);
                psf = pmc->tomb;
                pmc->tomb = NULL;
                spin_unlock_bh(&pmc->lock);
-                for (; psf; psf = psf_next) {
+                ip_sf_list_clear_all(psf);
-                        psf_next = psf->sf_next;
-                        kfree(psf);
-                }
        }
        rcu_read_unlock();
 }
@@ -2119,7 +2138,7 @@ static int ip_mc_add_src(struct in_device *in_dev, __be32 *pmca, int sfmode,
 static void ip_mc_clear_src(struct ip_mc_list *pmc)
 {
-        struct ip_sf_list *psf, *nextpsf, *tomb, *sources;
+        struct ip_sf_list *tomb, *sources;
        spin_lock_bh(&pmc->lock);
        tomb = pmc->tomb;
@@ -2131,14 +2150,8 @@ static void ip_mc_clear_src(struct ip_mc_list *pmc)
        pmc->sfcount[MCAST_EXCLUDE] = 1;
        spin_unlock_bh(&pmc->lock);
-        for (psf = tomb; psf; psf = nextpsf) {
+        ip_sf_list_clear_all(tomb);
-                nextpsf = psf->sf_next;
+        ip_sf_list_clear_all(sources);
-                kfree(psf);
-        }
-        for (psf = sources; psf; psf = nextpsf) {
-                nextpsf = psf->sf_next;
-                kfree(psf);
-        }
 }
 /* Join a multicast group
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index bfd0ca554977..8c9189a41b13 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -878,7 +878,7 @@ static int __ip_append_data(struct sock *sk,
        int csummode = CHECKSUM_NONE;
        struct rtable *rt = (struct rtable *)cork->dst;
        unsigned int wmem_alloc_delta = 0;
-        bool paged, extra_uref;
+        bool paged, extra_uref = false;
        u32 tskey = 0;
        skb = skb_peek_tail(queue);
@@ -918,7 +918,7 @@ static int __ip_append_data(struct sock *sk,
                uarg = sock_zerocopy_realloc(sk, length, skb_zcopy(skb));
                if (!uarg)
                        return -ENOBUFS;
-                extra_uref = true;
+                extra_uref = !skb;      /* only extra ref if !MSG_MORE */
                if (rt->dst.dev->features & NETIF_F_SG &&
                    csummode == CHECKSUM_PARTIAL) {
                        paged = true;
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 82f341e84fae..aa3fd61818c4 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -343,6 +343,8 @@ int ip_ra_control(struct sock *sk, unsigned char on,
                return -EINVAL;
        new_ra = on ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL;
+        if (on && !new_ra)
+                return -ENOMEM;
        mutex_lock(&net->ipv4.ra_mutex);
        for (rap = &net->ipv4.ra_chain;
diff --git a/net/ipv4/netfilter/nft_fib_ipv4.c b/net/ipv4/netfilter/nft_fib_ipv4.c
index 94eb25bc8d7e..c8888e52591f 100644
--- a/net/ipv4/netfilter/nft_fib_ipv4.c
+++ b/net/ipv4/netfilter/nft_fib_ipv4.c
@@ -58,11 +58,6 @@ void nft_fib4_eval_type(const struct nft_expr *expr, struct nft_regs *regs,
 }
 EXPORT_SYMBOL_GPL(nft_fib4_eval_type);
-static int get_ifindex(const struct net_device *dev)
-{
-        return dev ? dev->ifindex : 0;
-}
 void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,
                   const struct nft_pktinfo *pkt)
 {
@@ -94,8 +89,7 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,
        if (nft_hook(pkt) == NF_INET_PRE_ROUTING &&
            nft_fib_is_loopback(pkt->skb, nft_in(pkt))) {
-                nft_fib_store_result(dest, priv, pkt,
+                nft_fib_store_result(dest, priv, nft_in(pkt));
-                                     nft_in(pkt)->ifindex);
                return;
        }
@@ -108,8 +102,7 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,
        if (ipv4_is_zeronet(iph->saddr)) {
                if (ipv4_is_lbcast(iph->daddr) ||
                    ipv4_is_local_multicast(iph->daddr)) {
-                        nft_fib_store_result(dest, priv, pkt,
+                        nft_fib_store_result(dest, priv, pkt->skb->dev);
-                                             get_ifindex(pkt->skb->dev));
                        return;
                }
        }
@@ -150,17 +143,7 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,
                found = oif;
        }
-        switch (priv->result) {
+        nft_fib_store_result(dest, priv, found);
-        case NFT_FIB_RESULT_OIF:
-                *dest = found->ifindex;
-                break;
-        case NFT_FIB_RESULT_OIFNAME:
-                strncpy((char *)dest, found->name, IFNAMSIZ);
-                break;
-        default:
-                WARN_ON_ONCE(1);
-                break;
-        }
 }
 EXPORT_SYMBOL_GPL(nft_fib4_eval);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index c61edd023b35..08a477e74cf3 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3791,6 +3791,8 @@ void tcp_parse_options(const struct net *net,
                        length--;
                        continue;
                default:
+                        if (length < 2)
+                                return;
                        opsize = *ptr++;
                        if (opsize < 2) /* "silly options" */
                                return;
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index e2d9fa0c98cb..081bb517e40d 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -5657,18 +5657,6 @@ static const struct nla_policy inet6_af_policy[IFLA_INET6_MAX + 1] = {
        [IFLA_INET6_TOKEN]              = { .len = sizeof(struct in6_addr) },
 };
-static int inet6_validate_link_af(const struct net_device *dev,
-                                  const struct nlattr *nla)
-{
-        struct nlattr *tb[IFLA_INET6_MAX + 1];
-        if (dev && !__in6_dev_get(dev))
-                return -EAFNOSUPPORT;
-        return nla_parse_nested_deprecated(tb, IFLA_INET6_MAX, nla,
-                                           inet6_af_policy, NULL);
-}
 static int check_addr_gen_mode(int mode)
 {
        if (mode != IN6_ADDR_GEN_MODE_EUI64 &&
@@ -5689,14 +5677,44 @@ static int check_stable_privacy(struct inet6_dev *idev, struct net *net,
        return 1;
 }
+static int inet6_validate_link_af(const struct net_device *dev,
+                                  const struct nlattr *nla)
+{
+        struct nlattr *tb[IFLA_INET6_MAX + 1];
+        struct inet6_dev *idev = NULL;
+        int err;
+        if (dev) {
+                idev = __in6_dev_get(dev);
+                if (!idev)
+                        return -EAFNOSUPPORT;
+        }
+        err = nla_parse_nested_deprecated(tb, IFLA_INET6_MAX, nla,
+                                          inet6_af_policy, NULL);
+        if (err)
+                return err;
+        if (!tb[IFLA_INET6_TOKEN] && !tb[IFLA_INET6_ADDR_GEN_MODE])
+                return -EINVAL;
+        if (tb[IFLA_INET6_ADDR_GEN_MODE]) {
+                u8 mode = nla_get_u8(tb[IFLA_INET6_ADDR_GEN_MODE]);
+                if (check_addr_gen_mode(mode) < 0)
+                        return -EINVAL;
+                if (dev && check_stable_privacy(idev, dev_net(dev), mode) < 0)
+                        return -EINVAL;
+        }
+        return 0;
+}
 static int inet6_set_link_af(struct net_device *dev, const struct nlattr *nla)
 {
-        int err = -EINVAL;
        struct inet6_dev *idev = __in6_dev_get(dev);
        struct nlattr *tb[IFLA_INET6_MAX + 1];
+        int err;
-        if (!idev)
-                return -EAFNOSUPPORT;
        if (nla_parse_nested_deprecated(tb, IFLA_INET6_MAX, nla, NULL, NULL) < 0)
                BUG();
@@ -5710,15 +5728,10 @@ static int inet6_set_link_af(struct net_device *dev, const struct nlattr *nla)
        if (tb[IFLA_INET6_ADDR_GEN_MODE]) {
                u8 mode = nla_get_u8(tb[IFLA_INET6_ADDR_GEN_MODE]);
-                if (check_addr_gen_mode(mode) < 0 ||
-                    check_stable_privacy(idev, dev_net(dev), mode) < 0)
-                        return -EINVAL;
                idev->cnf.addr_gen_mode = mode;
-                err = 0;
        }
-        return err;
+        return 0;
 }
 static int inet6_fill_ifinfo(struct sk_buff *skb, struct inet6_dev *idev,
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index d79779ad712b..934c88f128ab 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1271,7 +1271,7 @@ static int __ip6_append_data(struct sock *sk,
        int csummode = CHECKSUM_NONE;
        unsigned int maxnonfragsize, headersize;
        unsigned int wmem_alloc_delta = 0;
-        bool paged, extra_uref;
+        bool paged, extra_uref = false;
        skb = skb_peek_tail(queue);
        if (!skb) {
@@ -1340,7 +1340,7 @@ emsgsize:
                uarg = sock_zerocopy_realloc(sk, length, skb_zcopy(skb));
                if (!uarg)
                        return -ENOBUFS;
-                extra_uref = true;
+                extra_uref = !skb;      /* only extra ref if !MSG_MORE */
                if (rt->dst.dev->features & NETIF_F_SG &&
                    csummode == CHECKSUM_PARTIAL) {
                        paged = true;
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index a3b5b3144de3..264c292e7dcc 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -64,6 +64,8 @@ int ip6_ra_control(struct sock *sk, int sel)
                return -ENOPROTOOPT;
        new_ra = (sel >= 0) ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL;
+        if (sel >= 0 && !new_ra)
+                return -ENOMEM;
        write_lock_bh(&ip6_ra_lock);
        for (rap = &ip6_ra_chain; (ra = *rap) != NULL; rap = &ra->next) {
diff --git a/net/ipv6/netfilter/nft_fib_ipv6.c b/net/ipv6/netfilter/nft_fib_ipv6.c
index 73cdc0bc63f7..ec068b0cffca 100644
--- a/net/ipv6/netfilter/nft_fib_ipv6.c
+++ b/net/ipv6/netfilter/nft_fib_ipv6.c
@@ -169,8 +169,7 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs,
        if (nft_hook(pkt) == NF_INET_PRE_ROUTING &&
            nft_fib_is_loopback(pkt->skb, nft_in(pkt))) {
-                nft_fib_store_result(dest, priv, pkt,
+                nft_fib_store_result(dest, priv, nft_in(pkt));
-                                     nft_in(pkt)->ifindex);
                return;
        }
@@ -187,18 +186,7 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs,
        if (oif && oif != rt->rt6i_idev->dev)
                goto put_rt_err;
-        switch (priv->result) {
+        nft_fib_store_result(dest, priv, rt->rt6i_idev->dev);
-        case NFT_FIB_RESULT_OIF:
-                *dest = rt->rt6i_idev->dev->ifindex;
-                break;
-        case NFT_FIB_RESULT_OIFNAME:
-                strncpy((char *)dest, rt->rt6i_idev->dev->name, IFNAMSIZ);
-                break;
-        default:
-                WARN_ON_ONCE(1);
-                break;
-        }
 put_rt_err:
        ip6_rt_put(rt);
 }
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index b76b8d8fff56..0f60eb3a2873 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2508,6 +2508,12 @@ static struct rt6_info *__ip6_route_redirect(struct net *net,
        struct fib6_info *rt;
        struct fib6_node *fn;
+        /* l3mdev_update_flow overrides oif if the device is enslaved; in
+         * this case we must match on the real ingress device, so reset it
+         */
+        if (fl6->flowi6_flags & FLOWI_FLAG_SKIP_NH_OIF)
+                fl6->flowi6_oif = skb->dev->ifindex;
        /* Get the "current" route for this destination and
         * check if the redirect has come from appropriate router.
         *
diff --git a/net/llc/llc_output.c b/net/llc/llc_output.c
index 94425e421213..9e4b6bcf6920 100644
--- a/net/llc/llc_output.c
+++ b/net/llc/llc_output.c
@@ -72,6 +72,8 @@ int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb,
        rc = llc_mac_hdr_init(skb, skb->dev->dev_addr, dmac);
        if (likely(!rc))
                rc = dev_queue_xmit(skb);
+        else
+                kfree_skb(skb);
        return rc;
 }
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 92036aeb0df4..7138556b206b 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -2307,7 +2307,6 @@ static void __net_exit __ip_vs_cleanup(struct net *net)
 {
        struct netns_ipvs *ipvs = net_ipvs(net);
-        nf_unregister_net_hooks(net, ip_vs_ops, ARRAY_SIZE(ip_vs_ops));
        ip_vs_service_net_cleanup(ipvs);        /* ip_vs_flush() with locks */
        ip_vs_conn_net_cleanup(ipvs);
        ip_vs_app_net_cleanup(ipvs);
@@ -2322,6 +2321,7 @@ static void __net_exit __ip_vs_dev_cleanup(struct net *net)
 {
        struct netns_ipvs *ipvs = net_ipvs(net);
        EnterFunction(2);
+        nf_unregister_net_hooks(net, ip_vs_ops, ARRAY_SIZE(ip_vs_ops));
        ipvs->enable = 0;       /* Disable packet reception */
        smp_wmb();
        ip_vs_sync_net_cleanup(ipvs);
diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c
index 96825e20368f..241317473114 100644
--- a/net/netfilter/nf_flow_table_ip.c
+++ b/net/netfilter/nf_flow_table_ip.c
@@ -244,8 +244,7 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,
        rt = (struct rtable *)flow->tuplehash[dir].tuple.dst_cache;
        outdev = rt->dst.dev;
-        if (unlikely(nf_flow_exceeds_mtu(skb, flow->tuplehash[dir].tuple.mtu)) &&
+        if (unlikely(nf_flow_exceeds_mtu(skb, flow->tuplehash[dir].tuple.mtu)))
-            (ip_hdr(skb)->frag_off & htons(IP_DF)) != 0)
                return NF_ACCEPT;
        if (skb_try_make_writable(skb, sizeof(*iph)))
diff --git a/net/netfilter/nf_nat_helper.c b/net/netfilter/nf_nat_helper.c
index ccc06f7539d7..53aeb12b70fb 100644
--- a/net/netfilter/nf_nat_helper.c
+++ b/net/netfilter/nf_nat_helper.c
@@ -170,7 +170,7 @@ nf_nat_mangle_udp_packet(struct sk_buff *skb,
        if (!udph->check && skb->ip_summed != CHECKSUM_PARTIAL)
                return true;
-        nf_nat_csum_recalc(skb, nf_ct_l3num(ct), IPPROTO_TCP,
+        nf_nat_csum_recalc(skb, nf_ct_l3num(ct), IPPROTO_UDP,
                           udph, &udph->check, datalen, oldlen);
        return true;
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index 9dc1d6e04946..b5b2be55ca82 100644
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
@@ -255,6 +255,7 @@ static unsigned int nf_iterate(struct sk_buff *skb,
 repeat:
                verdict = nf_hook_entry_hookfn(hook, skb, state);
                if (verdict != NF_ACCEPT) {
+                        *index = i;
                        if (verdict != NF_REPEAT)
                                return verdict;
                        goto repeat;
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 28241e82fd15..4b5159936034 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2270,13 +2270,13 @@ static int nf_tables_fill_rule_info(struct sk_buff *skb, struct net *net,
                                    u32 flags, int family,
                                    const struct nft_table *table,
                                    const struct nft_chain *chain,
-                                    const struct nft_rule *rule)
+                                    const struct nft_rule *rule,
+                                    const struct nft_rule *prule)
 {
        struct nlmsghdr *nlh;
        struct nfgenmsg *nfmsg;
        const struct nft_expr *expr, *next;
        struct nlattr *list;
-        const struct nft_rule *prule;
        u16 type = nfnl_msg_type(NFNL_SUBSYS_NFTABLES, event);
        nlh = nlmsg_put(skb, portid, seq, type, sizeof(struct nfgenmsg), flags);
@@ -2296,8 +2296,7 @@ static int nf_tables_fill_rule_info(struct sk_buff *skb, struct net *net,
                         NFTA_RULE_PAD))
                goto nla_put_failure;
-        if ((event != NFT_MSG_DELRULE) && (rule->list.prev != &chain->rules)) {
+        if (event != NFT_MSG_DELRULE && prule) {
-                prule = list_prev_entry(rule, list);
                if (nla_put_be64(skb, NFTA_RULE_POSITION,
                                 cpu_to_be64(prule->handle),
                                 NFTA_RULE_PAD))
@@ -2344,7 +2343,7 @@ static void nf_tables_rule_notify(const struct nft_ctx *ctx,
        err = nf_tables_fill_rule_info(skb, ctx->net, ctx->portid, ctx->seq,
                                       event, 0, ctx->family, ctx->table,
-                                       ctx->chain, rule);
+                                       ctx->chain, rule, NULL);
        if (err < 0) {
                kfree_skb(skb);
                goto err;
@@ -2369,12 +2368,13 @@ static int __nf_tables_dump_rules(struct sk_buff *skb,
                                  const struct nft_chain *chain)
 {
        struct net *net = sock_net(skb->sk);
+        const struct nft_rule *rule, *prule;
        unsigned int s_idx = cb->args[0];
-        const struct nft_rule *rule;
+        prule = NULL;
        list_for_each_entry_rcu(rule, &chain->rules, list) {
                if (!nft_is_active(net, rule))
-                        goto cont;
+                        goto cont_skip;
                if (*idx < s_idx)
                        goto cont;
                if (*idx > s_idx) {
@@ -2386,11 +2386,13 @@ static int __nf_tables_dump_rules(struct sk_buff *skb,
                                        NFT_MSG_NEWRULE,
                                        NLM_F_MULTI | NLM_F_APPEND,
                                        table->family,
-                                        table, chain, rule) < 0)
+                                        table, chain, rule, prule) < 0)
                        return 1;
                nl_dump_check_consistent(cb, nlmsg_hdr(skb));
 cont:
+                prule = rule;
+cont_skip:
                (*idx)++;
        }
        return 0;
@@ -2546,7 +2548,7 @@ static int nf_tables_getrule(struct net *net, struct sock *nlsk,
        err = nf_tables_fill_rule_info(skb2, net, NETLINK_CB(skb).portid,
                                       nlh->nlmsg_seq, NFT_MSG_NEWRULE, 0,
-                                       family, table, chain, rule);
+                                       family, table, chain, rule, NULL);
        if (err < 0)
                goto err;
diff --git a/net/netfilter/nft_fib.c b/net/netfilter/nft_fib.c
index 21df8cccea65..77f00a99dfab 100644
--- a/net/netfilter/nft_fib.c
+++ b/net/netfilter/nft_fib.c
@@ -135,17 +135,17 @@ int nft_fib_dump(struct sk_buff *skb, const struct nft_expr *expr)
 EXPORT_SYMBOL_GPL(nft_fib_dump);
 void nft_fib_store_result(void *reg, const struct nft_fib *priv,
-                          const struct nft_pktinfo *pkt, int index)
+                          const struct net_device *dev)
 {
-        struct net_device *dev;
        u32 *dreg = reg;
+        int index;
        switch (priv->result) {
        case NFT_FIB_RESULT_OIF:
+                index = dev ? dev->ifindex : 0;
                *dreg = (priv->flags & NFTA_FIB_F_PRESENT) ? !!index : index;
                break;
        case NFT_FIB_RESULT_OIFNAME:
-                dev = dev_get_by_index_rcu(nft_net(pkt), index);
                if (priv->flags & NFTA_FIB_F_PRESENT)
                        *dreg = !!dev;
                else
diff --git a/net/netfilter/nft_flow_offload.c b/net/netfilter/nft_flow_offload.c
index ffb25d5e8dbe..aa5f571d4361 100644
--- a/net/netfilter/nft_flow_offload.c
+++ b/net/netfilter/nft_flow_offload.c
@@ -13,7 +13,6 @@
 #include <net/netfilter/nf_conntrack_core.h>
 #include <linux/netfilter/nf_conntrack_common.h>
 #include <net/netfilter/nf_flow_table.h>
-#include <net/netfilter/nf_conntrack_helper.h>
 struct nft_flow_offload {
        struct nft_flowtable    *flowtable;
@@ -50,15 +49,20 @@ static int nft_flow_route(const struct nft_pktinfo *pkt,
        return 0;
 }
-static bool nft_flow_offload_skip(struct sk_buff *skb)
+static bool nft_flow_offload_skip(struct sk_buff *skb, int family)
 {
-        struct ip_options *opt  = &(IPCB(skb)->opt);
-        if (unlikely(opt->optlen))
-                return true;
        if (skb_sec_path(skb))
                return true;
+        if (family == NFPROTO_IPV4) {
+                const struct ip_options *opt;
+                opt = &(IPCB(skb)->opt);
+                if (unlikely(opt->optlen))
+                        return true;
+        }
        return false;
 }
@@ -68,15 +72,15 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,
 {
        struct nft_flow_offload *priv = nft_expr_priv(expr);
        struct nf_flowtable *flowtable = &priv->flowtable->data;
-        const struct nf_conn_help *help;
        enum ip_conntrack_info ctinfo;
        struct nf_flow_route route;
        struct flow_offload *flow;
        enum ip_conntrack_dir dir;
+        bool is_tcp = false;
        struct nf_conn *ct;
        int ret;
-        if (nft_flow_offload_skip(pkt->skb))
+        if (nft_flow_offload_skip(pkt->skb, nft_pf(pkt)))
                goto out;
        ct = nf_ct_get(pkt->skb, &ctinfo);
@@ -85,14 +89,16 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,
        switch (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum) {
        case IPPROTO_TCP:
+                is_tcp = true;
+                break;
        case IPPROTO_UDP:
                break;
        default:
                goto out;
        }
-        help = nfct_help(ct);
+        if (nf_ct_ext_exist(ct, NF_CT_EXT_HELPER) ||
-        if (help)
+            ct->status & IPS_SEQ_ADJUST)
                goto out;
        if (!nf_ct_is_confirmed(ct))
@@ -109,6 +115,11 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,
        if (!flow)
                goto err_flow_alloc;
+        if (is_tcp) {
+                ct->proto.tcp.seen[0].flags |= IP_CT_TCP_FLAG_BE_LIBERAL;
+                ct->proto.tcp.seen[1].flags |= IP_CT_TCP_FLAG_BE_LIBERAL;
+        }
        ret = flow_offload_add(flowtable, flow);
        if (ret < 0)
                goto err_flow_add;
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index ebd306f0d2fc..4e5d2e9ace5d 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -794,7 +794,7 @@ int tcf_action_dump(struct sk_buff *skb, struct tc_action *actions[],
        for (i = 0; i < TCA_ACT_MAX_PRIO && actions[i]; i++) {
                a = actions[i];
-                nest = nla_nest_start_noflag(skb, a->order);
+                nest = nla_nest_start_noflag(skb, i + 1);
                if (nest == NULL)
                        goto nla_put_failure;
                err = tcf_action_dump_1(skb, a, bind, ref);
@@ -1297,7 +1297,6 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
                        ret = PTR_ERR(act);
                        goto err;
                }
-                act->order = i;
                attr_size += tcf_action_fill_size(act);
                actions[i - 1] = act;
        }
diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
index ca54a7c7ec81..b95c408fd771 100644
--- a/net/tls/tls_device.c
+++ b/net/tls/tls_device.c
@@ -553,8 +553,8 @@ void tls_device_write_space(struct sock *sk, struct tls_context *ctx)
 void handle_device_resync(struct sock *sk, u32 seq, u64 rcd_sn)
 {
        struct tls_context *tls_ctx = tls_get_ctx(sk);
-        struct net_device *netdev = tls_ctx->netdev;
        struct tls_offload_context_rx *rx_ctx;
+        struct net_device *netdev;
        u32 is_req_pending;
        s64 resync_req;
        u32 req_seq;
@@ -568,10 +568,15 @@ void handle_device_resync(struct sock *sk, u32 seq, u64 rcd_sn)
        is_req_pending = resync_req;
        if (unlikely(is_req_pending) && req_seq == seq &&
-            atomic64_try_cmpxchg(&rx_ctx->resync_req, &resync_req, 0))
+            atomic64_try_cmpxchg(&rx_ctx->resync_req, &resync_req, 0)) {
-                netdev->tlsdev_ops->tls_dev_resync_rx(netdev, sk,
+                seq += TLS_HEADER_SIZE - 1;
-                                                      seq + TLS_HEADER_SIZE - 1,
+                down_read(&device_offload_lock);
-                                                      rcd_sn);
+                netdev = tls_ctx->netdev;
+                if (netdev)
+                        netdev->tlsdev_ops->tls_dev_resync_rx(netdev, sk, seq,
+                                                              rcd_sn);
+                up_read(&device_offload_lock);
+        }
 }
 static int tls_device_reencrypt(struct sock *sk, struct sk_buff *skb)
@@ -934,12 +939,6 @@ void tls_device_offload_cleanup_rx(struct sock *sk)
        if (!netdev)
                goto out;
-        if (!(netdev->features & NETIF_F_HW_TLS_RX)) {
-                pr_err_ratelimited("%s: device is missing NETIF_F_HW_TLS_RX cap\n",
-                                   __func__);
-                goto out;
-        }
        netdev->tlsdev_ops->tls_dev_del(netdev, tls_ctx,
                                        TLS_OFFLOAD_CTX_DIR_RX);
@@ -998,7 +997,8 @@ static int tls_dev_event(struct notifier_block *this, unsigned long event,
 {
        struct net_device *dev = netdev_notifier_info_to_dev(ptr);
-        if (!(dev->features & (NETIF_F_HW_TLS_RX | NETIF_F_HW_TLS_TX)))
+        if (!dev->tlsdev_ops &&
+            !(dev->features & (NETIF_F_HW_TLS_RX | NETIF_F_HW_TLS_TX)))
                return NOTIFY_DONE;
        switch (event) {
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index d93f83f77864..960494f437ac 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -1712,15 +1712,14 @@ int tls_sw_recvmsg(struct sock *sk,
                copied = err;
        }
-        len = len - copied;
+        if (len <= copied)
-        if (len) {
-                target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);
-                timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
-        } else {
                goto recv_end;
-        }
-        do {
+        target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);
+        len = len - copied;
+        timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
+        while (len && (decrypted + copied < target || ctx->recv_pkt)) {
                bool retain_skb = false;
                bool zc = false;
                int to_decrypt;
@@ -1851,11 +1850,7 @@ pick_next_record:
                } else {
                        break;
                }
+        }
-                /* If we have a new message from strparser, continue now. */
-                if (decrypted >= target && !ctx->recv_pkt)
-                        break;
-        } while (len);
 recv_end:
        if (num_async) {
diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index c8133b636a41..9be208db88d3 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -5,7 +5,7 @@ use strict;
 # Copyright (c) 2017 Mauro Carvalho Chehab <mchehab@kernel.org>
 #
-my $virtenv_dir = "sphinx_1.4";
+my $conf = "Documentation/conf.py";
 my $requirement_file = "Documentation/sphinx/requirements.txt";
 #
@@ -18,7 +18,9 @@ my $need = 0;
 my $optional = 0;
 my $need_symlink = 0;
 my $need_sphinx = 0;
+my $rec_sphinx_upgrade = 0;
 my $install = "";
+my $virtenv_dir = "sphinx_";
 #
 # Command line arguments
@@ -193,13 +195,15 @@ sub check_missing_tex($)
        }
 }
-sub check_sphinx()
+sub get_sphinx_fname()
 {
-        return if findprog("sphinx-build");
+        my $fname = "sphinx-build";
+        return $fname if findprog($fname);
-        if (findprog("sphinx-build-3")) {
+        $fname = "sphinx-build-3";
+        if (findprog($fname)) {
                $need_symlink = 1;
-                return;
+                return $fname;
        }
        if ($virtualenv) {
@@ -211,6 +215,73 @@ sub check_sphinx()
        } else {
                add_package("python-sphinx", 0);
        }
+        return "";
+}
+sub check_sphinx()
+{
+        my $min_version;
+        my $rec_version;
+        my $cur_version;
+        open IN, $conf or die "Can't open $conf";
+        while (<IN>) {
+                if (m/^\s*needs_sphinx\s*=\s*[\'\"]([\d\.]+)[\'\"]/) {
+                        $min_version=$1;
+                        last;
+                }
+        }
+        close IN;
+        die "Can't get needs_sphinx version from $conf" if (!$min_version);
+        open IN, $requirement_file or die "Can't open $requirement_file";
+        while (<IN>) {
+                if (m/^\s*Sphinx\s*==\s*([\d\.]+)$/) {
+                        $rec_version=$1;
+                        last;
+                }
+        }
+        close IN;
+        die "Can't get recommended sphinx version from $requirement_file" if (!$min_version);
+        $virtenv_dir .= $rec_version;
+        my $sphinx = get_sphinx_fname();
+        return if ($sphinx eq "");
+        open IN, "$sphinx --version 2>&1 |" or die "$sphinx returned an error";
+        while (<IN>) {
+                if (m/^\s*sphinx-build\s+([\d\.]+)$/) {
+                        $cur_version=$1;
+                        last;
+                }
+                # Sphinx 1.2.x uses a different format
+                if (m/^\s*Sphinx.*\s+([\d\.]+)$/) {
+                        $cur_version=$1;
+                        last;
+                }
+        }
+        close IN;
+        die "$sphinx didn't return its version" if (!$cur_version);
+        printf "Sphinx version %s (minimal: %s, recommended >= %s)\n",
+                $cur_version, $min_version, $rec_version;
+        if ($cur_version lt $min_version) {
+                print "Warning: Sphinx version should be >= $min_version\n\n";
+                $need_sphinx = 1;
+                return;
+        }
+        if ($cur_version lt $rec_version) {
+                print "Warning: It is recommended at least Sphinx version $rec_version.\n";
+                print "         To upgrade, use:\n\n";
+                $rec_sphinx_upgrade = 1;
+        }
 }
 #
@@ -532,7 +603,7 @@ sub check_needs()
                printf "\tsudo ln -sf %s /usr/bin/sphinx-build\n\n",
                       which("sphinx-build-3");
        }
-        if ($need_sphinx) {
+        if ($need_sphinx || $rec_sphinx_upgrade) {
                my $activate = "$virtenv_dir/bin/activate";
                if (-e "$ENV{'PWD'}/$activate") {
                        printf "\nNeed to activate virtualenv with:\n";
@@ -546,7 +617,8 @@ sub check_needs()
                        printf "\t$virtualenv $virtenv_dir\n";
                        printf "\t. $activate\n";
                        printf "\tpip install -r $requirement_file\n";
-                        $need++;
+                        $need++ if (!$rec_sphinx_upgrade);
                }
        }
        printf "\n";
diff --git a/sound/firewire/fireface/ff-protocol-latter.c b/sound/firewire/fireface/ff-protocol-latter.c
index c8236ff89b7f..b30d02d359b1 100644
--- a/sound/firewire/fireface/ff-protocol-latter.c
+++ b/sound/firewire/fireface/ff-protocol-latter.c
@@ -9,11 +9,11 @@
 #include "ff.h"
-#define LATTER_STF              0xffff00000004
+#define LATTER_STF              0xffff00000004ULL
-#define LATTER_ISOC_CHANNELS    0xffff00000008
+#define LATTER_ISOC_CHANNELS    0xffff00000008ULL
-#define LATTER_ISOC_START       0xffff0000000c
+#define LATTER_ISOC_START       0xffff0000000cULL
-#define LATTER_FETCH_MODE       0xffff00000010
+#define LATTER_FETCH_MODE       0xffff00000010ULL
-#define LATTER_SYNC_STATUS      0x0000801c0000
+#define LATTER_SYNC_STATUS      0x0000801c0000ULL
 static int parse_clock_bits(u32 data, unsigned int *rate,
                            enum snd_ff_clock_src *src)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 4f24fa80e1ed..50f86f458918 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -361,6 +361,7 @@ enum {
 #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
 #define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348)
+#define IS_CNL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9dc8)
 static char *driver_short_names[] = {
        [AZX_DRIVER_ICH] = "HDA Intel",
@@ -1686,8 +1687,8 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci,
        else
                chip->bdl_pos_adj = bdl_pos_adj[dev];
-        /* Workaround for a communication error on CFL (bko#199007) */
+        /* Workaround for a communication error on CFL (bko#199007) and CNL */
-        if (IS_CFL(pci))
+        if (IS_CFL(pci) || IS_CNL(pci))
                chip->polling_mode = 1;
        err = azx_bus_init(chip, model[dev], &pci_hda_io_ops);
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 2c1942dc6147..974244978509 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -821,6 +821,8 @@ static void alc_pre_init(struct hda_codec *codec)
        alc_fill_eapd_coef(codec);
 }
+#define is_s3_resume(codec) \
+        ((codec)->core.dev.power.power_state.event == PM_EVENT_RESUME)
 #define is_s4_resume(codec) \
        ((codec)->core.dev.power.power_state.event == PM_EVENT_RESTORE)
@@ -4888,6 +4890,8 @@ static void alc_update_headset_mode(struct hda_codec *codec)
        switch (new_headset_mode) {
        case ALC_HEADSET_MODE_UNPLUGGED:
                alc_headset_mode_unplugged(codec);
+                spec->current_headset_mode = ALC_HEADSET_MODE_UNKNOWN;
+                spec->current_headset_type = ALC_HEADSET_TYPE_UNKNOWN;
                spec->gen.hp_jack_present = false;
                break;
        case ALC_HEADSET_MODE_HEADSET:
@@ -4930,8 +4934,6 @@ static void alc_update_headset_mode_hook(struct hda_codec *codec,
 static void alc_update_headset_jack_cb(struct hda_codec *codec,
                                       struct hda_jack_callback *jack)
 {
-        struct alc_spec *spec = codec->spec;
-        spec->current_headset_type = ALC_HEADSET_TYPE_UNKNOWN;
        snd_hda_gen_hp_automute(codec, jack);
 }
@@ -4968,7 +4970,10 @@ static void alc_fixup_headset_mode(struct hda_codec *codec,
                alc_probe_headset_mode(codec);
                break;
        case HDA_FIXUP_ACT_INIT:
-                spec->current_headset_mode = 0;
+                if (is_s3_resume(codec) || is_s4_resume(codec)) {
+                        spec->current_headset_mode = ALC_HEADSET_MODE_UNKNOWN;
+                        spec->current_headset_type = ALC_HEADSET_TYPE_UNKNOWN;
+                }
                alc_update_headset_mode(codec);
                break;
        }
@@ -5734,7 +5739,7 @@ enum {
        ALC298_FIXUP_TPT470_DOCK,
        ALC255_FIXUP_DUMMY_LINEOUT_VERB,
        ALC255_FIXUP_DELL_HEADSET_MIC,
-        ALC256_FIXUP_HUAWEI_MBXP_PINS,
+        ALC256_FIXUP_HUAWEI_MACH_WX9_PINS,
        ALC295_FIXUP_HP_X360,
        ALC221_FIXUP_HP_HEADSET_MIC,
        ALC285_FIXUP_LENOVO_HEADPHONE_NOISE,
@@ -6025,7 +6030,7 @@ static const struct hda_fixup alc269_fixups[] = {
                .chained = true,
                .chain_id = ALC269_FIXUP_HEADSET_MIC
        },
-        [ALC256_FIXUP_HUAWEI_MBXP_PINS] = {
+        [ALC256_FIXUP_HUAWEI_MACH_WX9_PINS] = {
                .type = HDA_FIXUP_PINS,
                .v.pins = (const struct hda_pintbl[]) {
                        {0x12, 0x90a60130},
@@ -6205,13 +6210,15 @@ static const struct hda_fixup alc269_fixups[] = {
                .chain_id = ALC269_FIXUP_THINKPAD_ACPI,
        },
        [ALC255_FIXUP_ACER_MIC_NO_PRESENCE] = {
-                .type = HDA_FIXUP_PINS,
+                .type = HDA_FIXUP_VERBS,
-                .v.pins = (const struct hda_pintbl[]) {
+                .v.verbs = (const struct hda_verb[]) {
-                        { 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */
+                        /* Enable the Mic */
-                        { }
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x45 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x5089 },
+                        {}
                },
                .chained = true,
-                .chain_id = ALC255_FIXUP_HEADSET_MODE
+                .chain_id = ALC269_FIXUP_LIFEBOOK_EXTMIC
        },
        [ALC255_FIXUP_ASUS_MIC_NO_PRESENCE] = {
                .type = HDA_FIXUP_PINS,
@@ -7050,9 +7057,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
        SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),
        SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),
        SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
-        SND_PCI_QUIRK(0x19e5, 0x3200, "Huawei MBX", ALC255_FIXUP_MIC_MUTE_LED),
+        SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MACH-WX9", ALC256_FIXUP_HUAWEI_MACH_WX9_PINS),
-        SND_PCI_QUIRK(0x19e5, 0x3201, "Huawei MBX", ALC255_FIXUP_MIC_MUTE_LED),
-        SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MBXP", ALC256_FIXUP_HUAWEI_MBXP_PINS),
        SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */
 #if 0
@@ -7111,6 +7116,7 @@ static const struct snd_pci_quirk alc269_fixup_vendor_tbl[] = {
        SND_PCI_QUIRK_VENDOR(0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED),
        SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
        SND_PCI_QUIRK_VENDOR(0x17aa, "Thinkpad", ALC269_FIXUP_THINKPAD_ACPI),
+        SND_PCI_QUIRK_VENDOR(0x19e5, "Huawei Matebook", ALC255_FIXUP_MIC_MUTE_LED),
        {}
 };
@@ -7257,6 +7263,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
                {0x19, 0x0181303F},
                {0x21, 0x0221102f}),
        SND_HDA_PIN_QUIRK(0x10ec0255, 0x1025, "Acer", ALC255_FIXUP_ACER_MIC_NO_PRESENCE,
+                {0x12, 0x90a60140},
+                {0x14, 0x90170120},
+                {0x21, 0x02211030}),
+        SND_HDA_PIN_QUIRK(0x10ec0255, 0x1025, "Acer", ALC255_FIXUP_ACER_MIC_NO_PRESENCE,
                {0x12, 0x90a601c0},
                {0x14, 0x90171120},
                {0x21, 0x02211030}),
@@ -7693,7 +7703,7 @@ static int patch_alc269(struct hda_codec *codec)
        spec = codec->spec;
        spec->gen.shared_mic_vref_pin = 0x18;
-        codec->power_save_node = 1;
+        codec->power_save_node = 0;
 #ifdef CONFIG_PM
        codec->patch_ops.suspend = alc269_suspend;
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index b61f65bed4e4..2b57854335b3 100644
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -720,6 +720,15 @@ static int line6_init_cap_control(struct usb_line6 *line6)
        return 0;
 }
+static void line6_startup_work(struct work_struct *work)
+{
+        struct usb_line6 *line6 =
+                container_of(work, struct usb_line6, startup_work.work);
+        if (line6->startup)
+                line6->startup(line6);
+}
 /*
        Probe USB device.
 */
@@ -755,6 +764,7 @@ int line6_probe(struct usb_interface *interface,
        line6->properties = properties;
        line6->usbdev = usbdev;
        line6->ifcdev = &interface->dev;
+        INIT_DELAYED_WORK(&line6->startup_work, line6_startup_work);
        strcpy(card->id, properties->id);
        strcpy(card->driver, driver_name);
@@ -825,6 +835,8 @@ void line6_disconnect(struct usb_interface *interface)
        if (WARN_ON(usbdev != line6->usbdev))
                return;
+        cancel_delayed_work(&line6->startup_work);
        if (line6->urb_listen != NULL)
                line6_stop_listen(line6);
diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h
index 61425597eb61..650d909c9c4f 100644
--- a/sound/usb/line6/driver.h
+++ b/sound/usb/line6/driver.h
@@ -178,11 +178,15 @@ struct usb_line6 {
                        fifo;
        } messages;
+        /* Work for delayed PCM startup */
+        struct delayed_work startup_work;
        /* If MIDI is supported, buffer_message contains the pre-processed data;
         * otherwise the data is only in urb_listen (buffer_incoming).
         */
        void (*process_message)(struct usb_line6 *);
        void (*disconnect)(struct usb_line6 *line6);
+        void (*startup)(struct usb_line6 *line6);
 };
 extern char *line6_alloc_sysex_buffer(struct usb_line6 *line6, int code1,
diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c
index e28368d8eba2..55865f7e437d 100644
--- a/sound/usb/line6/toneport.c
+++ b/sound/usb/line6/toneport.c
@@ -54,9 +54,6 @@ struct usb_line6_toneport {
        /* Firmware version (x 100) */
        u8 firmware_version;
-        /* Work for delayed PCM startup */
-        struct delayed_work pcm_work;
        /* Device type */
        enum line6_device_type type;
@@ -241,12 +238,8 @@ static int snd_toneport_source_put(struct snd_kcontrol *kcontrol,
        return 1;
 }
-static void toneport_start_pcm(struct work_struct *work)
+static void toneport_startup(struct usb_line6 *line6)
 {
-        struct usb_line6_toneport *toneport =
-                container_of(work, struct usb_line6_toneport, pcm_work.work);
-        struct usb_line6 *line6 = &toneport->line6;
        line6_pcm_acquire(line6->line6pcm, LINE6_STREAM_MONITOR, true);
 }
@@ -394,7 +387,7 @@ static int toneport_setup(struct usb_line6_toneport *toneport)
        if (toneport_has_led(toneport))
                toneport_update_led(toneport);
-        schedule_delayed_work(&toneport->pcm_work,
+        schedule_delayed_work(&toneport->line6.startup_work,
                              msecs_to_jiffies(TONEPORT_PCM_DELAY * 1000));
        return 0;
 }
@@ -407,8 +400,6 @@ static void line6_toneport_disconnect(struct usb_line6 *line6)
        struct usb_line6_toneport *toneport =
                (struct usb_line6_toneport *)line6;
-        cancel_delayed_work_sync(&toneport->pcm_work);
        if (toneport_has_led(toneport))
                toneport_remove_leds(toneport);
 }
@@ -424,9 +415,9 @@ static int toneport_init(struct usb_line6 *line6,
        struct usb_line6_toneport *toneport =  (struct usb_line6_toneport *) line6;
        toneport->type = id->driver_info;
-        INIT_DELAYED_WORK(&toneport->pcm_work, toneport_start_pcm);
        line6->disconnect = line6_toneport_disconnect;
+        line6->startup = toneport_startup;
        /* initialize PCM subsystem: */
        err = line6_init_pcm(line6, &toneport_pcm_properties);
diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest
index 136387422b00..7da5e31fa0ed 100755
--- a/tools/testing/selftests/ftrace/ftracetest
+++ b/tools/testing/selftests/ftrace/ftracetest
@@ -318,6 +318,7 @@ run_test() { # testfile
    local testlog=/proc/self/fd/1
  fi
  export TMPDIR=`mktemp -d /tmp/ftracetest-dir.XXXXXX`
+  export FTRACETEST_ROOT=$TOP_DIR
  echo "execute$INSTANCE: "$1 > $testlog
  SIG_RESULT=0
  if [ $VERBOSE -eq -1 ]; then
diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc
index 492426e95e09..7650a82db3f5 100644
--- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc
+++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc
@@ -3,7 +3,7 @@
 # description: Kprobe dynamic event with function tracer
 [ -f kprobe_events ] || exit_unsupported # this is configurable
-grep function available_tracers || exit_unsupported # this is configurable
+grep "function" available_tracers || exit_unsupported # this is configurable
 # prepare
 echo nop > current_tracer
diff --git a/tools/testing/selftests/ftrace/test.d/selftest/bashisms.tc b/tools/testing/selftests/ftrace/test.d/selftest/bashisms.tc
new file mode 100644
index 000000000000..1b081e910e14
--- /dev/null
+++ b/tools/testing/selftests/ftrace/test.d/selftest/bashisms.tc
@@ -0,0 +1,21 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# description: Meta-selftest: Checkbashisms
+if [ ! -f $FTRACETEST_ROOT/ftracetest ]; then
+  echo "Hmm, we can not find ftracetest"
+  exit_unresolved
+fi
+if ! which checkbashisms > /dev/null 2>&1 ; then
+  echo "No checkbashisms found. skipped."
+  exit_unresolved
+fi
+checkbashisms $FTRACETEST_ROOT/ftracetest
+checkbashisms $FTRACETEST_ROOT/test.d/functions
+for t in $(find $FTRACETEST_ROOT/test.d -name \*.tc); do
+  checkbashisms $t
+done
+exit 0
diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h
index 941d9391377f..2067c6b0e8a1 100644
--- a/tools/testing/selftests/kselftest_harness.h
+++ b/tools/testing/selftests/kselftest_harness.h
@@ -62,6 +62,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
+#define TEST_TIMEOUT_DEFAULT 30
 /* Utilities exposed to the test definitions */
 #ifndef TH_LOG_STREAM
@@ -169,7 +170,8 @@
        static void test_name(struct __test_metadata *_metadata); \
        static struct __test_metadata _##test_name##_object = \
                { .name = "global." #test_name, \
-                  .fn = &test_name, .termsig = _signal }; \
+                  .fn = &test_name, .termsig = _signal, \
+                  .timeout = TEST_TIMEOUT_DEFAULT, }; \
        static void __attribute__((constructor)) _register_##test_name(void) \
        { \
                __register_test(&_##test_name##_object); \
@@ -280,12 +282,15 @@
 */
 /* TODO(wad) register fixtures on dedicated test lists. */
 #define TEST_F(fixture_name, test_name) \
-        __TEST_F_IMPL(fixture_name, test_name, -1)
+        __TEST_F_IMPL(fixture_name, test_name, -1, TEST_TIMEOUT_DEFAULT)
 #define TEST_F_SIGNAL(fixture_name, test_name, signal) \
-        __TEST_F_IMPL(fixture_name, test_name, signal)
+        __TEST_F_IMPL(fixture_name, test_name, signal, TEST_TIMEOUT_DEFAULT)
-#define __TEST_F_IMPL(fixture_name, test_name, signal) \
+#define TEST_F_TIMEOUT(fixture_name, test_name, timeout) \
+        __TEST_F_IMPL(fixture_name, test_name, -1, timeout)
+#define __TEST_F_IMPL(fixture_name, test_name, signal, tmout) \
        static void fixture_name##_##test_name( \
                struct __test_metadata *_metadata, \
                FIXTURE_DATA(fixture_name) *self); \
@@ -307,6 +312,7 @@
                .name = #fixture_name "." #test_name, \
                .fn = &wrapper_##fixture_name##_##test_name, \
                .termsig = signal, \
+                .timeout = tmout, \
         }; \
        static void __attribute__((constructor)) \
                        _register_##fixture_name##_##test_name(void) \
@@ -632,6 +638,7 @@ struct __test_metadata {
        int termsig;
        int passed;
        int trigger; /* extra handler after the evaluation */
+        int timeout;
        __u8 step;
        bool no_print; /* manual trigger when TH_LOG_STREAM is not available */
        struct __test_metadata *prev, *next;
@@ -696,7 +703,7 @@ void __run_test(struct __test_metadata *t)
        t->passed = 1;
        t->trigger = 0;
        printf("[ RUN      ] %s\n", t->name);
-        alarm(30);
+        alarm(t->timeout);
        child_pid = fork();
        if (child_pid < 0) {
                printf("ERROR SPAWNING TEST CHILD\n");
diff --git a/tools/testing/selftests/net/pmtu.sh b/tools/testing/selftests/net/pmtu.sh
index b9171a7b3aaa..317dafcd605d 100755
--- a/tools/testing/selftests/net/pmtu.sh
+++ b/tools/testing/selftests/net/pmtu.sh
@@ -208,8 +208,8 @@ tunnel6_a_addr="fd00:2::a"
 tunnel6_b_addr="fd00:2::b"
 tunnel6_mask="64"
-dummy6_0_addr="fc00:1000::0"
+dummy6_0_prefix="fc00:1000::"
-dummy6_1_addr="fc00:1001::0"
+dummy6_1_prefix="fc00:1001::"
 dummy6_mask="64"
 cleanup_done=1
@@ -1005,13 +1005,13 @@ test_pmtu_vti6_link_change_mtu() {
        run_cmd ${ns_a} ip link set dummy0 up
        run_cmd ${ns_a} ip link set dummy1 up
-        run_cmd ${ns_a} ip addr add ${dummy6_0_addr}/${dummy6_mask} dev dummy0
+        run_cmd ${ns_a} ip addr add ${dummy6_0_prefix}1/${dummy6_mask} dev dummy0
-        run_cmd ${ns_a} ip addr add ${dummy6_1_addr}/${dummy6_mask} dev dummy1
+        run_cmd ${ns_a} ip addr add ${dummy6_1_prefix}1/${dummy6_mask} dev dummy1
        fail=0
        # Create vti6 interface bound to device, passing MTU, check it
-        run_cmd ${ns_a} ip link add vti6_a mtu 1300 type vti6 remote ${dummy6_0_addr} local ${dummy6_0_addr}
+        run_cmd ${ns_a} ip link add vti6_a mtu 1300 type vti6 remote ${dummy6_0_prefix}2 local ${dummy6_0_prefix}1
        mtu="$(link_get_mtu "${ns_a}" vti6_a)"
        if [ ${mtu} -ne 1300 ]; then
                err "  vti6 MTU ${mtu} doesn't match configured value 1300"
@@ -1020,7 +1020,7 @@ test_pmtu_vti6_link_change_mtu() {
        # Move to another device with different MTU, without passing MTU, check
        # MTU is adjusted
-        run_cmd ${ns_a} ip link set vti6_a type vti6 remote ${dummy6_1_addr} local ${dummy6_1_addr}
+        run_cmd ${ns_a} ip link set vti6_a type vti6 remote ${dummy6_1_prefix}2 local ${dummy6_1_prefix}1
        mtu="$(link_get_mtu "${ns_a}" vti6_a)"
        if [ ${mtu} -ne $((3000 - 40)) ]; then
                err "  vti MTU ${mtu} is not dummy MTU 3000 minus IPv6 header length"
@@ -1028,7 +1028,7 @@ test_pmtu_vti6_link_change_mtu() {
        fi
        # Move it back, passing MTU, check MTU is not overridden
-        run_cmd ${ns_a} ip link set vti6_a mtu 1280 type vti6 remote ${dummy6_0_addr} local ${dummy6_0_addr}
+        run_cmd ${ns_a} ip link set vti6_a mtu 1280 type vti6 remote ${dummy6_0_prefix}2 local ${dummy6_0_prefix}1
        mtu="$(link_get_mtu "${ns_a}" vti6_a)"
        if [ ${mtu} -ne 1280 ]; then
                err "  vti6 MTU ${mtu} doesn't match configured value 1280"
diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/net/tls.c
index 47ddfc154036..278c86134556 100644
--- a/tools/testing/selftests/net/tls.c
+++ b/tools/testing/selftests/net/tls.c
@@ -442,6 +442,21 @@ TEST_F(tls, multiple_send_single_recv)
        EXPECT_EQ(memcmp(send_mem, recv_mem + send_len, send_len), 0);
 }
+TEST_F(tls, single_send_multiple_recv_non_align)
+{
+        const unsigned int total_len = 15;
+        const unsigned int recv_len = 10;
+        char recv_mem[recv_len * 2];
+        char send_mem[total_len];
+        EXPECT_GE(send(self->fd, send_mem, total_len, 0), 0);
+        memset(recv_mem, 0, total_len);
+        EXPECT_EQ(recv(self->cfd, recv_mem, recv_len, 0), recv_len);
+        EXPECT_EQ(recv(self->cfd, recv_mem + recv_len, recv_len, 0), 5);
+        EXPECT_EQ(memcmp(send_mem, recv_mem, total_len), 0);
+}
 TEST_F(tls, recv_partial)
 {
        char const *test_str = "test_read_partial";
@@ -575,6 +590,25 @@ TEST_F(tls, recv_peek_large_buf_mult_recs)
        EXPECT_EQ(memcmp(test_str, buf, len), 0);
 }
+TEST_F(tls, recv_lowat)
+{
+        char send_mem[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+        char recv_mem[20];
+        int lowat = 8;
+        EXPECT_EQ(send(self->fd, send_mem, 10, 0), 10);
+        EXPECT_EQ(send(self->fd, send_mem, 5, 0), 5);
+        memset(recv_mem, 0, 20);
+        EXPECT_EQ(setsockopt(self->cfd, SOL_SOCKET, SO_RCVLOWAT,
+                             &lowat, sizeof(lowat)), 0);
+        EXPECT_EQ(recv(self->cfd, recv_mem, 1, MSG_WAITALL), 1);
+        EXPECT_EQ(recv(self->cfd, recv_mem + 1, 6, MSG_WAITALL), 6);
+        EXPECT_EQ(recv(self->cfd, recv_mem + 7, 10, 0), 8);
+        EXPECT_EQ(memcmp(send_mem, recv_mem, 10), 0);
+        EXPECT_EQ(memcmp(send_mem, recv_mem + 10, 5), 0);
+}
 TEST_F(tls, pollin)
 {
diff --git a/tools/testing/selftests/netfilter/Makefile b/tools/testing/selftests/netfilter/Makefile
index 3e6d1bcc2894..4144984ebee5 100644
--- a/tools/testing/selftests/netfilter/Makefile
+++ b/tools/testing/selftests/netfilter/Makefile
@@ -2,6 +2,6 @@
 # Makefile for netfilter selftests
 TEST_PROGS := nft_trans_stress.sh nft_nat.sh bridge_brouter.sh \
-        conntrack_icmp_related.sh
+        conntrack_icmp_related.sh nft_flowtable.sh
 include ../lib.mk
diff --git a/tools/testing/selftests/netfilter/nft_flowtable.sh b/tools/testing/selftests/netfilter/nft_flowtable.sh
new file mode 100755
index 000000000000..fe52488a6f72
--- /dev/null
+++ b/tools/testing/selftests/netfilter/nft_flowtable.sh
@@ -0,0 +1,324 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+#
+# This tests basic flowtable functionality.
+# Creates following topology:
+#
+# Originator (MTU 9000) <-Router1-> MTU 1500 <-Router2-> Responder (MTU 2000)
+# Router1 is the one doing flow offloading, Router2 has no special
+# purpose other than having a link that is smaller than either Originator
+# and responder, i.e. TCPMSS announced values are too large and will still
+# result in fragmentation and/or PMTU discovery.
+# Kselftest framework requirement - SKIP code is 4.
+ksft_skip=4
+ret=0
+ns1in=""
+ns2in=""
+ns1out=""
+ns2out=""
+log_netns=$(sysctl -n net.netfilter.nf_log_all_netns)
+nft --version > /dev/null 2>&1
+if [ $? -ne 0 ];then
+        echo "SKIP: Could not run test without nft tool"
+        exit $ksft_skip
+fi
+ip -Version > /dev/null 2>&1
+if [ $? -ne 0 ];then
+        echo "SKIP: Could not run test without ip tool"
+        exit $ksft_skip
+fi
+which nc > /dev/null 2>&1
+if [ $? -ne 0 ];then
+        echo "SKIP: Could not run test without nc (netcat)"
+        exit $ksft_skip
+fi
+ip netns add nsr1
+if [ $? -ne 0 ];then
+        echo "SKIP: Could not create net namespace"
+        exit $ksft_skip
+fi
+ip netns add ns1
+ip netns add ns2
+ip netns add nsr2
+cleanup() {
+        for i in 1 2; do
+                ip netns del ns$i
+                ip netns del nsr$i
+        done
+        rm -f "$ns1in" "$ns1out"
+        rm -f "$ns2in" "$ns2out"
+        [ $log_netns -eq 0 ] && sysctl -q net.netfilter.nf_log_all_netns=$log_netns
+}
+trap cleanup EXIT
+sysctl -q net.netfilter.nf_log_all_netns=1
+ip link add veth0 netns nsr1 type veth peer name eth0 netns ns1
+ip link add veth1 netns nsr1 type veth peer name veth0 netns nsr2
+ip link add veth1 netns nsr2 type veth peer name eth0 netns ns2
+for dev in lo veth0 veth1; do
+  for i in 1 2; do
+    ip -net nsr$i link set $dev up
+  done
+done
+ip -net nsr1 addr add 10.0.1.1/24 dev veth0
+ip -net nsr1 addr add dead:1::1/64 dev veth0
+ip -net nsr2 addr add 10.0.2.1/24 dev veth1
+ip -net nsr2 addr add dead:2::1/64 dev veth1
+# set different MTUs so we need to push packets coming from ns1 (large MTU)
+# to ns2 (smaller MTU) to stack either to perform fragmentation (ip_no_pmtu_disc=1),
+# or to do PTMU discovery (send ICMP error back to originator).
+# ns2 is going via nsr2 with a smaller mtu, so that TCPMSS announced by both peers
+# is NOT the lowest link mtu.
+ip -net nsr1 link set veth0 mtu 9000
+ip -net ns1 link set eth0 mtu 9000
+ip -net nsr2 link set veth1 mtu 2000
+ip -net ns2 link set eth0 mtu 2000
+# transfer-net between nsr1 and nsr2.
+# these addresses are not used for connections.
+ip -net nsr1 addr add 192.168.10.1/24 dev veth1
+ip -net nsr1 addr add fee1:2::1/64 dev veth1
+ip -net nsr2 addr add 192.168.10.2/24 dev veth0
+ip -net nsr2 addr add fee1:2::2/64 dev veth0
+for i in 1 2; do
+  ip netns exec nsr$i sysctl net.ipv4.conf.veth0.forwarding=1 > /dev/null
+  ip netns exec nsr$i sysctl net.ipv4.conf.veth1.forwarding=1 > /dev/null
+  ip -net ns$i link set lo up
+  ip -net ns$i link set eth0 up
+  ip -net ns$i addr add 10.0.$i.99/24 dev eth0
+  ip -net ns$i route add default via 10.0.$i.1
+  ip -net ns$i addr add dead:$i::99/64 dev eth0
+  ip -net ns$i route add default via dead:$i::1
+  ip netns exec ns$i sysctl net.ipv4.tcp_no_metrics_save=1 > /dev/null
+  # don't set ip DF bit for first two tests
+  ip netns exec ns$i sysctl net.ipv4.ip_no_pmtu_disc=1 > /dev/null
+done
+ip -net nsr1 route add default via 192.168.10.2
+ip -net nsr2 route add default via 192.168.10.1
+ip netns exec nsr1 nft -f - <<EOF
+table inet filter {
+  flowtable f1 {
+     hook ingress priority 0
+     devices = { veth0, veth1 }
+   }
+   chain forward {
+      type filter hook forward priority 0; policy drop;
+      # flow offloaded? Tag ct with mark 1, so we can detect when it fails.
+      meta oif "veth1" tcp dport 12345 flow offload @f1 counter
+      # use packet size to trigger 'should be offloaded by now'.
+      # otherwise, if 'flow offload' expression never offloads, the
+      # test will pass.
+      tcp dport 12345 meta length gt 200 ct mark set 1 counter
+      # this turns off flow offloading internally, so expect packets again
+      tcp flags fin,rst ct mark set 0 accept
+      # this allows large packets from responder, we need this as long
+      # as PMTUd is off.
+      # This rule is deleted for the last test, when we expect PMTUd
+      # to kick in and ensure all packets meet mtu requirements.
+      meta length gt 1500 accept comment something-to-grep-for
+      # next line blocks connection w.o. working offload.
+      # we only do this for reverse dir, because we expect packets to
+      # enter slow path due to MTU mismatch of veth0 and veth1.
+      tcp sport 12345 ct mark 1 counter log prefix "mark failure " drop
+      ct state established,related accept
+      # for packets that we can't offload yet, i.e. SYN (any ct that is not confirmed)
+      meta length lt 200 oif "veth1" tcp dport 12345 counter accept
+      meta nfproto ipv4 meta l4proto icmp accept
+      meta nfproto ipv6 meta l4proto icmpv6 accept
+   }
+}
+EOF
+if [ $? -ne 0 ]; then
+        echo "SKIP: Could not load nft ruleset"
+        exit $ksft_skip
+fi
+# test basic connectivity
+ip netns exec ns1 ping -c 1 -q 10.0.2.99 > /dev/null
+if [ $? -ne 0 ];then
+  echo "ERROR: ns1 cannot reach ns2" 1>&2
+  bash
+  exit 1
+fi
+ip netns exec ns2 ping -c 1 -q 10.0.1.99 > /dev/null
+if [ $? -ne 0 ];then
+  echo "ERROR: ns2 cannot reach ns1" 1>&2
+  exit 1
+fi
+if [ $ret -eq 0 ];then
+        echo "PASS: netns routing/connectivity: ns1 can reach ns2"
+fi
+ns1in=$(mktemp)
+ns1out=$(mktemp)
+ns2in=$(mktemp)
+ns2out=$(mktemp)
+make_file()
+{
+        name=$1
+        who=$2
+        SIZE=$((RANDOM % (1024 * 8)))
+        TSIZE=$((SIZE * 1024))
+        dd if=/dev/urandom of="$name" bs=1024 count=$SIZE 2> /dev/null
+        SIZE=$((RANDOM % 1024))
+        SIZE=$((SIZE + 128))
+        TSIZE=$((TSIZE + SIZE))
+        dd if=/dev/urandom conf=notrunc of="$name" bs=1 count=$SIZE 2> /dev/null
+}
+check_transfer()
+{
+        in=$1
+        out=$2
+        what=$3
+        cmp "$in" "$out" > /dev/null 2>&1
+        if [ $? -ne 0 ] ;then
+                echo "FAIL: file mismatch for $what" 1>&2
+                ls -l "$in"
+                ls -l "$out"
+                return 1
+        fi
+        return 0
+}
+test_tcp_forwarding()
+{
+        local nsa=$1
+        local nsb=$2
+        local lret=0
+        ip netns exec $nsb nc -w 5 -l -p 12345 < "$ns2in" > "$ns2out" &
+        lpid=$!
+        sleep 1
+        ip netns exec $nsa nc -w 4 10.0.2.99 12345 < "$ns1in" > "$ns1out" &
+        cpid=$!
+        sleep 3
+        kill $lpid
+        kill $cpid
+        wait
+        check_transfer "$ns1in" "$ns2out" "ns1 -> ns2"
+        if [ $? -ne 0 ];then
+                lret=1
+        fi
+        check_transfer "$ns2in" "$ns1out" "ns1 <- ns2"
+        if [ $? -ne 0 ];then
+                lret=1
+        fi
+        return $lret
+}
+make_file "$ns1in" "ns1"
+make_file "$ns2in" "ns2"
+# First test:
+# No PMTU discovery, nsr1 is expected to fragment packets from ns1 to ns2 as needed.
+test_tcp_forwarding ns1 ns2
+if [ $? -eq 0 ] ;then
+        echo "PASS: flow offloaded for ns1/ns2"
+else
+        echo "FAIL: flow offload for ns1/ns2:" 1>&2
+        ip netns exec nsr1 nft list ruleset
+        ret=1
+fi
+# delete default route, i.e. ns2 won't be able to reach ns1 and
+# will depend on ns1 being masqueraded in nsr1.
+# expect ns1 has nsr1 address.
+ip -net ns2 route del default via 10.0.2.1
+ip -net ns2 route del default via dead:2::1
+ip -net ns2 route add 192.168.10.1 via 10.0.2.1
+# Second test:
+# Same, but with NAT enabled.
+ip netns exec nsr1 nft -f - <<EOF
+table ip nat {
+   chain postrouting {
+      type nat hook postrouting priority 0; policy accept;
+      meta oifname "veth1" masquerade
+   }
+}
+EOF
+test_tcp_forwarding ns1 ns2
+if [ $? -eq 0 ] ;then
+        echo "PASS: flow offloaded for ns1/ns2 with NAT"
+else
+        echo "FAIL: flow offload for ns1/ns2 with NAT" 1>&2
+        ip netns exec nsr1 nft list ruleset
+        ret=1
+fi
+# Third test:
+# Same as second test, but with PMTU discovery enabled.
+handle=$(ip netns exec nsr1 nft -a list table inet filter | grep something-to-grep-for | cut -d \# -f 2)
+ip netns exec nsr1 nft delete rule inet filter forward $handle
+if [ $? -ne 0 ] ;then
+        echo "FAIL: Could not delete large-packet accept rule"
+        exit 1
+fi
+ip netns exec ns1 sysctl net.ipv4.ip_no_pmtu_disc=0 > /dev/null
+ip netns exec ns2 sysctl net.ipv4.ip_no_pmtu_disc=0 > /dev/null
+test_tcp_forwarding ns1 ns2
+if [ $? -eq 0 ] ;then
+        echo "PASS: flow offloaded for ns1/ns2 with NAT and pmtu discovery"
+else
+        echo "FAIL: flow offload for ns1/ns2 with NAT and pmtu discovery" 1>&2
+        ip netns exec nsr1 nft list ruleset
+fi
+exit $ret
diff --git a/tools/testing/selftests/netfilter/nft_nat.sh b/tools/testing/selftests/netfilter/nft_nat.sh
index 14fcf3104c77..1be55e705780 100755
--- a/tools/testing/selftests/netfilter/nft_nat.sh
+++ b/tools/testing/selftests/netfilter/nft_nat.sh
@@ -36,7 +36,11 @@ trap cleanup EXIT
 ip netns add ns1
 ip netns add ns2
-ip link add veth0 netns ns0 type veth peer name eth0 netns ns1
+ip link add veth0 netns ns0 type veth peer name eth0 netns ns1 > /dev/null 2>&1
+if [ $? -ne 0 ];then
+    echo "SKIP: No virtual ethernet pair device support in kernel"
+    exit $ksft_skip
+fi
 ip link add veth1 netns ns0 type veth peer name eth0 netns ns2
 ip -net ns0 link set lo up
diff --git a/tools/testing/selftests/rtc/rtctest.c b/tools/testing/selftests/rtc/rtctest.c
index b2065536d407..66af608fb4c6 100644
--- a/tools/testing/selftests/rtc/rtctest.c
+++ b/tools/testing/selftests/rtc/rtctest.c
@@ -49,7 +49,7 @@ TEST_F(rtc, date_read) {
               rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec);
 }
-TEST_F(rtc, uie_read) {
+TEST_F_TIMEOUT(rtc, uie_read, NUM_UIE + 2) {
        int i, rc, irq = 0;
        unsigned long data;
@@ -211,7 +211,7 @@ TEST_F(rtc, alarm_wkalm_set) {
        ASSERT_EQ(new, secs);
 }
-TEST_F(rtc, alarm_alm_set_minute) {
+TEST_F_TIMEOUT(rtc, alarm_alm_set_minute, 65) {
        struct timeval tv = { .tv_sec = 62 };
        unsigned long data;
        struct rtc_time tm;
@@ -264,7 +264,7 @@ TEST_F(rtc, alarm_alm_set_minute) {
        ASSERT_EQ(new, secs);
 }
-TEST_F(rtc, alarm_wkalm_set_minute) {
+TEST_F_TIMEOUT(rtc, alarm_wkalm_set_minute, 65) {
        struct timeval tv = { .tv_sec = 62 };
        struct rtc_wkalrm alarm = { 0 };
        struct rtc_time tm;