re-export patches for SOB lines

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

118 files changed, 425 insertions, 324 deletions

diff --git a/queue/ARM64-dts-meson-gxbb-odroidc2-fix-usb1-power-supply.patch b/queue/ARM64-dts-meson-gxbb-odroidc2-fix-usb1-power-supply.patch
index 3dab528..448e4d9 100644
--- a/queue/ARM64-dts-meson-gxbb-odroidc2-fix-usb1-power-supply.patch
+++ b/queue/ARM64-dts-meson-gxbb-odroidc2-fix-usb1-power-supply.patch
@@ -1,4 +1,4 @@
-From e841ec956e539f4002f5e9fe9f9e904dcca12d5d Mon Sep 17 00:00:00 2001
+From 1731ec9a8041dd9799a94ccdedab4e063d54c11d Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Thu, 19 Oct 2017 12:31:09 +0200
 Subject: [PATCH] ARM64: dts: meson-gxbb-odroidc2: fix usb1 power supply
@@ -12,12 +12,13 @@ If the usb0 fails to initialize, the second one won't have power.
 Fixes: 5a0803bd5ae2 ("ARM64: dts: meson-gxbb-odroidc2: Enable USB Nodes")
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
 Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-index 1deaa53c9fb5..2e5ed59e697e 100644
+index 54a9c6a6b392..6e99eeb4505d 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-@@ -301,6 +301,7 @@
+@@ -257,6 +257,7 @@
  
  &usb1_phy {
  	status = "okay";
diff --git a/queue/ASoC-Intel-Skylake-Fix-uuid_module-memory-leak-in-fa.patch b/queue/ASoC-Intel-Skylake-Fix-uuid_module-memory-leak-in-fa.patch
index 593523b..ddd0201 100644
--- a/queue/ASoC-Intel-Skylake-Fix-uuid_module-memory-leak-in-fa.patch
+++ b/queue/ASoC-Intel-Skylake-Fix-uuid_module-memory-leak-in-fa.patch
@@ -1,4 +1,4 @@
-From f8e066521192c7debe59127d90abbe2773577e25 Mon Sep 17 00:00:00 2001
+From f0efc90a61b373354c4112c82974f2220118da49 Mon Sep 17 00:00:00 2001
 From: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
 Date: Tue, 7 Nov 2017 16:16:19 +0530
 Subject: [PATCH] ASoC: Intel: Skylake: Fix uuid_module memory leak in failure
@@ -14,9 +14,10 @@ Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
 Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com>
 Acked-By: Vinod Koul <vinod.koul@intel.com>
 Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/sound/soc/intel/skylake/skl-sst-utils.c b/sound/soc/intel/skylake/skl-sst-utils.c
-index 369ef7ce981c..8ff89280d9fd 100644
+index 81ee251881b4..907e61c98cb8 100644
 --- a/sound/soc/intel/skylake/skl-sst-utils.c
 +++ b/sound/soc/intel/skylake/skl-sst-utils.c
 @@ -251,6 +251,7 @@ int snd_skl_parse_uuids(struct sst_dsp *ctx, const struct firmware *fw,
diff --git a/queue/ASoC-rsnd-rsnd_ssi_run_mods-needs-to-care-ssi_parent.patch b/queue/ASoC-rsnd-rsnd_ssi_run_mods-needs-to-care-ssi_parent.patch
index 5dc59b5..b776557 100644
--- a/queue/ASoC-rsnd-rsnd_ssi_run_mods-needs-to-care-ssi_parent.patch
+++ b/queue/ASoC-rsnd-rsnd_ssi_run_mods-needs-to-care-ssi_parent.patch
@@ -1,4 +1,4 @@
-From 21781e87881f9c420871b1d1f3f29d4cd7bffb10 Mon Sep 17 00:00:00 2001
+From 6f5298a00d60b965486012331815078cc45b2b33 Mon Sep 17 00:00:00 2001
 From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
 Date: Wed, 1 Nov 2017 07:16:58 +0000
 Subject: [PATCH] ASoC: rsnd: rsnd_ssi_run_mods() needs to care ssi_parent_mod
@@ -11,12 +11,13 @@ This patch fixes it.
 
 Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
 Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
-index 58e3420a1f05..43c31d153ea6 100644
+index 91e5c07911b4..36e0cbb94352 100644
 --- a/sound/soc/sh/rcar/ssi.c
 +++ b/sound/soc/sh/rcar/ssi.c
-@@ -195,10 +195,15 @@ static u32 rsnd_ssi_run_mods(struct rsnd_dai_stream *io)
+@@ -172,10 +172,15 @@ static u32 rsnd_ssi_run_mods(struct rsnd_dai_stream *io)
  {
  	struct rsnd_mod *ssi_mod = rsnd_io_to_mod_ssi(io);
  	struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io);
diff --git a/queue/Bluetooth-hci_ldisc-Fix-another-race-when-closing-th.patch b/queue/Bluetooth-hci_ldisc-Fix-another-race-when-closing-th.patch
index 8aed350..0d9dd3b 100644
--- a/queue/Bluetooth-hci_ldisc-Fix-another-race-when-closing-th.patch
+++ b/queue/Bluetooth-hci_ldisc-Fix-another-race-when-closing-th.patch
@@ -1,4 +1,4 @@
-From 63d8a124a0e25ba0af4eafa7c75e2a7305a99d6e Mon Sep 17 00:00:00 2001
+From e4364e953ab30ed5203f959c5a43fe733635b598 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ronald=20Tschal=C3=A4r?= <ronald@innovation.ch>
 Date: Wed, 25 Oct 2017 22:15:19 -0700
 Subject: [PATCH] Bluetooth: hci_ldisc: Fix another race when closing the tty.
diff --git a/queue/GFS2-Take-inode-off-order_write-list-when-setting-jd.patch b/queue/GFS2-Take-inode-off-order_write-list-when-setting-jd.patch
index 2897eff..db92e7e 100644
--- a/queue/GFS2-Take-inode-off-order_write-list-when-setting-jd.patch
+++ b/queue/GFS2-Take-inode-off-order_write-list-when-setting-jd.patch
@@ -1,4 +1,4 @@
-From cc555b09d8c3817aeebda43a14ab67049a5653f7 Mon Sep 17 00:00:00 2001
+From 20a3cbf2dac17f7079343ba7ed502d3d77a1f521 Mon Sep 17 00:00:00 2001
 From: Bob Peterson <rpeterso@redhat.com>
 Date: Wed, 20 Sep 2017 08:30:04 -0500
 Subject: [PATCH] GFS2: Take inode off order_write list when setting jdata flag
@@ -39,12 +39,13 @@ before setting the flag.
 Signed-off-by: Bob Peterson <rpeterso@redhat.com>
 Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
 Acked-by: Abhijith Das <adas@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
-index 8fefb80fe830..c7aea96144b4 100644
+index c2062a108d19..3477dead24bd 100644
 --- a/fs/gfs2/file.c
 +++ b/fs/gfs2/file.c
-@@ -267,7 +267,7 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)
+@@ -256,7 +256,7 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)
  			goto out;
  	}
  	if ((flags ^ new_flags) & GFS2_DIF_JDATA) {
@@ -53,7 +54,7 @@ index 8fefb80fe830..c7aea96144b4 100644
  			gfs2_log_flush(sdp, ip->i_gl, NORMAL_FLUSH);
  		error = filemap_fdatawrite(inode->i_mapping);
  		if (error)
-@@ -275,6 +275,8 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)
+@@ -264,6 +264,8 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)
  		error = filemap_fdatawait(inode->i_mapping);
  		if (error)
  			goto out;
diff --git a/queue/HID-cp2112-fix-broken-gpio_direction_input-callback.patch b/queue/HID-cp2112-fix-broken-gpio_direction_input-callback.patch
index 06796f5..cd80eea 100644
--- a/queue/HID-cp2112-fix-broken-gpio_direction_input-callback.patch
+++ b/queue/HID-cp2112-fix-broken-gpio_direction_input-callback.patch
@@ -1,4 +1,4 @@
-From 7da85fbf1c87d4f73621e0e7666a3387497075a9 Mon Sep 17 00:00:00 2001
+From ed7e2c3efb59449d70f0aaf8016eeee4fdff42ab Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
  <sebastien.szymanski@armadeus.com>
 Date: Fri, 10 Nov 2017 10:01:43 +0100
@@ -16,9 +16,10 @@ Fixes: 8e9faa15469e ("HID: cp2112: fix gpio-callback error handling")
 Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
 Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
 Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c
-index 28e3c18a4689..68cdc962265b 100644
+index 078026f63b6f..4e940a096b2a 100644
 --- a/drivers/hid/hid-cp2112.c
 +++ b/drivers/hid/hid-cp2112.c
 @@ -196,6 +196,8 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
diff --git a/queue/IB-core-Fix-calculation-of-maximum-RoCE-MTU.patch b/queue/IB-core-Fix-calculation-of-maximum-RoCE-MTU.patch
index e958b09..ddf7756 100644
--- a/queue/IB-core-Fix-calculation-of-maximum-RoCE-MTU.patch
+++ b/queue/IB-core-Fix-calculation-of-maximum-RoCE-MTU.patch
@@ -1,4 +1,4 @@
-From 99260132fde7bddc6e0132ce53da94d1c9ccabcb Mon Sep 17 00:00:00 2001
+From 5f9fe3da6ebdc4e3d375a3ead7832bbf065c5bee Mon Sep 17 00:00:00 2001
 From: Parav Pandit <parav@mellanox.com>
 Date: Mon, 16 Oct 2017 08:45:16 +0300
 Subject: [PATCH] IB/core: Fix calculation of maximum RoCE MTU
@@ -19,12 +19,13 @@ Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
 Reported-by: Roland Dreier <roland@purestorage.com>
 Signed-off-by: Leon Romanovsky <leon@kernel.org>
 Signed-off-by: Doug Ledford <dledford@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h
-index ec5008cf5d51..8815989301ab 100644
+index 4b34c51f859e..222c55dbf92a 100644
 --- a/include/rdma/ib_addr.h
 +++ b/include/rdma/ib_addr.h
-@@ -245,10 +245,11 @@ static inline void rdma_addr_set_dgid(struct rdma_dev_addr *dev_addr, union ib_g
+@@ -242,10 +242,11 @@ static inline void rdma_addr_set_dgid(struct rdma_dev_addr *dev_addr, union ib_g
  static inline enum ib_mtu iboe_get_mtu(int mtu)
  {
  	/*
diff --git a/queue/IB-ipoib-Grab-rtnl-lock-on-heavy-flush-when-calling-.patch b/queue/IB-ipoib-Grab-rtnl-lock-on-heavy-flush-when-calling-.patch
index 65a4e91..792b29e 100644
--- a/queue/IB-ipoib-Grab-rtnl-lock-on-heavy-flush-when-calling-.patch
+++ b/queue/IB-ipoib-Grab-rtnl-lock-on-heavy-flush-when-calling-.patch
@@ -1,4 +1,4 @@
-From b4b678b06f6eef18bff44a338c01870234db0bc9 Mon Sep 17 00:00:00 2001
+From 0403f5fd895a4afe108baf846fddd5fbe2a99b71 Mon Sep 17 00:00:00 2001
 From: Alex Vesker <valex@mellanox.com>
 Date: Tue, 10 Oct 2017 10:36:41 +0300
 Subject: [PATCH] IB/ipoib: Grab rtnl lock on heavy flush when calling
@@ -12,12 +12,13 @@ which re-sets the number of TX queue assuming RTNL lock is held.
 Since RTNL lock is not held, RTNL assert will fail.
 
 Signed-off-by: Alex Vesker <valex@mellanox.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
-index 6cd61638b441..c97384c914a4 100644
+index 3c3e1b92d641..741fa44342a5 100644
 --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
 +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
-@@ -1203,10 +1203,15 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv,
+@@ -1180,10 +1180,15 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv,
  		ipoib_ib_dev_down(dev);
  
  	if (level == IPOIB_FLUSH_HEAVY) {
diff --git a/queue/Ib-hfi1-Return-actual-operational-VLs-in-port-info-q.patch b/queue/Ib-hfi1-Return-actual-operational-VLs-in-port-info-q.patch
index 4e045c8..4aae6b2 100644
--- a/queue/Ib-hfi1-Return-actual-operational-VLs-in-port-info-q.patch
+++ b/queue/Ib-hfi1-Return-actual-operational-VLs-in-port-info-q.patch
@@ -1,4 +1,4 @@
-From 00f9203119dd2774564407c7a67b17d81916298b Mon Sep 17 00:00:00 2001
+From 964a8957a9d021a25b7d37da854d82216efbdea4 Mon Sep 17 00:00:00 2001
 From: Patel Jay P <jay.p.patel@intel.com>
 Date: Mon, 23 Oct 2017 06:05:53 -0700
 Subject: [PATCH] Ib/hfi1: Return actual operational VLs in port info query
@@ -23,12 +23,13 @@ Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
 Signed-off-by: Patel Jay P <jay.p.patel@intel.com>
 Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
 Signed-off-by: Doug Ledford <dledford@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
-index 8dd0a4ded67b..b69b85e7a244 100644
+index 2a08f8fc6ae1..c61b174ce5fe 100644
 --- a/drivers/infiniband/hw/hfi1/chip.c
 +++ b/drivers/infiniband/hw/hfi1/chip.c
-@@ -9966,7 +9966,7 @@ int hfi1_get_ib_cfg(struct hfi1_pportdata *ppd, int which)
+@@ -9876,7 +9876,7 @@ int hfi1_get_ib_cfg(struct hfi1_pportdata *ppd, int which)
  		goto unimplemented;
  
  	case HFI1_IB_CFG_OP_VLS:
diff --git a/queue/Linux-4.12.27.patch b/queue/Linux-4.12.27.patch
index e1d1a11..804b12f 100644
--- a/queue/Linux-4.12.27.patch
+++ b/queue/Linux-4.12.27.patch
@@ -1,4 +1,4 @@
-From f46d16770fe1c1b7ab67fcb5169b069c72f4dbb4 Mon Sep 17 00:00:00 2001
+From 6fade686e7ddc25010d97ef60325be512cd6e77e Mon Sep 17 00:00:00 2001
 From: Paul Gortmaker <paul.gortmaker@windriver.com>
 Date: Tue, 24 Jul 2018 15:03:50 -0400
 Subject: [PATCH] Linux 4.12.27
diff --git a/queue/PCI-Detach-driver-before-procfs-sysfs-teardown-on-de.patch b/queue/PCI-Detach-driver-before-procfs-sysfs-teardown-on-de.patch
index f852836..a9ec665 100644
--- a/queue/PCI-Detach-driver-before-procfs-sysfs-teardown-on-de.patch
+++ b/queue/PCI-Detach-driver-before-procfs-sysfs-teardown-on-de.patch
@@ -1,4 +1,4 @@
-From 16b6c8bb687cc3bec914de09061fcb8411951fda Mon Sep 17 00:00:00 2001
+From df88c0ff56626b5d946e5ba5904a3eaaf34defba Mon Sep 17 00:00:00 2001
 From: Alex Williamson <alex.williamson@redhat.com>
 Date: Wed, 11 Oct 2017 15:35:56 -0600
 Subject: [PATCH] PCI: Detach driver before procfs & sysfs teardown on device
@@ -27,6 +27,7 @@ the instantiation of the device in pci_bus_add_device().
 
 Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
 Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
 index 73a03d382590..2fa0dbde36b7 100644
diff --git a/queue/PCI-Do-not-allocate-more-buses-than-available-in-par.patch b/queue/PCI-Do-not-allocate-more-buses-than-available-in-par.patch
index 734f2dc..98d26a7 100644
--- a/queue/PCI-Do-not-allocate-more-buses-than-available-in-par.patch
+++ b/queue/PCI-Do-not-allocate-more-buses-than-available-in-par.patch
@@ -1,4 +1,4 @@
-From a20c7f36bd3d20d245616ae223bb9d05dfb6f050 Mon Sep 17 00:00:00 2001
+From 9042d53ad19ae3cf6bddac45653c56ccfaeb32e9 Mon Sep 17 00:00:00 2001
 From: Mika Westerberg <mika.westerberg@linux.intel.com>
 Date: Fri, 13 Oct 2017 21:35:43 +0300
 Subject: [PATCH] PCI: Do not allocate more buses than available in parent
@@ -33,12 +33,13 @@ has any).
 Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
 [bhelgaas: remove irrelevant dmesg messages]
 Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
-index 61813938d186..1f82f49c0bb3 100644
+index 19c8950c6c38..8dab690492ca 100644
 --- a/drivers/pci/probe.c
 +++ b/drivers/pci/probe.c
-@@ -1076,7 +1076,8 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass)
+@@ -1050,7 +1050,8 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass)
  			child = pci_add_new_bus(bus, dev, max+1);
  			if (!child)
  				goto out;
@@ -48,7 +49,7 @@ index 61813938d186..1f82f49c0bb3 100644
  		}
  		max++;
  		buses = (buses & 0xff000000)
-@@ -2439,6 +2440,10 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus)
+@@ -2264,6 +2265,10 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus)
  	if (bus->self && bus->self->is_hotplug_bridge && pci_hotplug_bus_size) {
  		if (max - bus->busn_res.start < pci_hotplug_bus_size - 1)
  			max = bus->busn_res.start + pci_hotplug_bus_size - 1;
diff --git a/queue/PCI-PME-Handle-invalid-data-when-reading-Root-Status.patch b/queue/PCI-PME-Handle-invalid-data-when-reading-Root-Status.patch
index 3ac7312..f130878 100644
--- a/queue/PCI-PME-Handle-invalid-data-when-reading-Root-Status.patch
+++ b/queue/PCI-PME-Handle-invalid-data-when-reading-Root-Status.patch
@@ -1,4 +1,4 @@
-From 3ad3f8ce50914288731a3018b27ee44ab803e170 Mon Sep 17 00:00:00 2001
+From 47e4988366455c2ace9b238d0371e0ac2a21f868 Mon Sep 17 00:00:00 2001
 From: Qiang <zhengqiang10@huawei.com>
 Date: Thu, 28 Sep 2017 11:54:34 +0800
 Subject: [PATCH] PCI/PME: Handle invalid data when reading Root Status
@@ -27,12 +27,13 @@ Signed-off-by: Qiang Zheng <zhengqiang10@huawei.com>
 [bhelgaas: changelog, also check in pcie_pme_work_fn(), use "~0" to follow
 other similar checks]
 Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme.c
-index fafdb165dd2e..df290aa58dce 100644
+index 2dd1c68e6de8..c262d66e23ec 100644
 --- a/drivers/pci/pcie/pme.c
 +++ b/drivers/pci/pcie/pme.c
-@@ -226,6 +226,9 @@ static void pcie_pme_work_fn(struct work_struct *work)
+@@ -232,6 +232,9 @@ static void pcie_pme_work_fn(struct work_struct *work)
  			break;
  
  		pcie_capability_read_dword(port, PCI_EXP_RTSTA, &rtsta);
@@ -42,7 +43,7 @@ index fafdb165dd2e..df290aa58dce 100644
  		if (rtsta & PCI_EXP_RTSTA_PME) {
  			/*
  			 * Clear PME status of the port.  If there are other
-@@ -273,7 +276,7 @@ static irqreturn_t pcie_pme_irq(int irq, void *context)
+@@ -279,7 +282,7 @@ static irqreturn_t pcie_pme_irq(int irq, void *context)
  	spin_lock_irqsave(&data->lock, flags);
  	pcie_capability_read_dword(port, PCI_EXP_RTSTA, &rtsta);
  
diff --git a/queue/PM-s2idle-Clear-the-events_check_enabled-flag.patch b/queue/PM-s2idle-Clear-the-events_check_enabled-flag.patch
index 51ea53f..a4669fd 100644
--- a/queue/PM-s2idle-Clear-the-events_check_enabled-flag.patch
+++ b/queue/PM-s2idle-Clear-the-events_check_enabled-flag.patch
@@ -1,4 +1,4 @@
-From af59e675206a429ff19eaab01eb55a07a042f025 Mon Sep 17 00:00:00 2001
+From 3ee219c14e2600833154e4f61a467458aade7bbd Mon Sep 17 00:00:00 2001
 From: Rajat Jain <rajatja@google.com>
 Date: Tue, 31 Oct 2017 14:44:24 -0700
 Subject: [PATCH] PM / s2idle: Clear the events_check_enabled flag
diff --git a/queue/RDMA-cma-Avoid-triggering-undefined-behavior.patch b/queue/RDMA-cma-Avoid-triggering-undefined-behavior.patch
index d5a1ced..b1986c5 100644
--- a/queue/RDMA-cma-Avoid-triggering-undefined-behavior.patch
+++ b/queue/RDMA-cma-Avoid-triggering-undefined-behavior.patch
@@ -1,4 +1,4 @@
-From c0b64f58e8d49570aa9ee55d880f92c20ff0166b Mon Sep 17 00:00:00 2001
+From f796f28df653964492a3fa6732f9d93de19b1a5d Mon Sep 17 00:00:00 2001
 From: Bart Van Assche <bart.vanassche@wdc.com>
 Date: Wed, 11 Oct 2017 10:48:45 -0700
 Subject: [PATCH] RDMA/cma: Avoid triggering undefined behavior
@@ -27,12 +27,13 @@ drivers/infiniband/core/cma.c:3505: cma_connect_ib() warn: signed overflow undef
 Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
 Acked-by: Sean Hefty <sean.hefty@intel.com>
 Signed-off-by: Doug Ledford <dledford@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
-index 852c8fec8088..fa79c7076ccd 100644
+index d65a09317719..776d275052b6 100644
 --- a/drivers/infiniband/core/cma.c
 +++ b/drivers/infiniband/core/cma.c
-@@ -1540,7 +1540,7 @@ static struct rdma_id_private *cma_id_from_event(struct ib_cm_id *cm_id,
+@@ -1550,7 +1550,7 @@ static struct rdma_id_private *cma_id_from_event(struct ib_cm_id *cm_id,
  	return id_priv;
  }
  
@@ -41,7 +42,7 @@ index 852c8fec8088..fa79c7076ccd 100644
  {
  	return cma_family(id_priv) == AF_IB ? 0 : sizeof(struct cma_hdr);
  }
-@@ -1942,7 +1942,8 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
+@@ -1952,7 +1952,8 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
  	struct rdma_id_private *listen_id, *conn_id = NULL;
  	struct rdma_cm_event event;
  	struct net_device *net_dev;
@@ -51,7 +52,7 @@ index 852c8fec8088..fa79c7076ccd 100644
  
  	listen_id = cma_id_from_event(cm_id, ib_event, &net_dev);
  	if (IS_ERR(listen_id))
-@@ -3440,7 +3441,8 @@ static int cma_resolve_ib_udp(struct rdma_id_private *id_priv,
+@@ -3465,7 +3466,8 @@ static int cma_resolve_ib_udp(struct rdma_id_private *id_priv,
  	struct ib_cm_sidr_req_param req;
  	struct ib_cm_id	*id;
  	void *private_data;
@@ -61,7 +62,7 @@ index 852c8fec8088..fa79c7076ccd 100644
  
  	memset(&req, 0, sizeof req);
  	offset = cma_user_data_offset(id_priv);
-@@ -3497,7 +3499,8 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,
+@@ -3522,7 +3524,8 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,
  	struct rdma_route *route;
  	void *private_data;
  	struct ib_cm_id	*id;
diff --git a/queue/RDMA-cxgb4-Declare-stag-as-__be32.patch b/queue/RDMA-cxgb4-Declare-stag-as-__be32.patch
index c5b87fc..d3c9601 100644
--- a/queue/RDMA-cxgb4-Declare-stag-as-__be32.patch
+++ b/queue/RDMA-cxgb4-Declare-stag-as-__be32.patch
@@ -1,4 +1,4 @@
-From 35fb2a88ed4b77356fa679a8525c869a3594e287 Mon Sep 17 00:00:00 2001
+From e8e04ec4740fb3201835a6aca136b81d9f3e7aee Mon Sep 17 00:00:00 2001
 From: Leon Romanovsky <leon@kernel.org>
 Date: Wed, 25 Oct 2017 07:41:11 +0300
 Subject: [PATCH] RDMA/cxgb4: Declare stag as __be32
@@ -13,9 +13,10 @@ Cc: Steve Wise <swise@opengridcomputing.com>
 Signed-off-by: Leon Romanovsky <leon@kernel.org>
 Reviewed-by: Steve Wise <swise@opengridcomputing.com>
 Signed-off-by: Doug Ledford <dledford@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/infiniband/hw/cxgb4/t4.h b/drivers/infiniband/hw/cxgb4/t4.h
-index 2b44fa850bbb..427aaf20d77c 100644
+index e765c00303cd..bcb80ca67d3d 100644
 --- a/drivers/infiniband/hw/cxgb4/t4.h
 +++ b/drivers/infiniband/hw/cxgb4/t4.h
 @@ -171,7 +171,7 @@ struct t4_cqe {
diff --git a/queue/USB-core-prevent-malicious-bNumInterfaces-overflow.patch b/queue/USB-core-prevent-malicious-bNumInterfaces-overflow.patch
index 707b2d6..5a9d5a6 100644
--- a/queue/USB-core-prevent-malicious-bNumInterfaces-overflow.patch
+++ b/queue/USB-core-prevent-malicious-bNumInterfaces-overflow.patch
@@ -1,4 +1,4 @@
-From 48a4ff1c7bb5a32d2e396b03132d20d552c0eca7 Mon Sep 17 00:00:00 2001
+From 85160630cc51a9d50c9077f545e092884ffa5eb7 Mon Sep 17 00:00:00 2001
 From: Alan Stern <stern@rowland.harvard.edu>
 Date: Tue, 12 Dec 2017 14:25:13 -0500
 Subject: [PATCH] USB: core: prevent malicious bNumInterfaces overflow
@@ -19,9 +19,10 @@ Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
 Reported-by: Andrey Konovalov <andreyknvl@google.com>
 CC: <stable@vger.kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
-index 55b198ba629b..78e92d29f8d9 100644
+index 27f5792101ce..9e3355b97396 100644
 --- a/drivers/usb/core/config.c
 +++ b/drivers/usb/core/config.c
 @@ -555,6 +555,9 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx,
diff --git a/queue/USB-uas-and-storage-Add-US_FL_BROKEN_FUA-for-another.patch b/queue/USB-uas-and-storage-Add-US_FL_BROKEN_FUA-for-another.patch
index 2b2652a..5a4d2ce 100644
--- a/queue/USB-uas-and-storage-Add-US_FL_BROKEN_FUA-for-another.patch
+++ b/queue/USB-uas-and-storage-Add-US_FL_BROKEN_FUA-for-another.patch
@@ -1,4 +1,4 @@
-From 62354454625741f0569c2cbe45b2d192f8fd258e Mon Sep 17 00:00:00 2001
+From ee920bb0bf032a265aa3dd7248bc5f7284b4f8c0 Mon Sep 17 00:00:00 2001
 From: David Kozub <zub@linux.fjfi.cvut.cz>
 Date: Tue, 5 Dec 2017 22:40:04 +0100
 Subject: [PATCH] USB: uas and storage: Add US_FL_BROKEN_FUA for another
@@ -25,12 +25,13 @@ Signed-off-by: David Kozub <zub@linux.fjfi.cvut.cz>
 Acked-by: Alan Stern <stern@rowland.harvard.edu>
 Cc: stable <stable@vger.kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
-index 2968046e7c05..f72d045ee9ef 100644
+index eb06d88b41d6..9af39644561f 100644
 --- a/drivers/usb/storage/unusual_devs.h
 +++ b/drivers/usb/storage/unusual_devs.h
-@@ -2100,6 +2100,13 @@ UNUSUAL_DEV(  0x152d, 0x0567, 0x0114, 0x0116,
+@@ -2113,6 +2113,13 @@ UNUSUAL_DEV(  0x152d, 0x0567, 0x0114, 0x0116,
  		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
  		US_FL_BROKEN_FUA ),
  
@@ -45,10 +46,10 @@ index 2968046e7c05..f72d045ee9ef 100644
   * Reported by Alexandre Oliva <oliva@lsd.ic.unicamp.br>
   * JMicron responds to USN and several other SCSI ioctls with a
 diff --git a/drivers/usb/storage/unusual_uas.h b/drivers/usb/storage/unusual_uas.h
-index d520374a824e..e6127fb21c12 100644
+index cde115359793..9f356f7cf7d5 100644
 --- a/drivers/usb/storage/unusual_uas.h
 +++ b/drivers/usb/storage/unusual_uas.h
-@@ -129,6 +129,13 @@ UNUSUAL_DEV(0x152d, 0x0567, 0x0000, 0x9999,
+@@ -142,6 +142,13 @@ UNUSUAL_DEV(0x152d, 0x0567, 0x0000, 0x9999,
  		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
  		US_FL_BROKEN_FUA | US_FL_NO_REPORT_OPCODES),
  
diff --git a/queue/ath10k-fix-build-errors-with-CONFIG_PM.patch b/queue/ath10k-fix-build-errors-with-CONFIG_PM.patch
index e3d290d..5ca41ce 100644
--- a/queue/ath10k-fix-build-errors-with-CONFIG_PM.patch
+++ b/queue/ath10k-fix-build-errors-with-CONFIG_PM.patch
@@ -1,4 +1,4 @@
-From 5bd5ecc04c2816b0600a26c9437e9c7184706823 Mon Sep 17 00:00:00 2001
+From 1a53b91b905e479c724451cc373086a4263652ab Mon Sep 17 00:00:00 2001
 From: Brian Norris <briannorris@chromium.org>
 Date: Thu, 19 Oct 2017 11:45:19 -0700
 Subject: [PATCH] ath10k: fix build errors with !CONFIG_PM
diff --git a/queue/ath9k-fix-tx99-potential-info-leak.patch b/queue/ath9k-fix-tx99-potential-info-leak.patch
index 43141e1..3a79cde 100644
--- a/queue/ath9k-fix-tx99-potential-info-leak.patch
+++ b/queue/ath9k-fix-tx99-potential-info-leak.patch
@@ -1,4 +1,4 @@
-From ee0a47186e2fa9aa1c56cadcea470ca0ba8c8692 Mon Sep 17 00:00:00 2001
+From 8626eb971278205c18f9a73fc405d402c1fb0b69 Mon Sep 17 00:00:00 2001
 From: Miaoqing Pan <miaoqing@codeaurora.org>
 Date: Wed, 27 Sep 2017 09:13:34 +0800
 Subject: [PATCH] ath9k: fix tx99 potential info leak
@@ -17,9 +17,10 @@ user data does not contain a 0-terminator.
 Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
 Reviewed-by: Christoph Böhmwalder <christoph@boehmwalder.at>
 Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/net/wireless/ath/ath9k/tx99.c b/drivers/net/wireless/ath/ath9k/tx99.c
-index 49ed1afb913c..fe3a8263b224 100644
+index 1fa7f844b5da..8e9480cc33e1 100644
 --- a/drivers/net/wireless/ath/ath9k/tx99.c
 +++ b/drivers/net/wireless/ath/ath9k/tx99.c
 @@ -179,6 +179,9 @@ static ssize_t write_file_tx99(struct file *file, const char __user *user_buf,
diff --git a/queue/badblocks-fix-wrong-return-value-in-badblocks_set-if.patch b/queue/badblocks-fix-wrong-return-value-in-badblocks_set-if.patch
index 7ad5e9b..4f16998 100644
--- a/queue/badblocks-fix-wrong-return-value-in-badblocks_set-if.patch
+++ b/queue/badblocks-fix-wrong-return-value-in-badblocks_set-if.patch
@@ -1,4 +1,4 @@
-From 39b4954c0a1556f8f7f1fdcf59a227117fcd8a0b Mon Sep 17 00:00:00 2001
+From d8945550fa253123cf0776ae8e264f448a8b6309 Mon Sep 17 00:00:00 2001
 From: Liu Bo <bo.li.liu@oracle.com>
 Date: Fri, 3 Nov 2017 11:24:44 -0600
 Subject: [PATCH] badblocks: fix wrong return value in badblocks_set if
@@ -17,9 +17,10 @@ This bug has existed since badblocks were introduced in commit
 Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
 Acked-by: Guoqing Jiang <gqjiang@suse.com>
 Signed-off-by: Shaohua Li <shli@fb.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/block/badblocks.c b/block/badblocks.c
-index 43c71166e1e2..91f7bcf979d3 100644
+index 6ebcef282314..2fe6c117ac96 100644
 --- a/block/badblocks.c
 +++ b/block/badblocks.c
 @@ -178,7 +178,7 @@ int badblocks_set(struct badblocks *bb, sector_t s, int sectors,
diff --git a/queue/bcache-explicitly-destroy-mutex-while-exiting.patch b/queue/bcache-explicitly-destroy-mutex-while-exiting.patch
index 7879711..bf625dc 100644
--- a/queue/bcache-explicitly-destroy-mutex-while-exiting.patch
+++ b/queue/bcache-explicitly-destroy-mutex-while-exiting.patch
@@ -1,4 +1,4 @@
-From 330a4db89d39a6b43f36da16824eaa7a7509d34d Mon Sep 17 00:00:00 2001
+From 591dba001157209d31c2f236261fed3a3ed1638b Mon Sep 17 00:00:00 2001
 From: Liang Chen <liangchen.linux@gmail.com>
 Date: Mon, 30 Oct 2017 14:46:35 -0700
 Subject: [PATCH] bcache: explicitly destroy mutex while exiting
@@ -20,12 +20,13 @@ Reviewed-by: Michael Lyle <mlyle@lyle.org>
 Reviewed-by: Coly Li <colyli@suse.de>
 Reviewed-by: Eric Wheeler <bcache@linux.ewheeler.net>
 Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
-index 46134c45c6f6..b4d28928dec5 100644
+index cdbf5f37301a..433123c23a83 100644
 --- a/drivers/md/bcache/super.c
 +++ b/drivers/md/bcache/super.c
-@@ -2095,6 +2095,7 @@ static void bcache_exit(void)
+@@ -2084,6 +2084,7 @@ static void bcache_exit(void)
  	if (bcache_major)
  		unregister_blkdev(bcache_major, "bcache");
  	unregister_reboot_notifier(&reboot);
@@ -33,7 +34,7 @@ index 46134c45c6f6..b4d28928dec5 100644
  }
  
  static int __init bcache_init(void)
-@@ -2113,14 +2114,15 @@ static int __init bcache_init(void)
+@@ -2102,14 +2103,15 @@ static int __init bcache_init(void)
  	bcache_major = register_blkdev(0, "bcache");
  	if (bcache_major < 0) {
  		unregister_reboot_notifier(&reboot);
diff --git a/queue/bcache-fix-wrong-cache_misses-statistics.patch b/queue/bcache-fix-wrong-cache_misses-statistics.patch
index f0acf66..a8a8b33 100644
--- a/queue/bcache-fix-wrong-cache_misses-statistics.patch
+++ b/queue/bcache-fix-wrong-cache_misses-statistics.patch
@@ -1,4 +1,4 @@
-From 5ac03ca76feb7071d0680032f92067a48fe6e7d9 Mon Sep 17 00:00:00 2001
+From 9ba629bde8746283796746e25f24542ea7fbb867 Mon Sep 17 00:00:00 2001
 From: "tang.junhui" <tang.junhui@zte.com.cn>
 Date: Mon, 30 Oct 2017 14:46:34 -0700
 Subject: [PATCH] bcache: fix wrong cache_misses statistics
diff --git a/queue/blk-mq-sched-dispatch-from-scheduler-IFF-progress-is.patch b/queue/blk-mq-sched-dispatch-from-scheduler-IFF-progress-is.patch
index 6e79924..3befd9d 100644
--- a/queue/blk-mq-sched-dispatch-from-scheduler-IFF-progress-is.patch
+++ b/queue/blk-mq-sched-dispatch-from-scheduler-IFF-progress-is.patch
@@ -1,4 +1,4 @@
-From 2e07e9060fe5ebb526fa9d73e9d8a29925c15f46 Mon Sep 17 00:00:00 2001
+From f0af01245961afa796287a8df1d218e5105fb075 Mon Sep 17 00:00:00 2001
 From: Ming Lei <ming.lei@redhat.com>
 Date: Sat, 14 Oct 2017 17:22:25 +0800
 Subject: [PATCH] blk-mq-sched: dispatch from scheduler IFF progress is made in
diff --git a/queue/btrfs-Explicitly-handle-btrfs_update_root-failure.patch b/queue/btrfs-Explicitly-handle-btrfs_update_root-failure.patch
index faa4734..1d81f42 100644
--- a/queue/btrfs-Explicitly-handle-btrfs_update_root-failure.patch
+++ b/queue/btrfs-Explicitly-handle-btrfs_update_root-failure.patch
@@ -1,4 +1,4 @@
-From 9417ebc8a676487c6ec8825f92fb28f7dbeb5f4b Mon Sep 17 00:00:00 2001
+From 9b4c7106a59f7204a7b5ae7fac3ff82dde1dd13d Mon Sep 17 00:00:00 2001
 From: Nikolay Borisov <nborisov@suse.com>
 Date: Thu, 28 Sep 2017 10:53:17 +0300
 Subject: [PATCH] btrfs: Explicitly handle btrfs_update_root failure
@@ -19,12 +19,13 @@ correctly revert the RO/RW flags in case of commit failure.
 
 Signed-off-by: Nikolay Borisov <nborisov@suse.com>
 Signed-off-by: David Sterba <dsterba@suse.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
-index feab6f61cb97..86728e06e263 100644
+index 3ffe265b5a1f..0e02d3ee389b 100644
 --- a/fs/btrfs/ioctl.c
 +++ b/fs/btrfs/ioctl.c
-@@ -1827,8 +1827,13 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file,
+@@ -1867,8 +1867,13 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file,
  
  	ret = btrfs_update_root(trans, fs_info->tree_root,
  				&root->root_key, &root->root_item);
diff --git a/queue/btrfs-avoid-null-pointer-dereference-on-fs_info-when.patch b/queue/btrfs-avoid-null-pointer-dereference-on-fs_info-when.patch
index bdd8abe..cb4f6b2 100644
--- a/queue/btrfs-avoid-null-pointer-dereference-on-fs_info-when.patch
+++ b/queue/btrfs-avoid-null-pointer-dereference-on-fs_info-when.patch
@@ -1,4 +1,4 @@
-From 3993b112dac968612b0b213ed59cb30f50b0015b Mon Sep 17 00:00:00 2001
+From d9a1d68964916c8f99bd713073a8b269bf2c1b43 Mon Sep 17 00:00:00 2001
 From: Colin Ian King <colin.king@canonical.com>
 Date: Mon, 11 Sep 2017 16:15:28 +0100
 Subject: [PATCH] btrfs: avoid null pointer dereference on fs_info when calling
@@ -17,12 +17,13 @@ Fixes: efe120a067c8 ("Btrfs: convert printk to btrfs_ and fix BTRFS prefix")
 Signed-off-by: Colin Ian King <colin.king@canonical.com>
 Reviewed-by: David Sterba <dsterba@suse.com>
 Signed-off-by: David Sterba <dsterba@suse.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
-index 161694b66038..e8f5e24325f3 100644
+index 76209e7fb6e1..93a0a6f8b589 100644
 --- a/fs/btrfs/super.c
 +++ b/fs/btrfs/super.c
-@@ -202,7 +202,6 @@ static struct ratelimit_state printk_limits[] = {
+@@ -201,7 +201,6 @@ static struct ratelimit_state printk_limits[] = {
  
  void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...)
  {
@@ -30,7 +31,7 @@ index 161694b66038..e8f5e24325f3 100644
  	char lvl[PRINTK_MAX_SINGLE_HEADER_LEN + 1] = "\0";
  	struct va_format vaf;
  	va_list args;
-@@ -228,7 +227,8 @@ void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...)
+@@ -227,7 +226,8 @@ void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...)
  	vaf.va = &args;
  
  	if (__ratelimit(ratelimit))
diff --git a/queue/btrfs-tests-Fix-a-memory-leak-in-error-handling-path.patch b/queue/btrfs-tests-Fix-a-memory-leak-in-error-handling-path.patch
index fb4926b..2c9e0d8 100644
--- a/queue/btrfs-tests-Fix-a-memory-leak-in-error-handling-path.patch
+++ b/queue/btrfs-tests-Fix-a-memory-leak-in-error-handling-path.patch
@@ -1,4 +1,4 @@
-From 9ca2e97fa3c3216200afe35a3b111ec51cc796d2 Mon Sep 17 00:00:00 2001
+From d70dc169b7dcdfd4d229efb510d14dc66b218b4f Mon Sep 17 00:00:00 2001
 From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
 Date: Sun, 10 Sep 2017 13:19:38 +0200
 Subject: [PATCH] btrfs: tests: Fix a memory leak in error handling path in
@@ -12,9 +12,10 @@ allocated, as done in the other error handling paths in this function.
 Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
 Reviewed-by: Qu Wenruo <quwenruo.btrfs@gmx.com>
 Signed-off-by: David Sterba <dsterba@suse.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/fs/btrfs/tests/free-space-tree-tests.c b/fs/btrfs/tests/free-space-tree-tests.c
-index 1458bb0ea124..8444a018cca2 100644
+index b29954c01673..4308949b4128 100644
 --- a/fs/btrfs/tests/free-space-tree-tests.c
 +++ b/fs/btrfs/tests/free-space-tree-tests.c
 @@ -500,7 +500,8 @@ static int run_test(test_func_t test_func, int bitmaps, u32 sectorsize,
diff --git a/queue/btrfs-undo-writable-superblocke-when-sprouting-fails.patch b/queue/btrfs-undo-writable-superblocke-when-sprouting-fails.patch
index 8858ee2..22a886e 100644
--- a/queue/btrfs-undo-writable-superblocke-when-sprouting-fails.patch
+++ b/queue/btrfs-undo-writable-superblocke-when-sprouting-fails.patch
@@ -1,4 +1,4 @@
-From 0af2c4bf5a012a40a2f9230458087d7f068339d0 Mon Sep 17 00:00:00 2001
+From fdd16f57dcd78704d3b6c60b7669722bc903dfcc Mon Sep 17 00:00:00 2001
 From: Anand Jain <anand.jain@oracle.com>
 Date: Thu, 28 Sep 2017 14:51:09 +0800
 Subject: [PATCH] btrfs: undo writable superblocke when sprouting fails
@@ -12,12 +12,13 @@ writable part. This patch fixes it.
 Signed-off-by: Anand Jain <anand.jain@oracle.com>
 Reviewed-by: Nikolay Borisov <nborisov@suse.com>
 Signed-off-by: David Sterba <dsterba@suse.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
-index ac1e8686ba78..0be58b5a320c 100644
+index 017b67daa3bb..8173844ba1ab 100644
 --- a/fs/btrfs/volumes.c
 +++ b/fs/btrfs/volumes.c
-@@ -2496,6 +2496,8 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path
+@@ -2507,6 +2507,8 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path
  	return ret;
  
  error_trans:
diff --git a/queue/ceph-drop-negative-child-dentries-before-try-pruning.patch b/queue/ceph-drop-negative-child-dentries-before-try-pruning.patch
index 3202431..01005e2 100644
--- a/queue/ceph-drop-negative-child-dentries-before-try-pruning.patch
+++ b/queue/ceph-drop-negative-child-dentries-before-try-pruning.patch
@@ -1,4 +1,4 @@
-From 040d786032bf59002d374b86d75b04d97624005c Mon Sep 17 00:00:00 2001
+From f7487162810027c859cc89e8480d3de7b6d4b707 Mon Sep 17 00:00:00 2001
 From: "Yan, Zheng" <zyan@redhat.com>
 Date: Thu, 30 Nov 2017 11:59:22 +0800
 Subject: [PATCH] ceph: drop negative child dentries before try pruning inode's
@@ -13,12 +13,13 @@ Cc: stable@vger.kernel.org
 Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
 Reviewed-by: Jeff Layton <jlayton@redhat.com>
 Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
-index ab69dcb70e8a..1b468250e947 100644
+index 0c05df44cc6c..19f4a40f2574 100644
 --- a/fs/ceph/mds_client.c
 +++ b/fs/ceph/mds_client.c
-@@ -1440,6 +1440,29 @@ static int __close_session(struct ceph_mds_client *mdsc,
+@@ -1420,6 +1420,29 @@ static int __close_session(struct ceph_mds_client *mdsc,
  	return request_close_session(mdsc, session);
  }
  
@@ -48,7 +49,7 @@ index ab69dcb70e8a..1b468250e947 100644
  /*
   * Trim old(er) caps.
   *
-@@ -1490,16 +1513,27 @@ static int trim_caps_cb(struct inode *inode, struct ceph_cap *cap, void *arg)
+@@ -1465,16 +1488,27 @@ static int trim_caps_cb(struct inode *inode, struct ceph_cap *cap, void *arg)
  	if ((used | wanted) & ~oissued & mine)
  		goto out;   /* we need these caps */
  
diff --git a/queue/cifs-fix-NULL-deref-in-SMB2_read.patch b/queue/cifs-fix-NULL-deref-in-SMB2_read.patch
index fbccd26..784ff50 100644
--- a/queue/cifs-fix-NULL-deref-in-SMB2_read.patch
+++ b/queue/cifs-fix-NULL-deref-in-SMB2_read.patch
@@ -1,4 +1,4 @@
-From a821df3f1af72aa6a0d573eea94a7dd2613e9f4e Mon Sep 17 00:00:00 2001
+From 23ec11195c1ee40574acc6954bb55a160e8d0187 Mon Sep 17 00:00:00 2001
 From: Ronnie Sahlberg <lsahlber@redhat.com>
 Date: Tue, 21 Nov 2017 09:36:33 +1100
 Subject: [PATCH] cifs: fix NULL deref in SMB2_read
@@ -9,12 +9,13 @@ Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
 Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
 CC: Stable <stable@vger.kernel.org>
 Signed-off-by: Steve French <smfrench@gmail.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
-index 5331631386a2..01346b8b6edb 100644
+index f2430fbfdd4e..0895f6855c12 100644
 --- a/fs/cifs/smb2pdu.c
 +++ b/fs/cifs/smb2pdu.c
-@@ -2678,27 +2678,27 @@ SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms,
+@@ -2563,27 +2563,27 @@ SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms,
  	cifs_small_buf_release(req);
  
  	rsp = (struct smb2_read_rsp *)rsp_iov.iov_base;
diff --git a/queue/clk-hi6220-mark-clock-cs_atb_syspll-as-critical.patch b/queue/clk-hi6220-mark-clock-cs_atb_syspll-as-critical.patch
index 513128d..e8b7adb 100644
--- a/queue/clk-hi6220-mark-clock-cs_atb_syspll-as-critical.patch
+++ b/queue/clk-hi6220-mark-clock-cs_atb_syspll-as-critical.patch
@@ -1,4 +1,4 @@
-From d2a3671ebe6479483a12f94fcca63c058d95ad64 Mon Sep 17 00:00:00 2001
+From 4a13a048bc0a376ff4f7aa8b373d722b1a4469ef Mon Sep 17 00:00:00 2001
 From: Leo Yan <leo.yan@linaro.org>
 Date: Fri, 1 Sep 2017 08:47:14 +0800
 Subject: [PATCH] clk: hi6220: mark clock cs_atb_syspll as critical
@@ -16,9 +16,10 @@ Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
 Signed-off-by: Leo Yan <leo.yan@linaro.org>
 Signed-off-by: Michael Turquette <mturquette@baylibre.com>
 Link: lkml.kernel.org/r/1504226835-2115-2-git-send-email-leo.yan@linaro.org
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/clk/hisilicon/clk-hi6220.c b/drivers/clk/hisilicon/clk-hi6220.c
-index e786d717f75d..a87809d4bd52 100644
+index 2ae151ce623a..3d54d84c4e97 100644
 --- a/drivers/clk/hisilicon/clk-hi6220.c
 +++ b/drivers/clk/hisilicon/clk-hi6220.c
 @@ -145,7 +145,7 @@ static struct hisi_gate_clock hi6220_separated_gate_clks_sys[] __initdata = {
diff --git a/queue/clk-imx-imx7d-Fix-parent-clock-for-OCRAM_CLK.patch b/queue/clk-imx-imx7d-Fix-parent-clock-for-OCRAM_CLK.patch
index 4c512c7..10a1459 100644
--- a/queue/clk-imx-imx7d-Fix-parent-clock-for-OCRAM_CLK.patch
+++ b/queue/clk-imx-imx7d-Fix-parent-clock-for-OCRAM_CLK.patch
@@ -1,4 +1,4 @@
-From edc5a8e754aba9c6eaeddd18cb1e72462f99b16c Mon Sep 17 00:00:00 2001
+From a4980454cdb8ecd3c4b4767bd4d8e6fa1e0eebaa Mon Sep 17 00:00:00 2001
 From: Adriana Reus <adriana.reus@nxp.com>
 Date: Mon, 2 Oct 2017 13:32:10 +0300
 Subject: [PATCH] clk: imx: imx7d: Fix parent clock for OCRAM_CLK
@@ -32,12 +32,13 @@ Reference Doc: i.MX 7D Reference Manual - Chap 5, p 516
 Fixes: 8f6d8094b215 ("ARM: imx: add imx7d clk tree support")
 Signed-off-by: Adriana Reus <adriana.reus@nxp.com>
 Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c
-index 2305699db467..0ac9b30c8b90 100644
+index 93b03640da9b..405a536bb17d 100644
 --- a/drivers/clk/imx/clk-imx7d.c
 +++ b/drivers/clk/imx/clk-imx7d.c
-@@ -797,7 +797,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node)
+@@ -796,7 +796,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node)
  	clks[IMX7D_MAIN_AXI_ROOT_CLK] = imx_clk_gate4("main_axi_root_clk", "axi_post_div", base + 0x4040, 0);
  	clks[IMX7D_DISP_AXI_ROOT_CLK] = imx_clk_gate4("disp_axi_root_clk", "disp_axi_post_div", base + 0x4050, 0);
  	clks[IMX7D_ENET_AXI_ROOT_CLK] = imx_clk_gate4("enet_axi_root_clk", "enet_axi_post_div", base + 0x4060, 0);
diff --git a/queue/clk-imx6-refine-hdmi_isfr-s-parent-to-make-HDMI-work.patch b/queue/clk-imx6-refine-hdmi_isfr-s-parent-to-make-HDMI-work.patch
index 97b3c01..78c1e79 100644
--- a/queue/clk-imx6-refine-hdmi_isfr-s-parent-to-make-HDMI-work.patch
+++ b/queue/clk-imx6-refine-hdmi_isfr-s-parent-to-make-HDMI-work.patch
@@ -1,4 +1,4 @@
-From c68ee58d9ee7b856ac722f18f4f26579c8fbd2b4 Mon Sep 17 00:00:00 2001
+From e756f563067ee931154523802520834037718d41 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
  <sebastien.szymanski@armadeus.com>
 Date: Tue, 1 Aug 2017 12:40:07 +0200
@@ -35,6 +35,7 @@ mipi_core_cfg.
 Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
 Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
 Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
 index c07df719b8a3..8d518ad5dc13 100644
diff --git a/queue/clk-mediatek-add-the-option-for-determining-PLL-sour.patch b/queue/clk-mediatek-add-the-option-for-determining-PLL-sour.patch
index db84266..8f56a26 100644
--- a/queue/clk-mediatek-add-the-option-for-determining-PLL-sour.patch
+++ b/queue/clk-mediatek-add-the-option-for-determining-PLL-sour.patch
@@ -1,4 +1,4 @@
-From c955bf3998efa3355790a4d8c82874582f1bc727 Mon Sep 17 00:00:00 2001
+From 375ea22078885a4a624b4f8c952ced37605f16d3 Mon Sep 17 00:00:00 2001
 From: Chen Zhong <chen.zhong@mediatek.com>
 Date: Thu, 5 Oct 2017 11:50:23 +0800
 Subject: [PATCH] clk: mediatek: add the option for determining PLL source
@@ -14,12 +14,13 @@ clock.
 Signed-off-by: Chen Zhong <chen.zhong@mediatek.com>
 Signed-off-by: Sean Wang <sean.wang@mediatek.com>
 Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h
-index f48df75cc901..f10250dcece4 100644
+index f5d6b70ce189..210ce8e8025e 100644
 --- a/drivers/clk/mediatek/clk-mtk.h
 +++ b/drivers/clk/mediatek/clk-mtk.h
-@@ -218,6 +218,7 @@ struct mtk_pll_data {
+@@ -216,6 +216,7 @@ struct mtk_pll_data {
  	uint32_t pcw_reg;
  	int pcw_shift;
  	const struct mtk_pll_div_table *div_table;
@@ -28,10 +29,10 @@ index f48df75cc901..f10250dcece4 100644
  
  void mtk_clk_register_plls(struct device_node *node,
 diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c
-index 3c546bae6955..f54e4015b0b1 100644
+index a409142e9346..7598477ff60f 100644
 --- a/drivers/clk/mediatek/clk-pll.c
 +++ b/drivers/clk/mediatek/clk-pll.c
-@@ -312,7 +312,10 @@ static struct clk *mtk_clk_register_pll(const struct mtk_pll_data *data,
+@@ -303,7 +303,10 @@ static struct clk *mtk_clk_register_pll(const struct mtk_pll_data *data,
  	init.name = data->name;
  	init.flags = (data->flags & PLL_AO) ? CLK_IS_CRITICAL : 0;
  	init.ops = &mtk_pll_ops;
diff --git a/queue/clk-tegra-Fix-cclk_lp-divisor-register.patch b/queue/clk-tegra-Fix-cclk_lp-divisor-register.patch
index ba469d2..da1ca7b 100644
--- a/queue/clk-tegra-Fix-cclk_lp-divisor-register.patch
+++ b/queue/clk-tegra-Fix-cclk_lp-divisor-register.patch
@@ -1,4 +1,4 @@
-From 54eff2264d3e9fd7e3987de1d7eba1d3581c631e Mon Sep 17 00:00:00 2001
+From 500ed64d099e92e0be4aa69424c6d8ac2481738d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <mirq-linux@rere.qmqm.pl>
 Date: Tue, 19 Sep 2017 04:48:10 +0200
 Subject: [PATCH] clk: tegra: Fix cclk_lp divisor register
@@ -15,12 +15,13 @@ Fixes: b08e8c0ecc42 ("clk: tegra: add clock support for Tegra30")
 Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
 Acked-By: Peter De Schrijver <pdeschrijver@nvidia.com>
 Signed-off-by: Thierry Reding <treding@nvidia.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c
-index 40ffab0f94e1..bee84c554932 100644
+index a2d163f759b4..07f5203df01c 100644
 --- a/drivers/clk/tegra/clk-tegra30.c
 +++ b/drivers/clk/tegra/clk-tegra30.c
-@@ -965,7 +965,7 @@ static void __init tegra30_super_clk_init(void)
+@@ -964,7 +964,7 @@ static void __init tegra30_super_clk_init(void)
  	 * U71 divider of cclk_lp.
  	 */
  	clk = tegra_clk_register_divider("pll_p_out3_cclklp", "pll_p_out3",
diff --git a/queue/clk-tegra-Use-readl_relaxed_poll_timeout_atomic-in-t.patch b/queue/clk-tegra-Use-readl_relaxed_poll_timeout_atomic-in-t.patch
index 9de8e31..d545d7e 100644
--- a/queue/clk-tegra-Use-readl_relaxed_poll_timeout_atomic-in-t.patch
+++ b/queue/clk-tegra-Use-readl_relaxed_poll_timeout_atomic-in-t.patch
@@ -1,4 +1,4 @@
-From 22ef01a203d27fee8b7694020b7e722db7efd2a7 Mon Sep 17 00:00:00 2001
+From c033414eece37d1533052b520ec6bc6aea6f4d00 Mon Sep 17 00:00:00 2001
 From: Nicolin Chen <nicoleotsuka@gmail.com>
 Date: Fri, 15 Sep 2017 12:10:13 -0700
 Subject: [PATCH] clk: tegra: Use readl_relaxed_poll_timeout_atomic() in
@@ -24,12 +24,13 @@ atomic version.
 Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
 Acked-By: Peter De Schrijver <pdeschrijver@nvidia.com>
 Signed-off-by: Thierry Reding <treding@nvidia.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/clk/tegra/clk-tegra210.c b/drivers/clk/tegra/clk-tegra210.c
-index be7b736371f6..9e6260869eb9 100644
+index 1024e853ea65..d2f9d7029284 100644
 --- a/drivers/clk/tegra/clk-tegra210.c
 +++ b/drivers/clk/tegra/clk-tegra210.c
-@@ -2568,8 +2568,8 @@ static int tegra210_enable_pllu(void)
+@@ -2562,8 +2562,8 @@ static int tegra210_enable_pllu(void)
  	reg |= PLL_ENABLE;
  	writel(reg, clk_base + PLLU_BASE);
  
diff --git a/queue/crypto-rsa-fix-buffer-overread-when-stripping-leadin.patch b/queue/crypto-rsa-fix-buffer-overread-when-stripping-leadin.patch
index 52d43dd..8686c23 100644
--- a/queue/crypto-rsa-fix-buffer-overread-when-stripping-leadin.patch
+++ b/queue/crypto-rsa-fix-buffer-overread-when-stripping-leadin.patch
@@ -1,4 +1,4 @@
-From d2890c3778b164fde587bc16583f3a1c87233ec5 Mon Sep 17 00:00:00 2001
+From 11741b8f796fa0401f22265421b934afe955af15 Mon Sep 17 00:00:00 2001
 From: Eric Biggers <ebiggers@google.com>
 Date: Sun, 26 Nov 2017 23:16:49 -0800
 Subject: [PATCH] crypto: rsa - fix buffer overread when stripping leading
@@ -57,6 +57,7 @@ Signed-off-by: Eric Biggers <ebiggers@google.com>
 Reviewed-by: James Morris <james.l.morris@oracle.com>
 Reviewed-by: David Howells <dhowells@redhat.com>
 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/crypto/rsa_helper.c b/crypto/rsa_helper.c
 index 0b66dc824606..cad395d70d78 100644
diff --git a/queue/crypto-tcrypt-fix-buffer-lengths-in-test_aead_speed.patch b/queue/crypto-tcrypt-fix-buffer-lengths-in-test_aead_speed.patch
index 0977053..aa9ff81 100644
--- a/queue/crypto-tcrypt-fix-buffer-lengths-in-test_aead_speed.patch
+++ b/queue/crypto-tcrypt-fix-buffer-lengths-in-test_aead_speed.patch
@@ -1,4 +1,4 @@
-From 7aacbfcb331ceff3ac43096d563a1f93ed46e35e Mon Sep 17 00:00:00 2001
+From ebd2dda2c5f0f4c3386ed37b7ed6d34dfd1f9388 Mon Sep 17 00:00:00 2001
 From: Robert Baronescu <robert.baronescu@nxp.com>
 Date: Tue, 10 Oct 2017 13:22:00 +0300
 Subject: [PATCH] crypto: tcrypt - fix buffer lengths in test_aead_speed()
@@ -12,12 +12,13 @@ an authentication tag.
 
 Signed-off-by: Robert Baronescu <robert.baronescu@nxp.com>
 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
-index 28bffa6f0292..65d191b27ecc 100644
+index 9a11f3c2bf98..7922cb7f722c 100644
 --- a/crypto/tcrypt.c
 +++ b/crypto/tcrypt.c
-@@ -340,7 +340,7 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,
+@@ -344,7 +344,7 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,
  			}
  
  			sg_init_aead(sg, xbuf,
@@ -26,7 +27,7 @@ index 28bffa6f0292..65d191b27ecc 100644
  
  			sg_init_aead(sgout, xoutbuf,
  				    *b_size + (enc ? authsize : 0));
-@@ -348,7 +348,9 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,
+@@ -352,7 +352,9 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,
  			sg_set_buf(&sg[0], assoc, aad_size);
  			sg_set_buf(&sgout[0], assoc, aad_size);
  
diff --git a/queue/dev-dax-fix-uninitialized-variable-build-warning.patch b/queue/dev-dax-fix-uninitialized-variable-build-warning.patch
index e904891..72c8de9 100644
--- a/queue/dev-dax-fix-uninitialized-variable-build-warning.patch
+++ b/queue/dev-dax-fix-uninitialized-variable-build-warning.patch
@@ -1,4 +1,4 @@
-From 0a3ff78699d1817e711441715d22665475466036 Mon Sep 17 00:00:00 2001
+From 65f3f4846499ecf02aab9e1d521329271a6277ae Mon Sep 17 00:00:00 2001
 From: Ross Zwisler <ross.zwisler@linux.intel.com>
 Date: Wed, 18 Oct 2017 12:21:55 -0600
 Subject: [PATCH] dev/dax: fix uninitialized variable build warning
@@ -17,9 +17,10 @@ http://kisskb.ellerman.id.au/kisskb/buildresult/13181373/log/
 
 Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
 Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/dax/device.c b/drivers/dax/device.c
-index e9f3b3e4bbf4..6833ada237ab 100644
+index 078127a58086..8fc467f9878b 100644
 --- a/drivers/dax/device.c
 +++ b/drivers/dax/device.c
 @@ -222,7 +222,8 @@ __weak phys_addr_t dax_pgoff_to_phys(struct dev_dax *dev_dax, pgoff_t pgoff,
diff --git a/queue/dm-fix-various-targets-to-dm_register_target-after-m.patch b/queue/dm-fix-various-targets-to-dm_register_target-after-m.patch
index 78bdacf..9e55f69 100644
--- a/queue/dm-fix-various-targets-to-dm_register_target-after-m.patch
+++ b/queue/dm-fix-various-targets-to-dm_register_target-after-m.patch
@@ -1,4 +1,4 @@
-From 7e6358d244e4706fe612a77b9c36519a33600ac0 Mon Sep 17 00:00:00 2001
+From 7ecd39f40c391843b02afd41ebd67f0392e14721 Mon Sep 17 00:00:00 2001
 From: "monty_pavel@sina.com" <monty_pavel@sina.com>
 Date: Sat, 25 Nov 2017 01:43:50 +0800
 Subject: [PATCH] dm: fix various targets to dm_register_target after module
@@ -59,12 +59,13 @@ created during module init (as labelled with __init) are finished.
 Cc: stable@vger.kernel.org
 Signed-off-by: monty <monty_pavel@sina.com>
 Signed-off-by: Mike Snitzer <snitzer@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c
-index cf23a14f9c6a..47407e43b96a 100644
+index 26e7eb8e4b5e..b5697fc9457a 100644
 --- a/drivers/md/dm-cache-target.c
 +++ b/drivers/md/dm-cache-target.c
-@@ -3472,18 +3472,18 @@ static int __init dm_cache_init(void)
+@@ -3552,18 +3552,18 @@ static int __init dm_cache_init(void)
  {
  	int r;
  
@@ -90,10 +91,10 @@ index cf23a14f9c6a..47407e43b96a 100644
  }
  
 diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
-index c8faa2b85842..35a2a2fa477f 100644
+index 9e4d6f7bbe55..8551e527d80a 100644
 --- a/drivers/md/dm-mpath.c
 +++ b/drivers/md/dm-mpath.c
-@@ -1957,13 +1957,6 @@ static int __init dm_multipath_init(void)
+@@ -1970,13 +1970,6 @@ static int __init dm_multipath_init(void)
  {
  	int r;
  
@@ -107,7 +108,7 @@ index c8faa2b85842..35a2a2fa477f 100644
  	kmultipathd = alloc_workqueue("kmpathd", WQ_MEM_RECLAIM, 0);
  	if (!kmultipathd) {
  		DMERR("failed to create workqueue kmpathd");
-@@ -1985,13 +1978,20 @@ static int __init dm_multipath_init(void)
+@@ -1998,13 +1991,20 @@ static int __init dm_multipath_init(void)
  		goto bad_alloc_kmpath_handlerd;
  	}
  
@@ -131,10 +132,10 @@ index c8faa2b85842..35a2a2fa477f 100644
  }
  
 diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
-index 1113b42e1eda..a0613bd8ed00 100644
+index e152d9817c81..72e8dc45a777 100644
 --- a/drivers/md/dm-snap.c
 +++ b/drivers/md/dm-snap.c
-@@ -2411,24 +2411,6 @@ static int __init dm_snapshot_init(void)
+@@ -2410,24 +2410,6 @@ static int __init dm_snapshot_init(void)
  		return r;
  	}
  
@@ -159,7 +160,7 @@ index 1113b42e1eda..a0613bd8ed00 100644
  	r = init_origin_hash();
  	if (r) {
  		DMERR("init_origin_hash failed.");
-@@ -2449,19 +2431,37 @@ static int __init dm_snapshot_init(void)
+@@ -2448,19 +2430,37 @@ static int __init dm_snapshot_init(void)
  		goto bad_pending_cache;
  	}
  
@@ -204,10 +205,10 @@ index 1113b42e1eda..a0613bd8ed00 100644
  
  	return r;
 diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
-index 89e5dff9b4cf..f91d771fff4b 100644
+index 28808e5ec0fd..89d54fc92e87 100644
 --- a/drivers/md/dm-thin.c
 +++ b/drivers/md/dm-thin.c
-@@ -4355,30 +4355,28 @@ static struct target_type thin_target = {
+@@ -4356,30 +4356,28 @@ static struct target_type thin_target = {
  
  static int __init dm_thin_init(void)
  {
diff --git a/queue/dmaengine-dmatest-move-callback-wait-queue-to-thread.patch b/queue/dmaengine-dmatest-move-callback-wait-queue-to-thread.patch
index dadf92c..80eb153 100644
--- a/queue/dmaengine-dmatest-move-callback-wait-queue-to-thread.patch
+++ b/queue/dmaengine-dmatest-move-callback-wait-queue-to-thread.patch
@@ -1,4 +1,4 @@
-From 79f36f33a29f5f9ca0f21e301e3cc9ec2725332f Mon Sep 17 00:00:00 2001
+From 14656b29991f0f909503b85a44a7c65a89ba7d8b Mon Sep 17 00:00:00 2001
 From: Adam Wallis <awallis@codeaurora.org>
 Date: Mon, 27 Nov 2017 10:45:01 -0500
 Subject: [PATCH] dmaengine: dmatest: move callback wait queue to thread
diff --git a/queue/dmaengine-ti-dma-crossbar-Correct-am335x-am43xx-mux-.patch b/queue/dmaengine-ti-dma-crossbar-Correct-am335x-am43xx-mux-.patch
index 030c0dd..5913e20 100644
--- a/queue/dmaengine-ti-dma-crossbar-Correct-am335x-am43xx-mux-.patch
+++ b/queue/dmaengine-ti-dma-crossbar-Correct-am335x-am43xx-mux-.patch
@@ -1,4 +1,4 @@
-From 288e7560e4d3e259aa28f8f58a8dfe63627a1bf6 Mon Sep 17 00:00:00 2001
+From 2e023c2d0ea4cdbcd284f0fe8e0a061ae85558b9 Mon Sep 17 00:00:00 2001
 From: Peter Ujfalusi <peter.ujfalusi@ti.com>
 Date: Wed, 8 Nov 2017 12:02:25 +0200
 Subject: [PATCH] dmaengine: ti-dma-crossbar: Correct am335x/am43xx mux value
@@ -16,9 +16,10 @@ the mux value since the event offsets are aligned to byte offset.
 Fixes: 42dbdcc6bf965 ("dmaengine: ti-dma-crossbar: Add support for crossbar on AM33xx/AM43xx")
 Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
 Signed-off-by: Vinod Koul <vinod.koul@intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/dma/ti-dma-crossbar.c b/drivers/dma/ti-dma-crossbar.c
-index 2f65a8fde21d..10ef9d5d5a66 100644
+index 88a00d06def6..43e88d85129e 100644
 --- a/drivers/dma/ti-dma-crossbar.c
 +++ b/drivers/dma/ti-dma-crossbar.c
 @@ -49,12 +49,12 @@ struct ti_am335x_xbar_data {
diff --git a/queue/eeprom-at24-change-nvmem-stride-to-1.patch b/queue/eeprom-at24-change-nvmem-stride-to-1.patch
index 908592a..c35da5f 100644
--- a/queue/eeprom-at24-change-nvmem-stride-to-1.patch
+++ b/queue/eeprom-at24-change-nvmem-stride-to-1.patch
@@ -1,4 +1,4 @@
-From 7f6d2ecd3d7acaf205ea7b3e96f9ffc55b92298b Mon Sep 17 00:00:00 2001
+From 474ff19b914b2eb753bf6430a6d20f48cae4e0a2 Mon Sep 17 00:00:00 2001
 From: David Lechner <david@lechnology.com>
 Date: Sun, 3 Dec 2017 19:54:41 -0600
 Subject: [PATCH] eeprom: at24: change nvmem stride to 1
@@ -14,12 +14,13 @@ Cc: stable@vger.kernel.org
 Signed-off-by: David Lechner <david@lechnology.com>
 [Bartosz: tweaked the commit message]
 Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
-index 20b4f26d30d7..4d63ac8a82e0 100644
+index 372b2060fbba..4cc0b42f2acc 100644
 --- a/drivers/misc/eeprom/at24.c
 +++ b/drivers/misc/eeprom/at24.c
-@@ -876,7 +876,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
+@@ -776,7 +776,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
  	at24->nvmem_config.reg_read = at24_read;
  	at24->nvmem_config.reg_write = at24_write;
  	at24->nvmem_config.priv = at24;
diff --git a/queue/ext4-fix-crash-when-a-directory-s-i_size-is-too-smal.patch b/queue/ext4-fix-crash-when-a-directory-s-i_size-is-too-smal.patch
index f645d1b..b12d975 100644
--- a/queue/ext4-fix-crash-when-a-directory-s-i_size-is-too-smal.patch
+++ b/queue/ext4-fix-crash-when-a-directory-s-i_size-is-too-smal.patch
@@ -1,4 +1,4 @@
-From 9d5afec6b8bd46d6ed821aa1579634437f58ef1f Mon Sep 17 00:00:00 2001
+From a81d7819f91f482a7346c39d9fb22bc25f97fc86 Mon Sep 17 00:00:00 2001
 From: Chandan Rajendra <chandan@linux.vnet.ibm.com>
 Date: Mon, 11 Dec 2017 15:00:57 -0500
 Subject: [PATCH] ext4: fix crash when a directory's i_size is too small
@@ -35,12 +35,13 @@ has no associated blocks.
 Reported-by: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
 Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
 Cc: stable@vger.kernel.org
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
-index 798b3ac680db..e750d68fbcb5 100644
+index 404256caf9cf..d0e2ae3df658 100644
 --- a/fs/ext4/namei.c
 +++ b/fs/ext4/namei.c
-@@ -1399,6 +1399,10 @@ static struct buffer_head * ext4_find_entry (struct inode *dir,
+@@ -1385,6 +1385,10 @@ static struct buffer_head * ext4_find_entry (struct inode *dir,
  			       "falling back\n"));
  	}
  	nblocks = dir->i_size >> EXT4_BLOCK_SIZE_BITS(sb);
diff --git a/queue/ext4-fix-fdatasync-2-after-fallocate-2-operation.patch b/queue/ext4-fix-fdatasync-2-after-fallocate-2-operation.patch
index 0645106..a82e276 100644
--- a/queue/ext4-fix-fdatasync-2-after-fallocate-2-operation.patch
+++ b/queue/ext4-fix-fdatasync-2-after-fallocate-2-operation.patch
@@ -1,4 +1,4 @@
-From c894aa97577e47d3066b27b32499ecf899bfa8b0 Mon Sep 17 00:00:00 2001
+From 653e8f194b715e7d5d7142f05644f13ceeb7301c Mon Sep 17 00:00:00 2001
 From: Eryu Guan <eguan@redhat.com>
 Date: Sun, 3 Dec 2017 22:52:51 -0500
 Subject: [PATCH] ext4: fix fdatasync(2) after fallocate(2) operation
@@ -24,12 +24,13 @@ This addresses the test failure in xfstests test generic/468.
 Signed-off-by: Eryu Guan <eguan@redhat.com>
 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
 Cc: stable@vger.kernel.org
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
-index 07bca11749d4..c941251ac0c0 100644
+index 07f933beb0e1..10ec1c58e1ef 100644
 --- a/fs/ext4/extents.c
 +++ b/fs/ext4/extents.c
-@@ -4722,6 +4722,7 @@ static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset,
+@@ -4721,6 +4721,7 @@ static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset,
  						    EXT4_INODE_EOFBLOCKS);
  		}
  		ext4_mark_inode_dirty(handle, inode);
diff --git a/queue/fbdev-controlfb-Add-missing-modes-to-fix-out-of-boun.patch b/queue/fbdev-controlfb-Add-missing-modes-to-fix-out-of-boun.patch
index 97b3ca6..3c5ab95 100644
--- a/queue/fbdev-controlfb-Add-missing-modes-to-fix-out-of-boun.patch
+++ b/queue/fbdev-controlfb-Add-missing-modes-to-fix-out-of-boun.patch
@@ -1,4 +1,4 @@
-From ac831a379d34109451b3c41a44a20ee10ecb615f Mon Sep 17 00:00:00 2001
+From dace596be6176c980c91112598ff8bf3bd2de44b Mon Sep 17 00:00:00 2001
 From: Geert Uytterhoeven <geert@linux-m68k.org>
 Date: Thu, 9 Nov 2017 18:09:33 +0100
 Subject: [PATCH] fbdev: controlfb: Add missing modes to fix out of bounds
@@ -27,6 +27,7 @@ Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
 Cc: Dan Carpenter <dan.carpenter@oracle.com>
 Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/video/fbdev/controlfb.h b/drivers/video/fbdev/controlfb.h
 index 6026c60fc100..261522fabdac 100644
diff --git a/queue/icmp-don-t-fail-on-fragment-reassembly-time-exceeded.patch b/queue/icmp-don-t-fail-on-fragment-reassembly-time-exceeded.patch
index a915638..23ca353 100644
--- a/queue/icmp-don-t-fail-on-fragment-reassembly-time-exceeded.patch
+++ b/queue/icmp-don-t-fail-on-fragment-reassembly-time-exceeded.patch
@@ -1,4 +1,4 @@
-From 258bbb1b0e594ad5f5652cb526b3c63e6a7fad3d Mon Sep 17 00:00:00 2001
+From 41bd26f7060ae49732e5a124646e1ccec629085f Mon Sep 17 00:00:00 2001
 From: Matteo Croce <mcroce@redhat.com>
 Date: Thu, 12 Oct 2017 16:12:37 +0200
 Subject: [PATCH] icmp: don't fail on fragment reassembly time exceeded
@@ -51,9 +51,10 @@ into a switch to mate it more readable.
 
 Signed-off-by: Matteo Croce <mcroce@redhat.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
-index 681e33998e03..3c1570d3e22f 100644
+index 9144fa7df2ad..e9d566308468 100644
 --- a/net/ipv4/icmp.c
 +++ b/net/ipv4/icmp.c
 @@ -782,7 +782,7 @@ static bool icmp_tag_validation(int proto)
diff --git a/queue/iommu-amd-Limit-the-IOVA-page-range-to-the-specified.patch b/queue/iommu-amd-Limit-the-IOVA-page-range-to-the-specified.patch
index 289c663..ecfb6ff 100644
--- a/queue/iommu-amd-Limit-the-IOVA-page-range-to-the-specified.patch
+++ b/queue/iommu-amd-Limit-the-IOVA-page-range-to-the-specified.patch
@@ -1,4 +1,4 @@
-From b92b4fb5c14257c0e7eae291ecc1f7b1962e1699 Mon Sep 17 00:00:00 2001
+From 9cccb6777bf7ea86af3070d9ca66875a3cf0f2b0 Mon Sep 17 00:00:00 2001
 From: Gary R Hook <gary.hook@amd.com>
 Date: Fri, 3 Nov 2017 10:50:34 -0600
 Subject: [PATCH] iommu/amd: Limit the IOVA page range to the specified
@@ -13,12 +13,13 @@ the range.
 Signed-off-by: Gary R Hook <gary.hook@amd.com>
 Fixes: 8d54d6c8b8f3 ('iommu/amd: Implement apply_dm_region call-back')
 Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
-index 797e6454afd5..a8c111e96cc3 100644
+index e11db63c93fc..36e29cdbfe73 100644
 --- a/drivers/iommu/amd_iommu.c
 +++ b/drivers/iommu/amd_iommu.c
-@@ -3151,7 +3151,7 @@ static void amd_iommu_apply_resv_region(struct device *dev,
+@@ -3233,7 +3233,7 @@ static void amd_iommu_apply_resv_region(struct device *dev,
  	unsigned long start, end;
  
  	start = IOVA_PFN(region->start);
diff --git a/queue/iommu-mediatek-Fix-driver-name.patch b/queue/iommu-mediatek-Fix-driver-name.patch
index 2b870cc..f827ac1 100644
--- a/queue/iommu-mediatek-Fix-driver-name.patch
+++ b/queue/iommu-mediatek-Fix-driver-name.patch
@@ -1,4 +1,4 @@
-From 395df08d2e1de238a9c8c33fdcd0e2160efd63a9 Mon Sep 17 00:00:00 2001
+From 9f9fcba4e86bfe4a6ac42ea278f6a17a772967ae Mon Sep 17 00:00:00 2001
 From: Matthias Brugger <matthias.bgg@gmail.com>
 Date: Mon, 30 Oct 2017 12:37:55 +0100
 Subject: [PATCH] iommu/mediatek: Fix driver name
@@ -17,6 +17,7 @@ Fix this by changing the name for first generation to
 Fixes: b17336c55d89 ("iommu/mediatek: add support for mtk iommu generation one HW")
 Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
 Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
 index bc1efbfb9ddf..542930cd183d 100644
diff --git a/queue/ipv4-ipv4_default_advmss-should-use-route-mtu.patch b/queue/ipv4-ipv4_default_advmss-should-use-route-mtu.patch
index 6780f45..2ab5c2a 100644
--- a/queue/ipv4-ipv4_default_advmss-should-use-route-mtu.patch
+++ b/queue/ipv4-ipv4_default_advmss-should-use-route-mtu.patch
@@ -1,4 +1,4 @@
-From 164a5e7ad531e181334a3d3f03d0d5ad20d6faea Mon Sep 17 00:00:00 2001
+From 03b517be4051a3c7857e2568baf97bede2155699 Mon Sep 17 00:00:00 2001
 From: Eric Dumazet <edumazet@google.com>
 Date: Wed, 18 Oct 2017 17:02:03 -0700
 Subject: [PATCH] ipv4: ipv4_default_advmss() should use route mtu
@@ -11,12 +11,13 @@ lets harmonize the two protocols.
 
 Signed-off-by: Eric Dumazet <edumazet@google.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/net/ipv4/route.c b/net/ipv4/route.c
-index 4306db827374..bc40bd411196 100644
+index 1dfe08765a6b..ae465d65bacd 100644
 --- a/net/ipv4/route.c
 +++ b/net/ipv4/route.c
-@@ -1250,7 +1250,7 @@ static void set_class_tag(struct rtable *rt, u32 tag)
+@@ -1255,7 +1255,7 @@ static void set_class_tag(struct rtable *rt, u32 tag)
  static unsigned int ipv4_default_advmss(const struct dst_entry *dst)
  {
  	unsigned int header_size = sizeof(struct tcphdr) + sizeof(struct iphdr);
diff --git a/queue/iscsi-target-fix-memory-leak-in-lio_target_tiqn_addt.patch b/queue/iscsi-target-fix-memory-leak-in-lio_target_tiqn_addt.patch
index 9cc7e75..1b2b3d6 100644
--- a/queue/iscsi-target-fix-memory-leak-in-lio_target_tiqn_addt.patch
+++ b/queue/iscsi-target-fix-memory-leak-in-lio_target_tiqn_addt.patch
@@ -1,4 +1,4 @@
-From 12d5a43b2dffb6cd28062b4e19024f7982393288 Mon Sep 17 00:00:00 2001
+From e9aa9963e18c288b7b3ccef2c74cdd7e05b52e9e Mon Sep 17 00:00:00 2001
 From: tangwenji <tang.wenji@zte.com.cn>
 Date: Fri, 15 Sep 2017 16:03:13 +0800
 Subject: [PATCH] iscsi-target: fix memory leak in lio_target_tiqn_addtpg()
@@ -9,6 +9,7 @@ tpg must free when call core_tpg_register() return fail
 
 Signed-off-by: tangwenji <tang.wenji@zte.com.cn>
 Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
 index 0dd4c45f7575..0ebc4818e132 100644
diff --git a/queue/iw_cxgb4-only-insert-drain-cqes-if-wq-is-flushed.patch b/queue/iw_cxgb4-only-insert-drain-cqes-if-wq-is-flushed.patch
index e4d5e87..551f3f1 100644
--- a/queue/iw_cxgb4-only-insert-drain-cqes-if-wq-is-flushed.patch
+++ b/queue/iw_cxgb4-only-insert-drain-cqes-if-wq-is-flushed.patch
@@ -1,4 +1,4 @@
-From c058ecf6e455fac7346d46197a02398ead90851f Mon Sep 17 00:00:00 2001
+From 8256129590d2960b73f85b485240a05ee61f1981 Mon Sep 17 00:00:00 2001
 From: Steve Wise <swise@opengridcomputing.com>
 Date: Mon, 27 Nov 2017 13:16:32 -0800
 Subject: [PATCH] iw_cxgb4: only insert drain cqes if wq is flushed
@@ -21,12 +21,13 @@ Fixes: 4fe7c2962e11 ("iw_cxgb4: refactor sq/rq drain logic")
 Signed-off-by: Steve Wise <swise@opengridcomputing.com>
 Cc: stable@vger.kernel.org
 Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c
-index ea55e95cd2c5..b7bfc536e00f 100644
+index 14de5bde1b63..620a8be5b1ce 100644
 --- a/drivers/infiniband/hw/cxgb4/cq.c
 +++ b/drivers/infiniband/hw/cxgb4/cq.c
-@@ -395,6 +395,11 @@ void c4iw_flush_hw_cq(struct c4iw_cq *chp)
+@@ -412,6 +412,11 @@ void c4iw_flush_hw_cq(struct c4iw_cq *chp)
  
  static int cqe_completes_wr(struct t4_cqe *cqe, struct t4_wq *wq)
  {
@@ -39,10 +40,10 @@ index ea55e95cd2c5..b7bfc536e00f 100644
  		return 0;
  
 diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
-index 355e288ec969..38bddd02a943 100644
+index 8e4154b4253e..4bcfa183b7b8 100644
 --- a/drivers/infiniband/hw/cxgb4/qp.c
 +++ b/drivers/infiniband/hw/cxgb4/qp.c
-@@ -868,7 +868,12 @@ int c4iw_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
+@@ -869,7 +869,12 @@ int c4iw_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
  
  	qhp = to_c4iw_qp(ibqp);
  	spin_lock_irqsave(&qhp->lock, flag);
@@ -56,7 +57,7 @@ index 355e288ec969..38bddd02a943 100644
  		spin_unlock_irqrestore(&qhp->lock, flag);
  		complete_sq_drain_wr(qhp, wr);
  		return err;
-@@ -1011,7 +1016,12 @@ int c4iw_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
+@@ -1013,7 +1018,12 @@ int c4iw_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
  
  	qhp = to_c4iw_qp(ibqp);
  	spin_lock_irqsave(&qhp->lock, flag);
diff --git a/queue/kernel-make-groups_sort-calling-a-responsibility-gro.patch b/queue/kernel-make-groups_sort-calling-a-responsibility-gro.patch
index 7c568b6..4eb305e 100644
--- a/queue/kernel-make-groups_sort-calling-a-responsibility-gro.patch
+++ b/queue/kernel-make-groups_sort-calling-a-responsibility-gro.patch
@@ -1,4 +1,4 @@
-From 7e7e3191808c62996962413029d8f4a6a0f7d718 Mon Sep 17 00:00:00 2001
+From 1482dba3640355788f6bd100ca64293eddb7a9a4 Mon Sep 17 00:00:00 2001
 From: Thiago Rafael Becker <thiago.becker@gmail.com>
 Date: Thu, 14 Dec 2017 15:33:12 -0800
 Subject: [PATCH] kernel: make groups_sort calling a responsibility group_info
diff --git a/queue/l2tp-cleanup-l2tp_tunnel_delete-calls.patch b/queue/l2tp-cleanup-l2tp_tunnel_delete-calls.patch
index 9c808aa..56d1a55 100644
--- a/queue/l2tp-cleanup-l2tp_tunnel_delete-calls.patch
+++ b/queue/l2tp-cleanup-l2tp_tunnel_delete-calls.patch
@@ -1,4 +1,4 @@
-From aa7dfc2af0d45cb8a38f220246e4a74ae479b07b Mon Sep 17 00:00:00 2001
+From 33c72e87c01df2ec01f25ab2cb655e2f246ce58a Mon Sep 17 00:00:00 2001
 From: Jiri Slaby <jslaby@suse.cz>
 Date: Wed, 25 Oct 2017 15:57:55 +0200
 Subject: [PATCH] l2tp: cleanup l2tp_tunnel_delete calls
diff --git a/queue/lightnvm-pblk-fix-changing-GC-group-list-for-a-line.patch b/queue/lightnvm-pblk-fix-changing-GC-group-list-for-a-line.patch
index 1eb4517..1f5dee3 100644
--- a/queue/lightnvm-pblk-fix-changing-GC-group-list-for-a-line.patch
+++ b/queue/lightnvm-pblk-fix-changing-GC-group-list-for-a-line.patch
@@ -1,4 +1,4 @@
-From 95c46e590dd4ec72a5273c27ed24020b94f9f76d Mon Sep 17 00:00:00 2001
+From 616a6fff985a13752b102b3a5094ae0e4e14ef84 Mon Sep 17 00:00:00 2001
 From: Rakesh Pandit <rakesh@tuxera.com>
 Date: Fri, 13 Oct 2017 14:46:28 +0200
 Subject: [PATCH] lightnvm: pblk: fix changing GC group list for a line
diff --git a/queue/lightnvm-pblk-fix-min-size-for-page-mempool.patch b/queue/lightnvm-pblk-fix-min-size-for-page-mempool.patch
index 59ae046..f80b5dd 100644
--- a/queue/lightnvm-pblk-fix-min-size-for-page-mempool.patch
+++ b/queue/lightnvm-pblk-fix-min-size-for-page-mempool.patch
@@ -1,4 +1,4 @@
-From c9cae7951cbfcd1ae100967f24a160a48d05bd1b Mon Sep 17 00:00:00 2001
+From 2fc1a40df155abc063a30fccb0af3b255abb18d2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= <javier@cnexlabs.com>
 Date: Fri, 13 Oct 2017 14:46:06 +0200
 Subject: [PATCH] lightnvm: pblk: fix min size for page mempool
diff --git a/queue/lightnvm-pblk-initialize-debug-stat-counter.patch b/queue/lightnvm-pblk-initialize-debug-stat-counter.patch
index a9a11d6..ffb2648 100644
--- a/queue/lightnvm-pblk-initialize-debug-stat-counter.patch
+++ b/queue/lightnvm-pblk-initialize-debug-stat-counter.patch
@@ -1,4 +1,4 @@
-From a1121176ff757e3c073490a69608ea0b18a00ec1 Mon Sep 17 00:00:00 2001
+From 844dd118937dfc7a1b6a201a08b1e0f1f733fd81 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= <javier@cnexlabs.com>
 Date: Fri, 13 Oct 2017 14:46:01 +0200
 Subject: [PATCH] lightnvm: pblk: initialize debug stat counter
@@ -14,12 +14,13 @@ Fixes: a4bd217b43268 ("lightnvm: physical block device (pblk) target")
 Signed-off-by: Javier González <javier@cnexlabs.com>
 Signed-off-by: Matias Bjørling <m@bjorling.me>
 Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
-index 8c85779e9635..83445115a922 100644
+index ec10434c8e8c..d09954a5b603 100644
 --- a/drivers/lightnvm/pblk-init.c
 +++ b/drivers/lightnvm/pblk-init.c
-@@ -947,6 +947,7 @@ static void *pblk_init(struct nvm_tgt_dev *dev, struct gendisk *tdisk,
+@@ -842,6 +842,7 @@ static void *pblk_init(struct nvm_tgt_dev *dev, struct gendisk *tdisk,
  	atomic_long_set(&pblk->recov_writes, 0);
  	atomic_long_set(&pblk->recov_writes, 0);
  	atomic_long_set(&pblk->recov_gc_writes, 0);
diff --git a/queue/liquidio-fix-kernel-panic-in-VF-driver.patch b/queue/liquidio-fix-kernel-panic-in-VF-driver.patch
index a69858a..322770d 100644
--- a/queue/liquidio-fix-kernel-panic-in-VF-driver.patch
+++ b/queue/liquidio-fix-kernel-panic-in-VF-driver.patch
@@ -1,4 +1,4 @@
-From 878615679c5597c8c5fb1afb540ff5e552575711 Mon Sep 17 00:00:00 2001
+From 997ed4dff3930b17601c5b485d02af2c1242904f Mon Sep 17 00:00:00 2001
 From: Felix Manlunas <felix.manlunas@cavium.com>
 Date: Thu, 26 Oct 2017 16:46:36 -0700
 Subject: [PATCH] liquidio: fix kernel panic in VF driver
diff --git a/queue/macvlan-Only-deliver-one-copy-of-the-frame-to-the-ma.patch b/queue/macvlan-Only-deliver-one-copy-of-the-frame-to-the-ma.patch
index edcfd1c..3354020 100644
--- a/queue/macvlan-Only-deliver-one-copy-of-the-frame-to-the-ma.patch
+++ b/queue/macvlan-Only-deliver-one-copy-of-the-frame-to-the-ma.patch
@@ -1,4 +1,4 @@
-From dd6b9c2c332b40f142740d1b11fb77c653ff98ea Mon Sep 17 00:00:00 2001
+From 118e0df1ea93f30750a33f91ea9b3789984fa6ac Mon Sep 17 00:00:00 2001
 From: Alexander Duyck <alexander.h.duyck@intel.com>
 Date: Fri, 13 Oct 2017 13:40:24 -0700
 Subject: [PATCH] macvlan: Only deliver one copy of the frame to the macvlan
@@ -19,9 +19,10 @@ to be matching based on the destination MAC anyway.
 Fixes: 79cf79abce71 ("macvlan: add source mode")
 Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
-index 858bd66511a2..a4ae8cd0f660 100644
+index 72b801803aa4..0ad8417475ad 100644
 --- a/drivers/net/macvlan.c
 +++ b/drivers/net/macvlan.c
 @@ -480,7 +480,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb)
diff --git a/queue/md-cluster-fix-wrong-condition-check-in-raid1_write_.patch b/queue/md-cluster-fix-wrong-condition-check-in-raid1_write_.patch
index 727f3a2..4ac0ca4 100644
--- a/queue/md-cluster-fix-wrong-condition-check-in-raid1_write_.patch
+++ b/queue/md-cluster-fix-wrong-condition-check-in-raid1_write_.patch
@@ -1,4 +1,4 @@
-From 385f4d7f946b08f36f68b0a28e95a319925b6b62 Mon Sep 17 00:00:00 2001
+From 27e68a37d8a8692757529338c0e7572580dae709 Mon Sep 17 00:00:00 2001
 From: Guoqing Jiang <gqjiang@suse.com>
 Date: Fri, 29 Sep 2017 09:16:43 +0800
 Subject: [PATCH] md-cluster: fix wrong condition check in raid1_write_request
@@ -12,12 +12,13 @@ inverse of the checking inside "if".
 Fixes: 589a1c4 ("Suspend writes in RAID1 if within range")
 Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
 Signed-off-by: Shaohua Li <shli@fb.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
-index f3f3e40dc9d8..35264ad0ec70 100644
+index 5906a38cf3b6..18ae375d4bba 100644
 --- a/drivers/md/raid1.c
 +++ b/drivers/md/raid1.c
-@@ -1325,12 +1325,12 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
+@@ -1317,12 +1317,12 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
  			sigset_t full, old;
  			prepare_to_wait(&conf->wait_barrier,
  					&w, TASK_INTERRUPTIBLE);
diff --git a/queue/media-usbtv-fix-brightness-and-contrast-controls.patch b/queue/media-usbtv-fix-brightness-and-contrast-controls.patch
index 1853fd5..2ea8fb3 100644
--- a/queue/media-usbtv-fix-brightness-and-contrast-controls.patch
+++ b/queue/media-usbtv-fix-brightness-and-contrast-controls.patch
@@ -1,4 +1,4 @@
-From b3168c87c0492661badc3e908f977d79e7738a41 Mon Sep 17 00:00:00 2001
+From b3a93dfe5730b087274df6bfed356186edc8807a Mon Sep 17 00:00:00 2001
 From: Adam Sampson <ats@offog.org>
 Date: Tue, 24 Oct 2017 16:14:46 -0400
 Subject: [PATCH] media: usbtv: fix brightness and contrast controls
@@ -22,9 +22,10 @@ Signed-off-by: Adam Sampson <ats@offog.org>
 Reviewed-by: Lubomir Rintel <lkundrak@v3.sk>
 Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
 Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c
-index 95b5f4319ec2..3668a04359e8 100644
+index 8135614f395a..46598dcef2d3 100644
 --- a/drivers/media/usb/usbtv/usbtv-video.c
 +++ b/drivers/media/usb/usbtv/usbtv-video.c
 @@ -718,8 +718,8 @@ static int usbtv_s_ctrl(struct v4l2_ctrl *ctrl)
diff --git a/queue/mfd-fsl-imx25-Clean-up-irq-settings-during-removal.patch b/queue/mfd-fsl-imx25-Clean-up-irq-settings-during-removal.patch
index c9ecad3..46e9f54 100644
--- a/queue/mfd-fsl-imx25-Clean-up-irq-settings-during-removal.patch
+++ b/queue/mfd-fsl-imx25-Clean-up-irq-settings-during-removal.patch
@@ -1,4 +1,4 @@
-From 47d6da40204d4322702d1544f411434a3cf9e9d6 Mon Sep 17 00:00:00 2001
+From f950e7a065973c4f3cc08e38cd81cbf60bf3744d Mon Sep 17 00:00:00 2001
 From: Martin Kaiser <martin@kaiser.cx>
 Date: Tue, 17 Oct 2017 22:53:08 +0200
 Subject: [PATCH] mfd: fsl-imx25: Clean up irq settings during removal
diff --git a/queue/mfd-mxs-lradc-Fix-error-handling-in-mxs_lradc_probe.patch b/queue/mfd-mxs-lradc-Fix-error-handling-in-mxs_lradc_probe.patch
index 8520628..e9589e3 100644
--- a/queue/mfd-mxs-lradc-Fix-error-handling-in-mxs_lradc_probe.patch
+++ b/queue/mfd-mxs-lradc-Fix-error-handling-in-mxs_lradc_probe.patch
@@ -1,4 +1,4 @@
-From 362741a21a5c4b9ee31e75ce28d63c6d238a745c Mon Sep 17 00:00:00 2001
+From 99d0a1d0b81289c75f747d1e2b1635edc1768676 Mon Sep 17 00:00:00 2001
 From: Alexey Khoroshilov <khoroshilov@ispras.ru>
 Date: Sat, 14 Oct 2017 01:06:56 +0300
 Subject: [PATCH] mfd: mxs-lradc: Fix error handling in mxs_lradc_probe()
@@ -12,6 +12,7 @@ Found by Linux Driver Verification project (linuxtesting.org).
 
 Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
 Signed-off-by: Lee Jones <lee.jones@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/mfd/mxs-lradc.c b/drivers/mfd/mxs-lradc.c
 index 630bd19b2c0a..98e732a7ae96 100644
diff --git a/queue/misc-pci_endpoint_test-Avoid-triggering-a-BUG.patch b/queue/misc-pci_endpoint_test-Avoid-triggering-a-BUG.patch
index 118b14a..008ffb7 100644
--- a/queue/misc-pci_endpoint_test-Avoid-triggering-a-BUG.patch
+++ b/queue/misc-pci_endpoint_test-Avoid-triggering-a-BUG.patch
@@ -1,4 +1,4 @@
-From 846df244ebefbc9f7b91e9ae7a5e5a2e69fb4772 Mon Sep 17 00:00:00 2001
+From e71ba5a7fba92139574909de30c60db9d72cd156 Mon Sep 17 00:00:00 2001
 From: Dan Carpenter <dan.carpenter@oracle.com>
 Date: Sat, 30 Sep 2017 11:16:51 +0300
 Subject: [PATCH] misc: pci_endpoint_test: Avoid triggering a BUG()
@@ -12,12 +12,13 @@ that.
 Fixes: 2c156ac71c6b ("misc: Add host side PCI driver for PCI test function device")
 Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c
-index c0d323077ad0..d40a34f594c7 100644
+index e26a8c28bcf7..9e3900de3e0f 100644
 --- a/drivers/misc/pci_endpoint_test.c
 +++ b/drivers/misc/pci_endpoint_test.c
-@@ -597,6 +597,8 @@ static void pci_endpoint_test_remove(struct pci_dev *pdev)
+@@ -504,6 +504,8 @@ static void pci_endpoint_test_remove(struct pci_dev *pdev)
  
  	if (sscanf(misc_device->name, DRV_MODULE_NAME ".%d", &id) != 1)
  		return;
diff --git a/queue/misc-pci_endpoint_test-Fix-failure-path-return-value.patch b/queue/misc-pci_endpoint_test-Fix-failure-path-return-value.patch
index a6561a5..716e00a 100644
--- a/queue/misc-pci_endpoint_test-Fix-failure-path-return-value.patch
+++ b/queue/misc-pci_endpoint_test-Fix-failure-path-return-value.patch
@@ -1,4 +1,4 @@
-From 90b760c1db6113027dec110f766b7e381440469e Mon Sep 17 00:00:00 2001
+From 0782ed2fdee54280deebbe61908e90aeb6865810 Mon Sep 17 00:00:00 2001
 From: Kishon Vijay Abraham I <kishon@ti.com>
 Date: Wed, 11 Oct 2017 14:14:36 +0530
 Subject: [PATCH] misc: pci_endpoint_test: Fix failure path return values in
diff --git a/queue/mmc-core-apply-NO_CMD23-quirk-to-some-specific-cards.patch b/queue/mmc-core-apply-NO_CMD23-quirk-to-some-specific-cards.patch
index 5b38bd1..c102e19 100644
--- a/queue/mmc-core-apply-NO_CMD23-quirk-to-some-specific-cards.patch
+++ b/queue/mmc-core-apply-NO_CMD23-quirk-to-some-specific-cards.patch
@@ -1,4 +1,4 @@
-From 91516a2a4734614d62ee3ed921f8f88acc67c000 Mon Sep 17 00:00:00 2001
+From f0a44987ddba125b90b0cd91128a9941079bf4ec Mon Sep 17 00:00:00 2001
 From: Christoph Fritz <chf.fritz@googlemail.com>
 Date: Sat, 9 Dec 2017 23:47:55 +0100
 Subject: [PATCH] mmc: core: apply NO_CMD23 quirk to some specific cards
@@ -35,6 +35,7 @@ Without this patch on rk3288 (dw_mmc-rockchip):
 Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
 Cc: <stable@vger.kernel.org> # v4.14+
 Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/mmc/core/card.h b/drivers/mmc/core/card.h
 index f06cd91964ce..79a5b985ccf5 100644
@@ -53,10 +54,10 @@ index f06cd91964ce..79a5b985ccf5 100644
  #define CID_MANFID_HYNIX	0x90
  
 diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h
-index f664e9cbc9f8..75d317623852 100644
+index fb725934fa21..1679d8c04a5d 100644
 --- a/drivers/mmc/core/quirks.h
 +++ b/drivers/mmc/core/quirks.h
-@@ -52,6 +52,14 @@ static const struct mmc_fixup mmc_blk_fixups[] = {
+@@ -51,6 +51,14 @@ static const struct mmc_fixup mmc_blk_fixups[] = {
  	MMC_FIXUP("MMC32G", CID_MANFID_TOSHIBA, CID_OEMID_ANY, add_quirk_mmc,
  		  MMC_QUIRK_BLK_NO_CMD23),
  
diff --git a/queue/mtd-spi-nor-stm32-quadspi-Fix-uninitialized-error-re.patch b/queue/mtd-spi-nor-stm32-quadspi-Fix-uninitialized-error-re.patch
index 3229b69..237ba28 100644
--- a/queue/mtd-spi-nor-stm32-quadspi-Fix-uninitialized-error-re.patch
+++ b/queue/mtd-spi-nor-stm32-quadspi-Fix-uninitialized-error-re.patch
@@ -1,4 +1,4 @@
-From 05521bd3d117704a1458eb4d0c3ae821858658f2 Mon Sep 17 00:00:00 2001
+From 1acbb639d72a10265365ec3543b07c0264f980db Mon Sep 17 00:00:00 2001
 From: Geert Uytterhoeven <geert@linux-m68k.org>
 Date: Thu, 26 Oct 2017 17:12:33 +0200
 Subject: [PATCH] mtd: spi-nor: stm32-quadspi: Fix uninitialized error return
@@ -28,12 +28,13 @@ Fixes: 0d43d7ab277a048c ("mtd: spi-nor: add driver for STM32 quad spi flash cont
 Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
 Acked-by: Ludovic Barre <ludovic.barre@st.com>
 Signed-off-by: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/mtd/spi-nor/stm32-quadspi.c b/drivers/mtd/spi-nor/stm32-quadspi.c
-index 86c0931543c5..ad6a3e1844cb 100644
+index ae45f81b8cd3..c5831d38b2ee 100644
 --- a/drivers/mtd/spi-nor/stm32-quadspi.c
 +++ b/drivers/mtd/spi-nor/stm32-quadspi.c
-@@ -240,12 +240,12 @@ static int stm32_qspi_tx_poll(struct stm32_qspi *qspi,
+@@ -239,12 +239,12 @@ static int stm32_qspi_tx_poll(struct stm32_qspi *qspi,
  						 STM32_QSPI_FIFO_TIMEOUT_US);
  		if (ret) {
  			dev_err(qspi->dev, "fifo timeout (stat:%#x)\n", sr);
diff --git a/queue/netfilter-ipvs-Fix-inappropriate-output-of-procfs.patch b/queue/netfilter-ipvs-Fix-inappropriate-output-of-procfs.patch
index e192f85..24fc5fb 100644
--- a/queue/netfilter-ipvs-Fix-inappropriate-output-of-procfs.patch
+++ b/queue/netfilter-ipvs-Fix-inappropriate-output-of-procfs.patch
@@ -1,4 +1,4 @@
-From c5504f724c86ee925e7ffb80aa342cfd57959b13 Mon Sep 17 00:00:00 2001
+From 69a44542903bdcc7acdc3825df6379579d8d716b Mon Sep 17 00:00:00 2001
 From: KUWAZAWA Takuya <albatross0@gmail.com>
 Date: Sun, 15 Oct 2017 20:54:10 +0900
 Subject: [PATCH] netfilter: ipvs: Fix inappropriate output of procfs
@@ -48,12 +48,13 @@ But I can see information about other network namespace via procfs.
 Signed-off-by: KUWAZAWA Takuya <albatross0@gmail.com>
 Acked-by: Julian Anastasov <ja@ssi.bg>
 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
-index b825835752e6..fac8c802b4ea 100644
+index 1fa3c2307b6e..3dc7870f5cd0 100644
 --- a/net/netfilter/ipvs/ip_vs_ctl.c
 +++ b/net/netfilter/ipvs/ip_vs_ctl.c
-@@ -2034,12 +2034,16 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
+@@ -2037,12 +2037,16 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
  		seq_puts(seq,
  			 "  -> RemoteAddress:Port Forward Weight ActiveConn InActConn\n");
  	} else {
diff --git a/queue/nfs-don-t-wait-on-commit-in-nfs_commit_inode-if-ther.patch b/queue/nfs-don-t-wait-on-commit-in-nfs_commit_inode-if-ther.patch
index 4325bf9..83d4d6a 100644
--- a/queue/nfs-don-t-wait-on-commit-in-nfs_commit_inode-if-ther.patch
+++ b/queue/nfs-don-t-wait-on-commit-in-nfs_commit_inode-if-ther.patch
@@ -1,4 +1,4 @@
-From dc4fd9ab01ab379ae5af522b3efd4187a7c30a31 Mon Sep 17 00:00:00 2001
+From 835aec9bf21ab44edfae0078fd7c26611a89d75d Mon Sep 17 00:00:00 2001
 From: Scott Mayhew <smayhew@redhat.com>
 Date: Fri, 8 Dec 2017 16:00:12 -0500
 Subject: [PATCH] nfs: don't wait on commit in nfs_commit_inode() if there were
@@ -47,12 +47,13 @@ GPR28: d0000000079dbd50 c0000005b94a02c0 c0000005b94a0250 c0000005b94a01c8
 Signed-off-by: Scott Mayhew <smayhew@redhat.com>
 Cc: stable@vger.kernel.org # 4.5+
 Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/fs/nfs/write.c b/fs/nfs/write.c
-index 5b5f464f6f2a..4a379d7918f2 100644
+index db7ba542559e..86d73ecda36b 100644
 --- a/fs/nfs/write.c
 +++ b/fs/nfs/write.c
-@@ -1890,6 +1890,8 @@ int nfs_commit_inode(struct inode *inode, int how)
+@@ -1849,6 +1849,8 @@ int nfs_commit_inode(struct inode *inode, int how)
  	if (res)
  		error = nfs_generic_commit_list(inode, &head, how, &cinfo);
  	nfs_commit_end(cinfo.mds);
diff --git a/queue/nvme-use-kref_get_unless_zero-in-nvme_find_get_ns.patch b/queue/nvme-use-kref_get_unless_zero-in-nvme_find_get_ns.patch
index dff2baf..9283e06 100644
--- a/queue/nvme-use-kref_get_unless_zero-in-nvme_find_get_ns.patch
+++ b/queue/nvme-use-kref_get_unless_zero-in-nvme_find_get_ns.patch
@@ -1,4 +1,4 @@
-From 2dd4122854f697afc777582d18548dded03ce5dd Mon Sep 17 00:00:00 2001
+From ba9e01e202367786d1b4dfead4ce2280e106e7c3 Mon Sep 17 00:00:00 2001
 From: Christoph Hellwig <hch@lst.de>
 Date: Wed, 18 Oct 2017 13:20:01 +0200
 Subject: [PATCH] nvme: use kref_get_unless_zero in nvme_find_get_ns
@@ -14,12 +14,13 @@ Signed-off-by: Christoph Hellwig <hch@lst.de>
 Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
 Reviewed-by: Hannes Reinecke <hare@suse.com>
 Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 7fae42d595d5..1d931deac83b 100644
+index 903d5813023a..c40762a65f3d 100644
 --- a/drivers/nvme/host/core.c
 +++ b/drivers/nvme/host/core.c
-@@ -2290,7 +2290,8 @@ static struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned nsid)
+@@ -2008,7 +2008,8 @@ static struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned nsid)
  	mutex_lock(&ctrl->namespaces_mutex);
  	list_for_each_entry(ns, &ctrl->namespaces, list) {
  		if (ns->ns_id == nsid) {
diff --git a/queue/pinctrl-adi2-Fix-Kconfig-build-problem.patch b/queue/pinctrl-adi2-Fix-Kconfig-build-problem.patch
index dabd8d7..b899365 100644
--- a/queue/pinctrl-adi2-Fix-Kconfig-build-problem.patch
+++ b/queue/pinctrl-adi2-Fix-Kconfig-build-problem.patch
@@ -1,4 +1,4 @@
-From 1c363531dd814dc4fe10865722bf6b0f72ce4673 Mon Sep 17 00:00:00 2001
+From 97de3cd2e160d56a959b78a914bbe98d8b7d647c Mon Sep 17 00:00:00 2001
 From: Linus Walleij <linus.walleij@linaro.org>
 Date: Wed, 11 Oct 2017 11:57:15 +0200
 Subject: [PATCH] pinctrl: adi2: Fix Kconfig build problem
@@ -45,12 +45,13 @@ control expanders on the Blackfin.
 Cc: Steven Miao <realmz6@gmail.com>
 Cc: Huanhuan Feng <huanhuan.feng@analog.com>
 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
-index 89bdb8264305..6cd804e16a94 100644
+index 3c1bd640042a..88c4b77ec8d2 100644
 --- a/arch/blackfin/Kconfig
 +++ b/arch/blackfin/Kconfig
-@@ -320,11 +320,14 @@ config BF53x
+@@ -319,11 +319,14 @@ config BF53x
  
  config GPIO_ADI
  	def_bool y
@@ -80,10 +81,10 @@ index f3337ee03621..a93cf06a4d6f 100644
  	help
  	  Create a tree of Blackfin MMRs via the debugfs tree.  If
 diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
-index c0294958405d..5b4939e709ac 100644
+index 48ba3e64174f..9b37242bcc66 100644
 --- a/drivers/pinctrl/Kconfig
 +++ b/drivers/pinctrl/Kconfig
-@@ -32,7 +32,8 @@ config DEBUG_PINCTRL
+@@ -33,7 +33,8 @@ config DEBUG_PINCTRL
  
  config PINCTRL_ADI2
  	bool "ADI pin controller driver"
diff --git a/queue/platform-x86-hp_accel-Add-quirk-for-HP-ProBook-440-G.patch b/queue/platform-x86-hp_accel-Add-quirk-for-HP-ProBook-440-G.patch
index 9a087c2..0c3e657 100644
--- a/queue/platform-x86-hp_accel-Add-quirk-for-HP-ProBook-440-G.patch
+++ b/queue/platform-x86-hp_accel-Add-quirk-for-HP-ProBook-440-G.patch
@@ -1,4 +1,4 @@
-From 163ca80013aafb6dc9cb295de3db7aeab9ab43f8 Mon Sep 17 00:00:00 2001
+From 5ee7ad841661efa9f71e62e6f12247d8c6ea95de Mon Sep 17 00:00:00 2001
 From: Osama Khan <osama.khan@ericsson.com>
 Date: Sat, 21 Oct 2017 10:42:21 +0000
 Subject: [PATCH] platform/x86: hp_accel: Add quirk for HP ProBook 440 G4
@@ -20,6 +20,7 @@ generated as per spec.
 
 Signed-off-by: Osama Khan <osama.khan@ericsson.com>
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/platform/x86/hp_accel.c b/drivers/platform/x86/hp_accel.c
 index 493d8910a74e..7b12abe86b94 100644
diff --git a/queue/platform-x86-intel_punit_ipc-Fix-resource-ioremap-wa.patch b/queue/platform-x86-intel_punit_ipc-Fix-resource-ioremap-wa.patch
index 92b0d91..0f6ea32 100644
--- a/queue/platform-x86-intel_punit_ipc-Fix-resource-ioremap-wa.patch
+++ b/queue/platform-x86-intel_punit_ipc-Fix-resource-ioremap-wa.patch
@@ -1,4 +1,4 @@
-From 6cc8cbbc8868033f279b63e98b26b75eaa0006ab Mon Sep 17 00:00:00 2001
+From 327c0719546933819f359177bf666be342383bc6 Mon Sep 17 00:00:00 2001
 From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
 Date: Sun, 29 Oct 2017 02:49:54 -0700
 Subject: [PATCH] platform/x86: intel_punit_ipc: Fix resource ioremap warning
@@ -21,6 +21,7 @@ before performing ioremap operation.
 
 Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
 Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/platform/x86/intel_punit_ipc.c b/drivers/platform/x86/intel_punit_ipc.c
 index a47a41fc10ad..b5b890127479 100644
diff --git a/queue/powerpc-ipic-Fix-status-get-and-status-clear.patch b/queue/powerpc-ipic-Fix-status-get-and-status-clear.patch
index 5f4f54c..5b5f2f0 100644
--- a/queue/powerpc-ipic-Fix-status-get-and-status-clear.patch
+++ b/queue/powerpc-ipic-Fix-status-get-and-status-clear.patch
@@ -1,4 +1,4 @@
-From 6b148a7ce72a7f87c81cbcde48af014abc0516a9 Mon Sep 17 00:00:00 2001
+From 12a186ad0a64790744257350bea952fe570da44a Mon Sep 17 00:00:00 2001
 From: Christophe Leroy <christophe.leroy@c-s.fr>
 Date: Wed, 18 Oct 2017 11:16:47 +0200
 Subject: [PATCH] powerpc/ipic: Fix status get and status clear
@@ -10,12 +10,13 @@ which is the mask register.
 
 Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
 Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
-index 16f1edd78c40..535cf1f6941c 100644
+index f267ee0afc08..716353b247de 100644
 --- a/arch/powerpc/sysdev/ipic.c
 +++ b/arch/powerpc/sysdev/ipic.c
-@@ -846,12 +846,12 @@ void ipic_disable_mcp(enum ipic_mcp_irq mcp_irq)
+@@ -845,12 +845,12 @@ void ipic_disable_mcp(enum ipic_mcp_irq mcp_irq)
  
  u32 ipic_get_mcp_status(void)
  {
diff --git a/queue/powerpc-opal-Fix-EBUSY-bug-in-acquiring-tokens.patch b/queue/powerpc-opal-Fix-EBUSY-bug-in-acquiring-tokens.patch
index 2ebdfa1..ac6f7c1 100644
--- a/queue/powerpc-opal-Fix-EBUSY-bug-in-acquiring-tokens.patch
+++ b/queue/powerpc-opal-Fix-EBUSY-bug-in-acquiring-tokens.patch
@@ -1,4 +1,4 @@
-From 71e24d7731a2903b1ae2bba2b2971c654d9c2aa6 Mon Sep 17 00:00:00 2001
+From ef97c16768d686d44abd5e4721e3809cd00b11df Mon Sep 17 00:00:00 2001
 From: "William A. Kennington III" <wak@google.com>
 Date: Fri, 22 Sep 2017 16:58:00 -0700
 Subject: [PATCH] powerpc/opal: Fix EBUSY bug in acquiring tokens
@@ -23,9 +23,10 @@ will practically never see EBUSY anymore.
 Fixes: 8d7248232208 ("powerpc/powernv: Infrastructure to support OPAL async completion")
 Signed-off-by: William A. Kennington III <wak@google.com>
 Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/arch/powerpc/platforms/powernv/opal-async.c b/arch/powerpc/platforms/powernv/opal-async.c
-index cf33769a7b72..45b3feb8aa2f 100644
+index 83bebeec0fea..0f7b16e29347 100644
 --- a/arch/powerpc/platforms/powernv/opal-async.c
 +++ b/arch/powerpc/platforms/powernv/opal-async.c
 @@ -39,18 +39,18 @@ int __opal_async_get_token(void)
diff --git a/queue/powerpc-perf-hv-24x7-Fix-incorrect-comparison-in-mem.patch b/queue/powerpc-perf-hv-24x7-Fix-incorrect-comparison-in-mem.patch
index 07e71d2..de04f82 100644
--- a/queue/powerpc-perf-hv-24x7-Fix-incorrect-comparison-in-mem.patch
+++ b/queue/powerpc-perf-hv-24x7-Fix-incorrect-comparison-in-mem.patch
@@ -1,4 +1,4 @@
-From 05c14c03138532a3cb2aa29c2960445c8753343b Mon Sep 17 00:00:00 2001
+From 8ebd27b4047994e102b78e8d7fba1571156ab292 Mon Sep 17 00:00:00 2001
 From: Michael Ellerman <mpe@ellerman.id.au>
 Date: Mon, 9 Oct 2017 21:52:44 +1100
 Subject: [PATCH] powerpc/perf/hv-24x7: Fix incorrect comparison in memord
@@ -17,12 +17,13 @@ Fix it by swapping the second comparision, so it can be true.
 
 Reported-by: David Binderman <dcb314@hotmail.com>
 Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c
-index 9c88b82f6229..72238eedc360 100644
+index 7b2ca16b1eb4..991c6a517ddc 100644
 --- a/arch/powerpc/perf/hv-24x7.c
 +++ b/arch/powerpc/perf/hv-24x7.c
-@@ -540,7 +540,7 @@ static int memord(const void *d1, size_t s1, const void *d2, size_t s2)
+@@ -516,7 +516,7 @@ static int memord(const void *d1, size_t s1, const void *d2, size_t s2)
  {
  	if (s1 < s2)
  		return 1;
diff --git a/queue/powerpc-powernv-cpufreq-Fix-the-frequency-read-by-pr.patch b/queue/powerpc-powernv-cpufreq-Fix-the-frequency-read-by-pr.patch
index d3c95ca..39bf73f 100644
--- a/queue/powerpc-powernv-cpufreq-Fix-the-frequency-read-by-pr.patch
+++ b/queue/powerpc-powernv-cpufreq-Fix-the-frequency-read-by-pr.patch
@@ -1,4 +1,4 @@
-From cd77b5ce208c153260ed7882d8910f2395bfaabd Mon Sep 17 00:00:00 2001
+From b183f7aa71bfa43f02f1e0ae66c439be3395448b Mon Sep 17 00:00:00 2001
 From: Shriya <shriyak@linux.vnet.ibm.com>
 Date: Fri, 13 Oct 2017 10:06:41 +0530
 Subject: [PATCH] powerpc/powernv/cpufreq: Fix the frequency read by
@@ -15,12 +15,13 @@ frequency reported by the hardware.
 Fixes: fb5153d05a7d ("powerpc: powernv: Implement ppc_md.get_proc_freq()")
 Signed-off-by: Shriya <shriyak@linux.vnet.ibm.com>
 Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
-index d23f148a11f0..62f4a5ad8594 100644
+index 3558a2bb613b..ed481107683b 100644
 --- a/arch/powerpc/platforms/powernv/setup.c
 +++ b/arch/powerpc/platforms/powernv/setup.c
-@@ -335,7 +335,7 @@ static unsigned long pnv_get_proc_freq(unsigned int cpu)
+@@ -310,7 +310,7 @@ static unsigned long pnv_get_proc_freq(unsigned int cpu)
  {
  	unsigned long ret_freq;
  
diff --git a/queue/powerpc-pseries-vio-Dispose-of-virq-mapping-on-vdevi.patch b/queue/powerpc-pseries-vio-Dispose-of-virq-mapping-on-vdevi.patch
index c48184f..a19e9bc 100644
--- a/queue/powerpc-pseries-vio-Dispose-of-virq-mapping-on-vdevi.patch
+++ b/queue/powerpc-pseries-vio-Dispose-of-virq-mapping-on-vdevi.patch
@@ -1,4 +1,4 @@
-From b8f89fea599d91e674497aad572613eb63181f31 Mon Sep 17 00:00:00 2001
+From 6d1aa1e42996c624d21887f038db5df9b5cb936c Mon Sep 17 00:00:00 2001
 From: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
 Date: Thu, 28 Sep 2017 20:19:20 -0400
 Subject: [PATCH] powerpc/pseries/vio: Dispose of virq mapping on vdevice
@@ -28,12 +28,13 @@ virq of the viodev on unregister.
 Fixes: f2ab6219969f ("powerpc/pseries: Add PFO support to the VIO bus")
 Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
 Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/arch/powerpc/platforms/pseries/vio.c b/arch/powerpc/platforms/pseries/vio.c
-index 12277bc9fd9e..d86938260a86 100644
+index 28b09fd797ec..4be827466b0b 100644
 --- a/arch/powerpc/platforms/pseries/vio.c
 +++ b/arch/powerpc/platforms/pseries/vio.c
-@@ -1592,6 +1592,8 @@ ATTRIBUTE_GROUPS(vio_dev);
+@@ -1577,6 +1577,8 @@ static struct device_attribute vio_dev_attrs[] = {
  void vio_unregister_device(struct vio_dev *viodev)
  {
  	device_unregister(&viodev->dev);
diff --git a/queue/powerpc-xmon-Check-before-calling-xive-functions.patch b/queue/powerpc-xmon-Check-before-calling-xive-functions.patch
index 9703317..d6cc51c 100644
--- a/queue/powerpc-xmon-Check-before-calling-xive-functions.patch
+++ b/queue/powerpc-xmon-Check-before-calling-xive-functions.patch
@@ -1,4 +1,4 @@
-From 402e172a2ce76210f2fe921cf419d12103851344 Mon Sep 17 00:00:00 2001
+From 44fd9770569084c725b036fcf220cacd76fe87a3 Mon Sep 17 00:00:00 2001
 From: Breno Leitao <leitao@debian.org>
 Date: Tue, 17 Oct 2017 16:20:18 -0200
 Subject: [PATCH] powerpc/xmon: Check before calling xive functions
@@ -21,12 +21,13 @@ Fixes: 243e25112d06 ("powerpc/xive: Native exploitation of the XIVE interrupt co
 Suggested-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
 Signed-off-by: Breno Leitao <leitao@debian.org>
 Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
-index 4679aeb84767..2e2320edb96b 100644
+index f11f65634aab..8af45876b95c 100644
 --- a/arch/powerpc/xmon/xmon.c
 +++ b/arch/powerpc/xmon/xmon.c
-@@ -2508,6 +2508,11 @@ static void dump_xives(void)
+@@ -2428,6 +2428,11 @@ static void dump_xives(void)
  	unsigned long num;
  	int c;
  
diff --git a/queue/ppp-Destroy-the-mutex-when-cleanup.patch b/queue/ppp-Destroy-the-mutex-when-cleanup.patch
index b544d2e..ca69e7a 100644
--- a/queue/ppp-Destroy-the-mutex-when-cleanup.patch
+++ b/queue/ppp-Destroy-the-mutex-when-cleanup.patch
@@ -1,4 +1,4 @@
-From f02b2320b27c16b644691267ee3b5c110846f49e Mon Sep 17 00:00:00 2001
+From 7874e3c1695a9a9dbc31f8b2e3917bbdb0fbe3a3 Mon Sep 17 00:00:00 2001
 From: Gao Feng <gfree.wind@vip.163.com>
 Date: Tue, 31 Oct 2017 18:25:37 +0800
 Subject: [PATCH] ppp: Destroy the mutex when cleanup
@@ -12,12 +12,13 @@ func invokes mutex_init.
 Signed-off-by: Gao Feng <gfree.wind@vip.163.com>
 Acked-by: Guillaume Nault <g.nault@alphalink.fr>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
-index af7f93ed1487..44891335f9af 100644
+index 8b188f86eeee..114ed7c2e19c 100644
 --- a/drivers/net/ppp/ppp_generic.c
 +++ b/drivers/net/ppp/ppp_generic.c
-@@ -960,6 +960,7 @@ static __net_exit void ppp_exit_net(struct net *net)
+@@ -959,6 +959,7 @@ static __net_exit void ppp_exit_net(struct net *net)
  	unregister_netdevice_many(&list);
  	rtnl_unlock();
  
diff --git a/queue/raid5-Set-R5_Expanded-on-parity-devices-as-well-as-d.patch b/queue/raid5-Set-R5_Expanded-on-parity-devices-as-well-as-d.patch
index 9451217..b8de579 100644
--- a/queue/raid5-Set-R5_Expanded-on-parity-devices-as-well-as-d.patch
+++ b/queue/raid5-Set-R5_Expanded-on-parity-devices-as-well-as-d.patch
@@ -1,4 +1,4 @@
-From 235b6003fb28f0dd8e7ed8fbdb088bb548291766 Mon Sep 17 00:00:00 2001
+From 1b63cfe882134f364fe1860951c194f39008ccda Mon Sep 17 00:00:00 2001
 From: NeilBrown <neilb@suse.com>
 Date: Tue, 17 Oct 2017 16:18:36 +1100
 Subject: [PATCH] raid5: Set R5_Expanded on parity devices as well as data.
@@ -26,12 +26,13 @@ set R5_Expanded.
 Reported-by: Curt <lightspd@gmail.com>
 Signed-off-by: NeilBrown <neilb@suse.com>
 Signed-off-by: Shaohua Li <shli@fb.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
-index 10c0d87074f0..a21dbd22a2fb 100644
+index 58b5f44bc502..bfe555890889 100644
 --- a/drivers/md/raid5.c
 +++ b/drivers/md/raid5.c
-@@ -1818,8 +1818,11 @@ static void ops_complete_reconstruct(void *stripe_head_ref)
+@@ -1819,8 +1819,11 @@ static void ops_complete_reconstruct(void *stripe_head_ref)
  		struct r5dev *dev = &sh->dev[i];
  
  		if (dev->written || i == pd_idx || i == qd_idx) {
diff --git a/queue/raid5-ppl-check-recovery_offset-when-performing-ppl-.patch b/queue/raid5-ppl-check-recovery_offset-when-performing-ppl-.patch
index ef16f2d..4ce6c63 100644
--- a/queue/raid5-ppl-check-recovery_offset-when-performing-ppl-.patch
+++ b/queue/raid5-ppl-check-recovery_offset-when-performing-ppl-.patch
@@ -1,4 +1,4 @@
-From 07719ff767dcd8cc42050f185d332052f3816546 Mon Sep 17 00:00:00 2001
+From b1b4ccc8139025c9700101e5e9959beec998bd5d Mon Sep 17 00:00:00 2001
 From: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
 Date: Fri, 29 Sep 2017 22:54:19 +0200
 Subject: [PATCH] raid5-ppl: check recovery_offset when performing ppl recovery
@@ -11,12 +11,13 @@ in-sync.
 
 Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
 Signed-off-by: Shaohua Li <shli@fb.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/md/raid5-ppl.c b/drivers/md/raid5-ppl.c
-index 76d6245427b8..628c0bf7b9fd 100644
+index ccce92e68d7f..45e31110e797 100644
 --- a/drivers/md/raid5-ppl.c
 +++ b/drivers/md/raid5-ppl.c
-@@ -758,7 +758,8 @@ static int ppl_recover_entry(struct ppl_log *log, struct ppl_header_entry *e,
+@@ -740,7 +740,8 @@ static int ppl_recover_entry(struct ppl_log *log, struct ppl_header_entry *e,
  				 (unsigned long long)sector);
  
  			rdev = conf->disks[dd_idx].rdev;
diff --git a/queue/rtc-pcf8563-fix-output-clock-rate.patch b/queue/rtc-pcf8563-fix-output-clock-rate.patch
index d397509..83daa4c 100644
--- a/queue/rtc-pcf8563-fix-output-clock-rate.patch
+++ b/queue/rtc-pcf8563-fix-output-clock-rate.patch
@@ -1,4 +1,4 @@
-From a3350f9c57ffad569c40f7320b89da1f3061c5bb Mon Sep 17 00:00:00 2001
+From b1d0cb254e5a1da7e17d5fba5c992941296a726b Mon Sep 17 00:00:00 2001
 From: Philipp Zabel <p.zabel@pengutronix.de>
 Date: Tue, 7 Nov 2017 13:12:17 +0100
 Subject: [PATCH] rtc: pcf8563: fix output clock rate
@@ -12,9 +12,10 @@ frequency index read from the CLKO register and always returns
 Fixes: a39a6405d5f9 ("rtc: pcf8563: add CLKOUT to common clock framework")
 Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
 Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
-index cea6ea4df970..8c836c51a508 100644
+index 1227ceab61ee..a4b8b603c807 100644
 --- a/drivers/rtc/rtc-pcf8563.c
 +++ b/drivers/rtc/rtc-pcf8563.c
 @@ -422,7 +422,7 @@ static unsigned long pcf8563_clkout_recalc_rate(struct clk_hw *hw,
diff --git a/queue/rtl8188eu-Fix-a-possible-sleep-in-atomic-bug-in-rtw_.patch b/queue/rtl8188eu-Fix-a-possible-sleep-in-atomic-bug-in-rtw_.patch
index 313066e..8d5d08e 100644
--- a/queue/rtl8188eu-Fix-a-possible-sleep-in-atomic-bug-in-rtw_.patch
+++ b/queue/rtl8188eu-Fix-a-possible-sleep-in-atomic-bug-in-rtw_.patch
@@ -1,4 +1,4 @@
-From 08880f8e08cbd814e870e9d3ab9530abc1bce226 Mon Sep 17 00:00:00 2001
+From 4a1f53e78f126c795c3e1c060cf60372f681702b Mon Sep 17 00:00:00 2001
 From: Jia-Ju Bai <baijiaju1990@163.com>
 Date: Sun, 8 Oct 2017 19:54:07 +0800
 Subject: [PATCH] rtl8188eu: Fix a possible sleep-in-atomic bug in
@@ -16,12 +16,13 @@ This bug is found by my static analysis tool and my code review.
 
 Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c
-index 9461bce883ea..65083a72b408 100644
+index 9754322b506e..6ab2ac9f53b4 100644
 --- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
 +++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
-@@ -508,7 +508,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
+@@ -522,7 +522,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
  
  	if (enqueue) {
  		/* need enqueue, prepare cmd_obj and enqueue */
diff --git a/queue/samples-bpf-adjust-rlimit-RLIMIT_MEMLOCK-for-xdp1.patch b/queue/samples-bpf-adjust-rlimit-RLIMIT_MEMLOCK-for-xdp1.patch
index 21fad05..6e86a6e 100644
--- a/queue/samples-bpf-adjust-rlimit-RLIMIT_MEMLOCK-for-xdp1.patch
+++ b/queue/samples-bpf-adjust-rlimit-RLIMIT_MEMLOCK-for-xdp1.patch
@@ -1,4 +1,4 @@
-From 6dfca831c03ef654b1f7bff1b8d487d330e9f76b Mon Sep 17 00:00:00 2001
+From 15150720f4bd0393408e62669e3be3efb578b61c Mon Sep 17 00:00:00 2001
 From: Tushar Dave <tushar.n.dave@oracle.com>
 Date: Fri, 27 Oct 2017 16:12:30 -0700
 Subject: [PATCH] samples/bpf: adjust rlimit RLIMIT_MEMLOCK for xdp1
@@ -15,6 +15,7 @@ Fix it.
 Signed-off-by: Tushar Dave <tushar.n.dave@oracle.com>
 Acked-by: Alexei Starovoitov <ast@kernel.org>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/samples/bpf/xdp1_user.c b/samples/bpf/xdp1_user.c
 index 2431c0321b71..fdaefe91801d 100644
diff --git a/queue/scsi-aacraid-use-timespec64-instead-of-timeval.patch b/queue/scsi-aacraid-use-timespec64-instead-of-timeval.patch
index 1242e69..6e45663 100644
--- a/queue/scsi-aacraid-use-timespec64-instead-of-timeval.patch
+++ b/queue/scsi-aacraid-use-timespec64-instead-of-timeval.patch
@@ -1,4 +1,4 @@
-From 820f188659122602ab217dd80cfa32b3ac0c55c0 Mon Sep 17 00:00:00 2001
+From bbcd06d55403cc5812f6bd9d5ef72286e9819f1c Mon Sep 17 00:00:00 2001
 From: Arnd Bergmann <arnd@arndb.de>
 Date: Tue, 7 Nov 2017 11:46:05 +0100
 Subject: [PATCH] scsi: aacraid: use timespec64 instead of timeval
@@ -20,12 +20,13 @@ worry about aacraid by that time.
 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 Reviewed-by: Dave Carroll <david.carroll@microsemi.com>
 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
-index dfe8e70f8d99..525a652dab48 100644
+index 7a1b8a2ce658..7c607119bfed 100644
 --- a/drivers/scsi/aacraid/commsup.c
 +++ b/drivers/scsi/aacraid/commsup.c
-@@ -2383,19 +2383,19 @@ static int aac_send_wellness_command(struct aac_dev *dev, char *wellness_str,
+@@ -2379,19 +2379,19 @@ static int aac_send_wellness_command(struct aac_dev *dev, char *wellness_str,
  	goto out;
  }
  
@@ -49,7 +50,7 @@ index dfe8e70f8d99..525a652dab48 100644
  	cur_tm.tm_mon += 1;
  	cur_tm.tm_year += 1900;
  	wellness_str[8] = bin2bcd(cur_tm.tm_hour);
-@@ -2412,7 +2412,7 @@ int aac_send_safw_hostttime(struct aac_dev *dev, struct timeval *now)
+@@ -2408,7 +2408,7 @@ int aac_send_safw_hostttime(struct aac_dev *dev, struct timeval *now)
  	return ret;
  }
  
@@ -58,7 +59,7 @@ index dfe8e70f8d99..525a652dab48 100644
  {
  	int ret = -ENOMEM;
  	struct fib *fibptr;
-@@ -2424,7 +2424,7 @@ int aac_send_hosttime(struct aac_dev *dev, struct timeval *now)
+@@ -2420,7 +2420,7 @@ int aac_send_hosttime(struct aac_dev *dev, struct timeval *now)
  
  	aac_fib_init(fibptr);
  	info = (__le32 *)fib_data(fibptr);
@@ -67,7 +68,7 @@ index dfe8e70f8d99..525a652dab48 100644
  	ret = aac_fib_send(SendHostTime, fibptr, sizeof(*info), FsaNormal,
  					1, 1, NULL, NULL);
  
-@@ -2496,7 +2496,7 @@ int aac_command_thread(void *data)
+@@ -2492,7 +2492,7 @@ int aac_command_thread(void *data)
  		}
  		if (!time_before(next_check_jiffies,next_jiffies)
  		 && ((difference = next_jiffies - jiffies) <= 0)) {
@@ -76,7 +77,7 @@ index dfe8e70f8d99..525a652dab48 100644
  			int ret;
  
  			/* Don't even try to talk to adapter if its sick */
-@@ -2506,15 +2506,15 @@ int aac_command_thread(void *data)
+@@ -2502,15 +2502,15 @@ int aac_command_thread(void *data)
  			next_check_jiffies = jiffies
  					   + ((long)(unsigned)check_interval)
  					   * HZ;
diff --git a/queue/scsi-bfa-integer-overflow-in-debugfs.patch b/queue/scsi-bfa-integer-overflow-in-debugfs.patch
index 598dc81..c26f422 100644
--- a/queue/scsi-bfa-integer-overflow-in-debugfs.patch
+++ b/queue/scsi-bfa-integer-overflow-in-debugfs.patch
@@ -1,4 +1,4 @@
-From 3e351275655d3c84dc28abf170def9786db5176d Mon Sep 17 00:00:00 2001
+From 41b88d3bb1e0703df4f0d21f966b9db8b6ca7da2 Mon Sep 17 00:00:00 2001
 From: Dan Carpenter <dan.carpenter@oracle.com>
 Date: Wed, 4 Oct 2017 10:50:37 +0300
 Subject: [PATCH] scsi: bfa: integer overflow in debugfs
@@ -16,6 +16,7 @@ commit 13e2d5187f6b ("bna: integer overflow bug in debugfs").
 Fixes: ab2a9ba189e8 ("[SCSI] bfa: add debugfs support")
 Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/scsi/bfa/bfad_debugfs.c b/drivers/scsi/bfa/bfad_debugfs.c
 index 8dcd8c70c7ee..05f523971348 100644
diff --git a/queue/scsi-core-Fix-a-scsi_show_rq-NULL-pointer-dereferenc.patch b/queue/scsi-core-Fix-a-scsi_show_rq-NULL-pointer-dereferenc.patch
index 5be1c2f..a09a5da 100644
--- a/queue/scsi-core-Fix-a-scsi_show_rq-NULL-pointer-dereferenc.patch
+++ b/queue/scsi-core-Fix-a-scsi_show_rq-NULL-pointer-dereferenc.patch
@@ -1,4 +1,4 @@
-From fec5d06dc304c006e48eaf8fa404cbf7cbce9a18 Mon Sep 17 00:00:00 2001
+From 734f8ef3fb1bef3fb9cad6b8055e8b640643a463 Mon Sep 17 00:00:00 2001
 From: Bart Van Assche <bart.vanassche@wdc.com>
 Date: Tue, 5 Dec 2017 16:57:51 -0800
 Subject: [PATCH] scsi: core: Fix a scsi_show_rq() NULL pointer dereference
diff --git a/queue/scsi-hpsa-cleanup-sas_phy-structures-in-sysfs-when-u.patch b/queue/scsi-hpsa-cleanup-sas_phy-structures-in-sysfs-when-u.patch
index 172d744..47bcfb5 100644
--- a/queue/scsi-hpsa-cleanup-sas_phy-structures-in-sysfs-when-u.patch
+++ b/queue/scsi-hpsa-cleanup-sas_phy-structures-in-sysfs-when-u.patch
@@ -1,4 +1,4 @@
-From 55ca38b4255bb336c2d35990bdb2b368e19b435a Mon Sep 17 00:00:00 2001
+From be52496022e32ed28464b42e546c651f0fc78e4f Mon Sep 17 00:00:00 2001
 From: Martin Wilck <mwilck@suse.de>
 Date: Fri, 20 Oct 2017 16:51:14 -0500
 Subject: [PATCH] scsi: hpsa: cleanup sas_phy structures in sysfs when
@@ -31,12 +31,13 @@ Reviewed-by: Don Brace <don.brace@microsemi.com>
 Signed-off-by: Martin Wilck <mwilck@suse.de>
 Signed-off-by: Don Brace <don.brace@microsemi.com>
 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index aff4a4fee260..76461c4cca0c 100644
+index 73daace478cb..18a564f5588c 100644
 --- a/drivers/scsi/hpsa.c
 +++ b/drivers/scsi/hpsa.c
-@@ -9207,9 +9207,9 @@ static void hpsa_free_sas_phy(struct hpsa_sas_phy *hpsa_sas_phy)
+@@ -9620,9 +9620,9 @@ static void hpsa_free_sas_phy(struct hpsa_sas_phy *hpsa_sas_phy)
  	struct sas_phy *phy = hpsa_sas_phy->phy;
  
  	sas_port_delete_phy(hpsa_sas_phy->parent_port->port, phy);
diff --git a/queue/scsi-hpsa-destroy-sas-transport-properties-before-sc.patch b/queue/scsi-hpsa-destroy-sas-transport-properties-before-sc.patch
index f5bde11..031644e 100644
--- a/queue/scsi-hpsa-destroy-sas-transport-properties-before-sc.patch
+++ b/queue/scsi-hpsa-destroy-sas-transport-properties-before-sc.patch
@@ -1,4 +1,4 @@
-From dfb2e6f46b3074eb85203d8f0888b71ec1c2e37a Mon Sep 17 00:00:00 2001
+From b44351c8df91fc9c0977121d22c6c2e30a9a8522 Mon Sep 17 00:00:00 2001
 From: Martin Wilck <mwilck@suse.de>
 Date: Fri, 20 Oct 2017 16:51:08 -0500
 Subject: [PATCH] scsi: hpsa: destroy sas transport properties before scsi_host
@@ -53,12 +53,13 @@ Reviewed-by: Don Brace <don.brace@microsemi.com>
 Signed-off-by: Martin Wilck <mwilck@suse.de>
 Signed-off-by: Don Brace <don.brace@microsemi.com>
 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 9abe81021484..aff4a4fee260 100644
+index 18a564f5588c..0d020bf85bb8 100644
 --- a/drivers/scsi/hpsa.c
 +++ b/drivers/scsi/hpsa.c
-@@ -8684,6 +8684,8 @@ static void hpsa_remove_one(struct pci_dev *pdev)
+@@ -9097,6 +9097,8 @@ static void hpsa_remove_one(struct pci_dev *pdev)
  	destroy_workqueue(h->rescan_ctlr_wq);
  	destroy_workqueue(h->resubmit_wq);
  
@@ -67,7 +68,7 @@ index 9abe81021484..aff4a4fee260 100644
  	/*
  	 * Call before disabling interrupts.
  	 * scsi_remove_host can trigger I/O operations especially
-@@ -8718,8 +8720,6 @@ static void hpsa_remove_one(struct pci_dev *pdev)
+@@ -9131,8 +9133,6 @@ static void hpsa_remove_one(struct pci_dev *pdev)
  	h->lockup_detected = NULL;			/* init_one 2 */
  	/* (void) pci_disable_pcie_error_reporting(pdev); */	/* init_one 1 */
  
diff --git a/queue/scsi-scsi_debug-write_same-fix-error-report.patch b/queue/scsi-scsi_debug-write_same-fix-error-report.patch
index 0a702b8..18ad2ce 100644
--- a/queue/scsi-scsi_debug-write_same-fix-error-report.patch
+++ b/queue/scsi-scsi_debug-write_same-fix-error-report.patch
@@ -1,4 +1,4 @@
-From e33d7c56450b0a5c7290cbf9e1581fab5174f552 Mon Sep 17 00:00:00 2001
+From a65d65b4cec0d83716d7ec47b07e319af88443bf Mon Sep 17 00:00:00 2001
 From: Douglas Gilbert <dgilbert@interlog.com>
 Date: Sun, 29 Oct 2017 10:47:19 -0400
 Subject: [PATCH] scsi: scsi_debug: write_same: fix error report
@@ -13,12 +13,13 @@ greater than 0. Both are valid, fix.
 
 Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>
 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
-index 3c15f6b63b07..e4f037f0f38b 100644
+index dc095a292c61..33aba330b37d 100644
 --- a/drivers/scsi/scsi_debug.c
 +++ b/drivers/scsi/scsi_debug.c
-@@ -3001,11 +3001,11 @@ static int resp_write_same(struct scsi_cmnd *scp, u64 lba, u32 num,
+@@ -3002,11 +3002,11 @@ static int resp_write_same(struct scsi_cmnd *scp, u64 lba, u32 num,
  	if (-1 == ret) {
  		write_unlock_irqrestore(&atomic_rw, iflags);
  		return DID_ERROR << 16;
diff --git a/queue/scsi-scsi_devinfo-Add-REPORTLUN2-to-EMC-SYMMETRIX-bl.patch b/queue/scsi-scsi_devinfo-Add-REPORTLUN2-to-EMC-SYMMETRIX-bl.patch
index 320bbe8..714c956 100644
--- a/queue/scsi-scsi_devinfo-Add-REPORTLUN2-to-EMC-SYMMETRIX-bl.patch
+++ b/queue/scsi-scsi_devinfo-Add-REPORTLUN2-to-EMC-SYMMETRIX-bl.patch
@@ -1,4 +1,4 @@
-From 909cf3e16a5274fe2127cf3cea5c8dba77b2c412 Mon Sep 17 00:00:00 2001
+From b8af65bb79d42df279be2a1bbfa1d8f5f5d3d18c Mon Sep 17 00:00:00 2001
 From: Kurt Garloff <garloff@suse.de>
 Date: Tue, 17 Oct 2017 09:10:45 +0200
 Subject: [PATCH] scsi: scsi_devinfo: Add REPORTLUN2 to EMC SYMMETRIX blacklist
@@ -12,12 +12,13 @@ SCSI-2 for whatever reason.
 Signed-off-by: Kurt Garloff <garloff@suse.de>
 Signed-off-by: Hannes Reinecke <hare@suse.de>
 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
-index a998585ab178..555269bec02f 100644
+index 28fea83ae2fe..00bee254bedf 100644
 --- a/drivers/scsi/scsi_devinfo.c
 +++ b/drivers/scsi/scsi_devinfo.c
-@@ -161,7 +161,7 @@ static struct {
+@@ -160,7 +160,7 @@ static struct {
  	{"DGC", "RAID", NULL, BLIST_SPARSELUN},	/* Dell PV 650F, storage on LUN 0 */
  	{"DGC", "DISK", NULL, BLIST_SPARSELUN},	/* Dell PV 650F, no storage on LUN 0 */
  	{"EMC",  "Invista", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
diff --git a/queue/scsi-sd-change-allow_restart-to-bool-in-sysfs-interf.patch b/queue/scsi-sd-change-allow_restart-to-bool-in-sysfs-interf.patch
index 63c9156..5fc181f 100644
--- a/queue/scsi-sd-change-allow_restart-to-bool-in-sysfs-interf.patch
+++ b/queue/scsi-sd-change-allow_restart-to-bool-in-sysfs-interf.patch
@@ -1,4 +1,4 @@
-From 658e9a6dc1126f21fa417cd213e1cdbff8be0ba2 Mon Sep 17 00:00:00 2001
+From ba7d6e386de09834752a5be739b7384423ca4629 Mon Sep 17 00:00:00 2001
 From: weiping zhang <zhangweiping@didichuxing.com>
 Date: Thu, 12 Oct 2017 14:56:44 +0800
 Subject: [PATCH] scsi: sd: change allow_restart to bool in sysfs interface
@@ -12,12 +12,13 @@ echo asdf > /sys/class/scsi_disk/0:2:0:0/allow_restart
 
 Signed-off-by: weiping zhang <zhangweiping@didichuxing.com>
 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index 3ef221493d6c..ce9cc7afd095 100644
+index 7600e11178f2..312b5c59ef04 100644
 --- a/drivers/scsi/sd.c
 +++ b/drivers/scsi/sd.c
-@@ -253,6 +253,7 @@ static ssize_t
+@@ -262,6 +262,7 @@ static ssize_t
  allow_restart_store(struct device *dev, struct device_attribute *attr,
  		    const char *buf, size_t count)
  {
@@ -25,7 +26,7 @@ index 3ef221493d6c..ce9cc7afd095 100644
  	struct scsi_disk *sdkp = to_scsi_disk(dev);
  	struct scsi_device *sdp = sdkp->device;
  
-@@ -262,7 +263,10 @@ allow_restart_store(struct device *dev, struct device_attribute *attr,
+@@ -271,7 +272,10 @@ allow_restart_store(struct device *dev, struct device_attribute *attr,
  	if (sdp->type != TYPE_DISK && sdp->type != TYPE_ZBC)
  		return -EINVAL;
  
diff --git a/queue/scsi-sd-change-manage_start_stop-to-bool-in-sysfs-in.patch b/queue/scsi-sd-change-manage_start_stop-to-bool-in-sysfs-in.patch
index f8afc9f..b5d06bc 100644
--- a/queue/scsi-sd-change-manage_start_stop-to-bool-in-sysfs-in.patch
+++ b/queue/scsi-sd-change-manage_start_stop-to-bool-in-sysfs-in.patch
@@ -1,4 +1,4 @@
-From 623401ee33e42cee64d333877892be8db02951eb Mon Sep 17 00:00:00 2001
+From 63a6de3f1b057331fdf8eab08940f1ab0d147ea5 Mon Sep 17 00:00:00 2001
 From: weiping zhang <zhangweiping@didichuxing.com>
 Date: Thu, 12 Oct 2017 14:57:06 +0800
 Subject: [PATCH] scsi: sd: change manage_start_stop to bool in sysfs interface
@@ -10,12 +10,13 @@ unexpectly by writing an invalid string.
 
 Signed-off-by: weiping zhang <zhangweiping@didichuxing.com>
 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index ce9cc7afd095..37daf9a42afe 100644
+index 9fce660c6797..7600e11178f2 100644
 --- a/drivers/scsi/sd.c
 +++ b/drivers/scsi/sd.c
-@@ -231,11 +231,15 @@ manage_start_stop_store(struct device *dev, struct device_attribute *attr,
+@@ -236,11 +236,15 @@ manage_start_stop_store(struct device *dev, struct device_attribute *attr,
  {
  	struct scsi_disk *sdkp = to_scsi_disk(dev);
  	struct scsi_device *sdp = sdkp->device;
diff --git a/queue/serdev-ttyport-enforce-tty-driver-open-requirement.patch b/queue/serdev-ttyport-enforce-tty-driver-open-requirement.patch
index cde70ca..e4d3dc1 100644
--- a/queue/serdev-ttyport-enforce-tty-driver-open-requirement.patch
+++ b/queue/serdev-ttyport-enforce-tty-driver-open-requirement.patch
@@ -1,4 +1,4 @@
-From dee7d0f3b200c67c6ee96bd37c6e8fa52690ab56 Mon Sep 17 00:00:00 2001
+From f08b57bfd8e24dba99f50b0ebdba0a05d6d07948 Mon Sep 17 00:00:00 2001
 From: Johan Hovold <johan@kernel.org>
 Date: Mon, 16 Oct 2017 15:06:19 +0200
 Subject: [PATCH] serdev: ttyport: enforce tty-driver open() requirement
@@ -12,12 +12,13 @@ instead fall back to calling tty_port_open() directly.
 Signed-off-by: Johan Hovold <johan@kernel.org>
 Acked-by: Rob Herring <robh@kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/tty/serdev/serdev-ttyport.c b/drivers/tty/serdev/serdev-ttyport.c
-index 302018d67efa..404f3fd070a7 100644
+index 47e300add3c6..37979c8bc8f1 100644
 --- a/drivers/tty/serdev/serdev-ttyport.c
 +++ b/drivers/tty/serdev/serdev-ttyport.c
-@@ -102,10 +102,10 @@ static int ttyport_open(struct serdev_controller *ctrl)
+@@ -120,10 +120,10 @@ static int ttyport_open(struct serdev_controller *ctrl)
  		return PTR_ERR(tty);
  	serport->tty = tty;
  
@@ -32,7 +33,7 @@ index 302018d67efa..404f3fd070a7 100644
  
  	/* Bring the UART into a known 8 bits no parity hw fc state */
  	ktermios = tty->termios;
-@@ -122,6 +122,12 @@ static int ttyport_open(struct serdev_controller *ctrl)
+@@ -140,6 +140,12 @@ static int ttyport_open(struct serdev_controller *ctrl)
  
  	tty_unlock(serport->tty);
  	return 0;
diff --git a/queue/sfc-don-t-warn-on-successful-change-of-MAC.patch b/queue/sfc-don-t-warn-on-successful-change-of-MAC.patch
index ad7b950..ac84018 100644
--- a/queue/sfc-don-t-warn-on-successful-change-of-MAC.patch
+++ b/queue/sfc-don-t-warn-on-successful-change-of-MAC.patch
@@ -1,4 +1,4 @@
-From cbad52e92ad7f01f0be4ca58bde59462dc1afe3a Mon Sep 17 00:00:00 2001
+From 21001c3b1ba892bd3d98bc255ff55c85f050da21 Mon Sep 17 00:00:00 2001
 From: Robert Stonehouse <rstonehouse@solarflare.com>
 Date: Tue, 7 Nov 2017 17:30:30 +0000
 Subject: [PATCH] sfc: don't warn on successful change of MAC
@@ -8,12 +8,13 @@ commit cbad52e92ad7f01f0be4ca58bde59462dc1afe3a upstream.
 Fixes: 535a61777f44e ("sfc: suppress handled MCDI failures when changing the MAC address")
 Signed-off-by: Bert Kenward <bkenward@solarflare.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
-index 19a91881fbf9..46d60013564c 100644
+index f2da073f4b2b..572551df4610 100644
 --- a/drivers/net/ethernet/sfc/ef10.c
 +++ b/drivers/net/ethernet/sfc/ef10.c
-@@ -5734,7 +5734,7 @@ static int efx_ef10_set_mac_address(struct efx_nic *efx)
+@@ -5726,7 +5726,7 @@ static int efx_ef10_set_mac_address(struct efx_nic *efx)
  		 * MCFW do not support VFs.
  		 */
  		rc = efx_ef10_vport_set_mac_address(efx);
diff --git a/queue/soc-mediatek-pwrap-fix-compiler-errors.patch b/queue/soc-mediatek-pwrap-fix-compiler-errors.patch
index b0dd623..542da3c 100644
--- a/queue/soc-mediatek-pwrap-fix-compiler-errors.patch
+++ b/queue/soc-mediatek-pwrap-fix-compiler-errors.patch
@@ -1,4 +1,4 @@
-From fb2c1934f30577756e55e24e8870b45c78da3bc2 Mon Sep 17 00:00:00 2001
+From 5f60b93c8301014af42d152e6c0b0df3926bd41e Mon Sep 17 00:00:00 2001
 From: Matthias Brugger <matthias.bgg@gmail.com>
 Date: Sat, 21 Oct 2017 10:17:47 +0200
 Subject: [PATCH] soc: mediatek: pwrap: fix compiler errors
@@ -11,12 +11,13 @@ drivers/soc/mediatek/mtk-pmic-wrap.c:686:25: error: dubious one-bit signed bitfi
 Changing the data type to unsigned fixes this.
 
 Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
-index 5d61d127e1d7..912edf93c192 100644
+index a5f10936fb9c..e929f5142862 100644
 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c
 +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
-@@ -683,7 +683,7 @@ struct pmic_wrapper_type {
+@@ -522,7 +522,7 @@ struct pmic_wrapper_type {
  	u32 int_en_all;
  	u32 spi_w;
  	u32 wdt_src;
diff --git a/queue/target-file-Do-not-return-error-for-UNMAP-if-length-.patch b/queue/target-file-Do-not-return-error-for-UNMAP-if-length-.patch
index 838514b..19c95e4 100644
--- a/queue/target-file-Do-not-return-error-for-UNMAP-if-length-.patch
+++ b/queue/target-file-Do-not-return-error-for-UNMAP-if-length-.patch
@@ -1,4 +1,4 @@
-From 594e25e73440863981032d76c9b1e33409ceff6e Mon Sep 17 00:00:00 2001
+From a754fbe7b6062eaa07f5e546d6edb040d1331fe1 Mon Sep 17 00:00:00 2001
 From: Jiang Yi <jiangyilism@gmail.com>
 Date: Fri, 11 Aug 2017 11:29:44 +0800
 Subject: [PATCH] target/file: Do not return error for UNMAP if length is zero
@@ -15,12 +15,13 @@ Commands spec UNMAP should return success for zero length.
 
 Signed-off-by: Jiang Yi <jiangyilism@gmail.com>
 Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
-index c629817a8854..9b2c0c773022 100644
+index 73b8f93a5fef..70d3cf0d7ffc 100644
 --- a/drivers/target/target_core_file.c
 +++ b/drivers/target/target_core_file.c
-@@ -482,6 +482,10 @@ fd_execute_unmap(struct se_cmd *cmd, sector_t lba, sector_t nolb)
+@@ -478,6 +478,10 @@ fd_execute_unmap(struct se_cmd *cmd, sector_t lba, sector_t nolb)
  	struct inode *inode = file->f_mapping->host;
  	int ret;
  
diff --git a/queue/target-fix-condition-return-in-core_pr_dump_initiato.patch b/queue/target-fix-condition-return-in-core_pr_dump_initiato.patch
index 19e3493..165a407 100644
--- a/queue/target-fix-condition-return-in-core_pr_dump_initiato.patch
+++ b/queue/target-fix-condition-return-in-core_pr_dump_initiato.patch
@@ -1,4 +1,4 @@
-From 24528f089d0a444070aa4f715ace537e8d6bf168 Mon Sep 17 00:00:00 2001
+From ddbb0d9ceb87aa138fc2c855fbadd32837feb6cf Mon Sep 17 00:00:00 2001
 From: tangwenji <tang.wenji@zte.com.cn>
 Date: Thu, 24 Aug 2017 19:59:37 +0800
 Subject: [PATCH] target:fix condition return in core_pr_dump_initiator_port()
@@ -17,9 +17,10 @@ This fixes a regression originally introduced by:
 
 Signed-off-by: tangwenji <tang.wenji@zte.com.cn>
 Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
-index 871ae21870be..a54490709811 100644
+index 129ca572673c..0f7e659db02d 100644
 --- a/drivers/target/target_core_pr.c
 +++ b/drivers/target/target_core_pr.c
 @@ -58,8 +58,10 @@ void core_pr_dump_initiator_port(
diff --git a/queue/target-iscsi-Detect-conn_cmd_list-corruption-early.patch b/queue/target-iscsi-Detect-conn_cmd_list-corruption-early.patch
index 65f38e6..ffb8012 100644
--- a/queue/target-iscsi-Detect-conn_cmd_list-corruption-early.patch
+++ b/queue/target-iscsi-Detect-conn_cmd_list-corruption-early.patch
@@ -1,4 +1,4 @@
-From f50ef62f1804d9e9e2a6c1c11208de05374257d3 Mon Sep 17 00:00:00 2001
+From 73cc79c75dcf7e7f1f85d45f1385e5c3a1bdc730 Mon Sep 17 00:00:00 2001
 From: Bart Van Assche <bart.vanassche@wdc.com>
 Date: Tue, 31 Oct 2017 11:03:18 -0700
 Subject: [PATCH] target/iscsi: Detect conn_cmd_list corruption early
diff --git a/queue/target-iscsi-Fix-a-race-condition-in-iscsit_add_reje.patch b/queue/target-iscsi-Fix-a-race-condition-in-iscsit_add_reje.patch
index 0e2502e..2e255fc 100644
--- a/queue/target-iscsi-Fix-a-race-condition-in-iscsit_add_reje.patch
+++ b/queue/target-iscsi-Fix-a-race-condition-in-iscsit_add_reje.patch
@@ -1,4 +1,4 @@
-From cfe2b621bb18d86e93271febf8c6e37622da2d14 Mon Sep 17 00:00:00 2001
+From 4ca73785d24e2ef3bd89efb843296ae5c80d1919 Mon Sep 17 00:00:00 2001
 From: Bart Van Assche <bart.vanassche@wdc.com>
 Date: Tue, 31 Oct 2017 11:03:17 -0700
 Subject: [PATCH] target/iscsi: Fix a race condition in
@@ -14,12 +14,13 @@ Cc: Christoph Hellwig <hch@lst.de>
 Cc: Mike Christie <mchristi@redhat.com>
 Reviewed-by: Hannes Reinecke <hare@suse.com>
 Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
-index 91fbada7cdc2..541f66a875fc 100644
+index 2654c0e47298..3788e6635e9e 100644
 --- a/drivers/target/iscsi/iscsi_target.c
 +++ b/drivers/target/iscsi/iscsi_target.c
-@@ -833,6 +833,7 @@ static int iscsit_add_reject_from_cmd(
+@@ -836,6 +836,7 @@ static int iscsit_add_reject_from_cmd(
  	unsigned char *buf)
  {
  	struct iscsi_conn *conn;
@@ -27,7 +28,7 @@ index 91fbada7cdc2..541f66a875fc 100644
  
  	if (!cmd->conn) {
  		pr_err("cmd->conn is NULL for ITT: 0x%08x\n",
-@@ -863,7 +864,7 @@ static int iscsit_add_reject_from_cmd(
+@@ -866,7 +867,7 @@ static int iscsit_add_reject_from_cmd(
  	 * Perform the kref_put now if se_cmd has already been setup by
  	 * scsit_setup_scsi_cmd()
  	 */
diff --git a/queue/thermal-drivers-step_wise-Fix-temperature-regulation.patch b/queue/thermal-drivers-step_wise-Fix-temperature-regulation.patch
index 004be5e..4c9a42e 100644
--- a/queue/thermal-drivers-step_wise-Fix-temperature-regulation.patch
+++ b/queue/thermal-drivers-step_wise-Fix-temperature-regulation.patch
@@ -1,4 +1,4 @@
-From 07209fcf33542c1ff1e29df2dbdf8f29cdaacb10 Mon Sep 17 00:00:00 2001
+From 015494108a67560b255ef46c9cc4ec63d6d28f97 Mon Sep 17 00:00:00 2001
 From: Daniel Lezcano <daniel.lezcano@linaro.org>
 Date: Thu, 19 Oct 2017 19:05:58 +0200
 Subject: [PATCH] thermal/drivers/step_wise: Fix temperature regulation
@@ -120,9 +120,10 @@ Cc: Leo Yan <leo.yan@linaro.org>
 Tested-by: Keerthy <j-keerthy@ti.com>
 Reviewed-by: Keerthy <j-keerthy@ti.com>
 Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/thermal/step_wise.c b/drivers/thermal/step_wise.c
-index be95826631b7..ee047ca43084 100644
+index bcef2e7c4ec9..1eea63caa451 100644
 --- a/drivers/thermal/step_wise.c
 +++ b/drivers/thermal/step_wise.c
 @@ -31,8 +31,7 @@
diff --git a/queue/tracing-Allocate-mask_str-buffer-dynamically.patch b/queue/tracing-Allocate-mask_str-buffer-dynamically.patch
index 26fc05d..66733f6 100644
--- a/queue/tracing-Allocate-mask_str-buffer-dynamically.patch
+++ b/queue/tracing-Allocate-mask_str-buffer-dynamically.patch
@@ -1,4 +1,4 @@
-From 90e406f96f630c07d631a021fd4af10aac913e77 Mon Sep 17 00:00:00 2001
+From e1787f3a6f51215d7a837a4e5ff2ae70a5ddd21e Mon Sep 17 00:00:00 2001
 From: Changbin Du <changbin.du@intel.com>
 Date: Thu, 30 Nov 2017 11:39:43 +0800
 Subject: [PATCH] tracing: Allocate mask_str buffer dynamically
@@ -21,12 +21,13 @@ Fixes: 36dfe9252bd4c ("ftrace: make use of tracing_cpumask")
 Cc: stable@vger.kernel.org
 Signed-off-by: Changbin Du <changbin.du@intel.com>
 Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index 5815ec16edd4..9f3f043ba3b7 100644
+index fd1b22f21315..2c46847a1557 100644
 --- a/kernel/trace/trace.c
 +++ b/kernel/trace/trace.c
-@@ -4178,37 +4178,30 @@ static const struct file_operations show_traces_fops = {
+@@ -4063,37 +4063,30 @@ static const struct file_operations show_traces_fops = {
  	.llseek		= seq_lseek,
  };
  
@@ -73,7 +74,7 @@ index 5815ec16edd4..9f3f043ba3b7 100644
  
  	return count;
  }
-@@ -4228,8 +4221,6 @@ tracing_cpumask_write(struct file *filp, const char __user *ubuf,
+@@ -4113,8 +4106,6 @@ tracing_cpumask_write(struct file *filp, const char __user *ubuf,
  	if (err)
  		goto err_unlock;
  
@@ -82,7 +83,7 @@ index 5815ec16edd4..9f3f043ba3b7 100644
  	local_irq_disable();
  	arch_spin_lock(&tr->max_lock);
  	for_each_tracing_cpu(cpu) {
-@@ -4252,8 +4243,6 @@ tracing_cpumask_write(struct file *filp, const char __user *ubuf,
+@@ -4137,8 +4128,6 @@ tracing_cpumask_write(struct file *filp, const char __user *ubuf,
  	local_irq_enable();
  
  	cpumask_copy(tr->tracing_cpumask, tracing_cpumask_new);
diff --git a/queue/tty-fix-oops-when-rmmod-8250.patch b/queue/tty-fix-oops-when-rmmod-8250.patch
index e045a50..8080d6c 100644
--- a/queue/tty-fix-oops-when-rmmod-8250.patch
+++ b/queue/tty-fix-oops-when-rmmod-8250.patch
@@ -1,4 +1,4 @@
-From c79dde629d2027ca80329c62854a7635e623d527 Mon Sep 17 00:00:00 2001
+From f67c6b610ad1db541b27f4f1229d2a674de76f4c Mon Sep 17 00:00:00 2001
 From: nixiaoming <nixiaoming@huawei.com>
 Date: Fri, 15 Sep 2017 17:45:56 +0800
 Subject: [PATCH] tty fix oops when rmmod 8250
@@ -60,6 +60,7 @@ Call Trace:
 
 Signed-off-by: nixiaoming <nixiaoming@huawei.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/fs/proc/proc_tty.c b/fs/proc/proc_tty.c
 index 901bd06f437d..20e2c18e2b47 100644
diff --git a/queue/udf-Avoid-overflow-when-session-starts-at-large-offs.patch b/queue/udf-Avoid-overflow-when-session-starts-at-large-offs.patch
index 4ce4b74..1289f8e 100644
--- a/queue/udf-Avoid-overflow-when-session-starts-at-large-offs.patch
+++ b/queue/udf-Avoid-overflow-when-session-starts-at-large-offs.patch
@@ -1,4 +1,4 @@
-From abdc0eb06964fe1d2fea6dd1391b734d0590365d Mon Sep 17 00:00:00 2001
+From 4f9364f32809383c7e0879210598da7fcc4fd8a8 Mon Sep 17 00:00:00 2001
 From: Jan Kara <jack@suse.cz>
 Date: Mon, 16 Oct 2017 11:38:11 +0200
 Subject: [PATCH] udf: Avoid overflow when session starts at large offset
@@ -11,12 +11,13 @@ large enough type.
 
 Reported-by: Cezary Sliwa <sliwa@ifpan.edu.pl>
 Signed-off-by: Jan Kara <jack@suse.cz>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/fs/udf/super.c b/fs/udf/super.c
-index 99cb81d0077f..08bf097507f6 100644
+index 14b4bc1f6801..cd973f91a8eb 100644
 --- a/fs/udf/super.c
 +++ b/fs/udf/super.c
-@@ -703,7 +703,7 @@ static loff_t udf_check_vsd(struct super_block *sb)
+@@ -707,7 +707,7 @@ static loff_t udf_check_vsd(struct super_block *sb)
  	else
  		sectorsize = sb->s_blocksize;
  
diff --git a/queue/usb-musb-da8xx-fix-babble-condition-handling.patch b/queue/usb-musb-da8xx-fix-babble-condition-handling.patch
index 6970da1..bb64092 100644
--- a/queue/usb-musb-da8xx-fix-babble-condition-handling.patch
+++ b/queue/usb-musb-da8xx-fix-babble-condition-handling.patch
@@ -1,4 +1,4 @@
-From be1f5e39e97e526245e15220b4df3a3822e41d6d Mon Sep 17 00:00:00 2001
+From 3216eef2fa8fbdf5843884d368d08df405e4909c Mon Sep 17 00:00:00 2001
 From: Bin Liu <b-liu@ti.com>
 Date: Tue, 5 Dec 2017 08:45:30 -0600
 Subject: [PATCH] usb: musb: da8xx: fix babble condition handling
diff --git a/queue/usb-xhci-fix-TDS-for-MTK-xHCI1.1.patch b/queue/usb-xhci-fix-TDS-for-MTK-xHCI1.1.patch
index 53d3dad..efb85ab 100644
--- a/queue/usb-xhci-fix-TDS-for-MTK-xHCI1.1.patch
+++ b/queue/usb-xhci-fix-TDS-for-MTK-xHCI1.1.patch
@@ -1,4 +1,4 @@
-From 72b663a99c074a8d073e7ecdae446cfb024ef551 Mon Sep 17 00:00:00 2001
+From aaee5eebdccbf88c46bea9e17b8d9f81a98ade38 Mon Sep 17 00:00:00 2001
 From: Chunfeng Yun <chunfeng.yun@mediatek.com>
 Date: Fri, 8 Dec 2017 18:10:06 +0200
 Subject: [PATCH] usb: xhci: fix TDS for MTK xHCI1.1
@@ -17,12 +17,13 @@ Cc: stable <stable@vger.kernel.org>
 Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
 Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index 6eb87c6e4d24..c5cbc685c691 100644
+index a86521799728..ff19156bc2e7 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -3112,7 +3112,7 @@ static u32 xhci_td_remainder(struct xhci_hcd *xhci, int transferred,
+@@ -3076,7 +3076,7 @@ static u32 xhci_td_remainder(struct xhci_hcd *xhci, int transferred,
  {
  	u32 maxp, total_packet_count;
  
@@ -31,7 +32,7 @@ index 6eb87c6e4d24..c5cbc685c691 100644
  	if (xhci->hci_version < 0x100 && !(xhci->quirks & XHCI_MTK_HOST))
  		return ((td_total_len - transferred) >> 10);
  
-@@ -3121,8 +3121,8 @@ static u32 xhci_td_remainder(struct xhci_hcd *xhci, int transferred,
+@@ -3085,8 +3085,8 @@ static u32 xhci_td_remainder(struct xhci_hcd *xhci, int transferred,
  	    trb_buff_len == td_total_len)
  		return 0;
  
diff --git a/queue/usbip-fix-stub_rx-get_pipe-to-validate-endpoint-numb.patch b/queue/usbip-fix-stub_rx-get_pipe-to-validate-endpoint-numb.patch
index 908abe0..96bfb20 100644
--- a/queue/usbip-fix-stub_rx-get_pipe-to-validate-endpoint-numb.patch
+++ b/queue/usbip-fix-stub_rx-get_pipe-to-validate-endpoint-numb.patch
@@ -1,4 +1,4 @@
-From 635f545a7e8be7596b9b2b6a43cab6bbd5a88e43 Mon Sep 17 00:00:00 2001
+From 646b756c60ae8fd1d03a4d27b8f532313f2d941c Mon Sep 17 00:00:00 2001
 From: Shuah Khan <shuahkh@osg.samsung.com>
 Date: Thu, 7 Dec 2017 14:16:47 -0700
 Subject: [PATCH] usbip: fix stub_rx: get_pipe() to validate endpoint number
@@ -17,12 +17,13 @@ Reported-by: Secunia Research <vuln@secunia.com>
 Cc: stable <stable@vger.kernel.org>
 Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/usb/usbip/stub_rx.c b/drivers/usb/usbip/stub_rx.c
-index 536e037f541f..4d61063c259d 100644
+index 191b176ffedf..4f03c611c16d 100644
 --- a/drivers/usb/usbip/stub_rx.c
 +++ b/drivers/usb/usbip/stub_rx.c
-@@ -328,15 +328,15 @@ static int get_pipe(struct stub_device *sdev, int epnum, int dir)
+@@ -342,15 +342,15 @@ static int get_pipe(struct stub_device *sdev, int epnum, int dir)
  	struct usb_host_endpoint *ep;
  	struct usb_endpoint_descriptor *epd = NULL;
  
@@ -43,7 +44,7 @@ index 536e037f541f..4d61063c259d 100644
  
  	epd = &ep->desc;
  	if (usb_endpoint_xfer_control(epd)) {
-@@ -367,9 +367,10 @@ static int get_pipe(struct stub_device *sdev, int epnum, int dir)
+@@ -381,9 +381,10 @@ static int get_pipe(struct stub_device *sdev, int epnum, int dir)
  			return usb_rcvisocpipe(udev, epnum);
  	}
  
@@ -56,7 +57,7 @@ index 536e037f541f..4d61063c259d 100644
  }
  
  static void masking_bogus_flags(struct urb *urb)
-@@ -435,6 +436,9 @@ static void stub_recv_cmd_submit(struct stub_device *sdev,
+@@ -449,6 +450,9 @@ static void stub_recv_cmd_submit(struct stub_device *sdev,
  	struct usb_device *udev = sdev->udev;
  	int pipe = get_pipe(sdev, pdu->base.ep, pdu->base.direction);
  
diff --git a/queue/usbip-fix-stub_rx-harden-CMD_SUBMIT-path-to-handle-m.patch b/queue/usbip-fix-stub_rx-harden-CMD_SUBMIT-path-to-handle-m.patch
index 5a7c782..c39cb65 100644
--- a/queue/usbip-fix-stub_rx-harden-CMD_SUBMIT-path-to-handle-m.patch
+++ b/queue/usbip-fix-stub_rx-harden-CMD_SUBMIT-path-to-handle-m.patch
@@ -1,4 +1,4 @@
-From c6688ef9f29762e65bce325ef4acd6c675806366 Mon Sep 17 00:00:00 2001
+From ec147c06192125d84636a499301301ddbde7ab95 Mon Sep 17 00:00:00 2001
 From: Shuah Khan <shuahkh@osg.samsung.com>
 Date: Thu, 7 Dec 2017 14:16:48 -0700
 Subject: [PATCH] usbip: fix stub_rx: harden CMD_SUBMIT path to handle
@@ -16,12 +16,13 @@ Reported-by: Secunia Research <vuln@secunia.com>
 Cc: stable <stable@vger.kernel.org>
 Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/usb/usbip/stub_rx.c b/drivers/usb/usbip/stub_rx.c
-index 4d61063c259d..493ac2928391 100644
+index 4f03c611c16d..283a9be77a22 100644
 --- a/drivers/usb/usbip/stub_rx.c
 +++ b/drivers/usb/usbip/stub_rx.c
-@@ -322,11 +322,13 @@ static struct stub_priv *stub_priv_alloc(struct stub_device *sdev,
+@@ -336,11 +336,13 @@ static struct stub_priv *stub_priv_alloc(struct stub_device *sdev,
  	return priv;
  }
  
@@ -36,7 +37,7 @@ index 4d61063c259d..493ac2928391 100644
  
  	if (epnum < 0 || epnum > 15)
  		goto err_ret;
-@@ -339,6 +341,15 @@ static int get_pipe(struct stub_device *sdev, int epnum, int dir)
+@@ -353,6 +355,15 @@ static int get_pipe(struct stub_device *sdev, int epnum, int dir)
  		goto err_ret;
  
  	epd = &ep->desc;
@@ -52,7 +53,7 @@ index 4d61063c259d..493ac2928391 100644
  	if (usb_endpoint_xfer_control(epd)) {
  		if (dir == USBIP_DIR_OUT)
  			return usb_sndctrlpipe(udev, epnum);
-@@ -361,6 +372,21 @@ static int get_pipe(struct stub_device *sdev, int epnum, int dir)
+@@ -375,6 +386,21 @@ static int get_pipe(struct stub_device *sdev, int epnum, int dir)
  	}
  
  	if (usb_endpoint_xfer_isoc(epd)) {
@@ -74,7 +75,7 @@ index 4d61063c259d..493ac2928391 100644
  		if (dir == USBIP_DIR_OUT)
  			return usb_sndisocpipe(udev, epnum);
  		else
-@@ -369,7 +395,7 @@ static int get_pipe(struct stub_device *sdev, int epnum, int dir)
+@@ -383,7 +409,7 @@ static int get_pipe(struct stub_device *sdev, int epnum, int dir)
  
  err_ret:
  	/* NOT REACHED */
@@ -83,7 +84,7 @@ index 4d61063c259d..493ac2928391 100644
  	return -1;
  }
  
-@@ -434,7 +460,7 @@ static void stub_recv_cmd_submit(struct stub_device *sdev,
+@@ -448,7 +474,7 @@ static void stub_recv_cmd_submit(struct stub_device *sdev,
  	struct stub_priv *priv;
  	struct usbip_device *ud = &sdev->ud;
  	struct usb_device *udev = sdev->udev;
@@ -92,7 +93,7 @@ index 4d61063c259d..493ac2928391 100644
  
  	if (pipe == -1)
  		return;
-@@ -456,7 +482,8 @@ static void stub_recv_cmd_submit(struct stub_device *sdev,
+@@ -470,7 +496,8 @@ static void stub_recv_cmd_submit(struct stub_device *sdev,
  	}
  
  	/* allocate urb transfer buffer, if needed */
diff --git a/queue/usbip-fix-stub_send_ret_submit-vulnerability-to-null.patch b/queue/usbip-fix-stub_send_ret_submit-vulnerability-to-null.patch
index 060d0af..c464bf7 100644
--- a/queue/usbip-fix-stub_send_ret_submit-vulnerability-to-null.patch
+++ b/queue/usbip-fix-stub_send_ret_submit-vulnerability-to-null.patch
@@ -1,4 +1,4 @@
-From be6123df1ea8f01ee2f896a16c2b7be3e4557a5a Mon Sep 17 00:00:00 2001
+From 89096df5e6941fa9cc1cf75d861d205746c7391b Mon Sep 17 00:00:00 2001
 From: Shuah Khan <shuahkh@osg.samsung.com>
 Date: Thu, 7 Dec 2017 14:16:50 -0700
 Subject: [PATCH] usbip: fix stub_send_ret_submit() vulnerability to null
@@ -15,12 +15,13 @@ Reported-by: Secunia Research <vuln@secunia.com>
 Cc: stable <stable@vger.kernel.org>
 Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/usb/usbip/stub_tx.c b/drivers/usb/usbip/stub_tx.c
-index b18bce96c212..53172b1f6257 100644
+index be50cef645d8..87ff94be4235 100644
 --- a/drivers/usb/usbip/stub_tx.c
 +++ b/drivers/usb/usbip/stub_tx.c
-@@ -167,6 +167,13 @@ static int stub_send_ret_submit(struct stub_device *sdev)
+@@ -181,6 +181,13 @@ static int stub_send_ret_submit(struct stub_device *sdev)
  		memset(&pdu_header, 0, sizeof(pdu_header));
  		memset(&msg, 0, sizeof(msg));
  
diff --git a/queue/video-fbdev-au1200fb-Release-some-resources-if-a-mem.patch b/queue/video-fbdev-au1200fb-Release-some-resources-if-a-mem.patch
index 871b85c..f761382 100644
--- a/queue/video-fbdev-au1200fb-Release-some-resources-if-a-mem.patch
+++ b/queue/video-fbdev-au1200fb-Release-some-resources-if-a-mem.patch
@@ -1,4 +1,4 @@
-From 451f130602619a17c8883dd0b71b11624faffd51 Mon Sep 17 00:00:00 2001
+From 5828299455609b3d2e06eb8cdae3e37c06b0aab1 Mon Sep 17 00:00:00 2001
 From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
 Date: Thu, 9 Nov 2017 18:09:28 +0100
 Subject: [PATCH] video: fbdev: au1200fb: Release some resources if a memory
@@ -12,12 +12,13 @@ directly.
 Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
 Cc: Tejun Heo <tj@kernel.org>
 Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/video/fbdev/au1200fb.c b/drivers/video/fbdev/au1200fb.c
-index 7fa41026984d..cf54168d44dc 100644
+index 6c2b2ca4a909..29d1639f5c5e 100644
 --- a/drivers/video/fbdev/au1200fb.c
 +++ b/drivers/video/fbdev/au1200fb.c
-@@ -1702,7 +1702,8 @@ static int au1200fb_drv_probe(struct platform_device *dev)
+@@ -1700,7 +1700,8 @@ static int au1200fb_drv_probe(struct platform_device *dev)
  		if (!fbdev->fb_mem) {
  			print_err("fail to allocate frambuffer (size: %dK))",
  				  fbdev->fb_len / 1024);
diff --git a/queue/video-fbdev-au1200fb-Return-an-error-code-if-a-memor.patch b/queue/video-fbdev-au1200fb-Return-an-error-code-if-a-memor.patch
index 2887a40..ad5ba23 100644
--- a/queue/video-fbdev-au1200fb-Return-an-error-code-if-a-memor.patch
+++ b/queue/video-fbdev-au1200fb-Return-an-error-code-if-a-memor.patch
@@ -1,4 +1,4 @@
-From 8cae353e6b01ac3f18097f631cdbceb5ff28c7f3 Mon Sep 17 00:00:00 2001
+From 460acb57ff0613da2c2e77ff1da0beacf1728164 Mon Sep 17 00:00:00 2001
 From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
 Date: Thu, 9 Nov 2017 18:09:28 +0100
 Subject: [PATCH] video: fbdev: au1200fb: Return an error code if a memory
@@ -13,12 +13,13 @@ In case of memory allocation error in 'framebuffer_alloc()', return
 Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
 Cc: Tejun Heo <tj@kernel.org>
 Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/video/fbdev/au1200fb.c b/drivers/video/fbdev/au1200fb.c
-index a5facc2ad90b..7fa41026984d 100644
+index 29d1639f5c5e..44c2be15a08b 100644
 --- a/drivers/video/fbdev/au1200fb.c
 +++ b/drivers/video/fbdev/au1200fb.c
-@@ -1680,8 +1680,10 @@ static int au1200fb_drv_probe(struct platform_device *dev)
+@@ -1681,8 +1681,10 @@ static int au1200fb_drv_probe(struct platform_device *dev)
  
  		fbi = framebuffer_alloc(sizeof(struct au1200fb_device),
  					&dev->dev);
diff --git a/queue/video-udlfb-Fix-read-EDID-timeout.patch b/queue/video-udlfb-Fix-read-EDID-timeout.patch
index 0bbe88d..36465d0 100644
--- a/queue/video-udlfb-Fix-read-EDID-timeout.patch
+++ b/queue/video-udlfb-Fix-read-EDID-timeout.patch
@@ -1,4 +1,4 @@
-From c98769475575c8a585f5b3952f4b5f90266f699b Mon Sep 17 00:00:00 2001
+From 8cc2e768a47139d8fa351fcddeee743ac4eb8de2 Mon Sep 17 00:00:00 2001
 From: Ladislav Michl <ladis@linux-mips.org>
 Date: Thu, 9 Nov 2017 18:09:30 +0100
 Subject: [PATCH] video: udlfb: Fix read EDID timeout
@@ -19,9 +19,10 @@ Fixes: 18dffdf8913a ("staging: udlfb: enhance EDID and mode handling support")
 Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
 Cc: Bernie Thompson <bernie@plugable.com>
 Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
-index ef08a104fb42..d44f14242016 100644
+index 05ef657235df..0df3c6857920 100644
 --- a/drivers/video/fbdev/udlfb.c
 +++ b/drivers/video/fbdev/udlfb.c
 @@ -769,11 +769,11 @@ static int dlfb_get_edid(struct dlfb_data *dev, char *edid, int len)
diff --git a/queue/vt6655-Fix-a-possible-sleep-in-atomic-bug-in-vt6655_.patch b/queue/vt6655-Fix-a-possible-sleep-in-atomic-bug-in-vt6655_.patch
index 9c94297..ccb3e83 100644
--- a/queue/vt6655-Fix-a-possible-sleep-in-atomic-bug-in-vt6655_.patch
+++ b/queue/vt6655-Fix-a-possible-sleep-in-atomic-bug-in-vt6655_.patch
@@ -1,4 +1,4 @@
-From 42c8eb3f6e15367981b274cb79ee4657e2c6949d Mon Sep 17 00:00:00 2001
+From b036fc4d674617008929607a4215f0b5dc9afaef Mon Sep 17 00:00:00 2001
 From: Jia-Ju Bai <baijiaju1990@163.com>
 Date: Mon, 9 Oct 2017 16:45:55 +0800
 Subject: [PATCH] vt6655: Fix a possible sleep-in-atomic bug in vt6655_suspend
@@ -17,9 +17,10 @@ This bug is found by my static analysis tool and my code review.
 
 Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
-index 9fcf2e223f71..1123b4f1e1d6 100644
+index da0f71191009..dac073ec5dbe 100644
 --- a/drivers/staging/vt6655/device_main.c
 +++ b/drivers/staging/vt6655/device_main.c
 @@ -1693,10 +1693,11 @@ static int vt6655_suspend(struct pci_dev *pcid, pm_message_t state)
diff --git a/queue/xfs-fix-incorrect-extent-state-in-xfs_bmap_add_exten.patch b/queue/xfs-fix-incorrect-extent-state-in-xfs_bmap_add_exten.patch
index 5cdbe99..7b10af7 100644
--- a/queue/xfs-fix-incorrect-extent-state-in-xfs_bmap_add_exten.patch
+++ b/queue/xfs-fix-incorrect-extent-state-in-xfs_bmap_add_exten.patch
@@ -1,4 +1,4 @@
-From 5e422f5e4fd71d18bc6b851eeb3864477b3d842e Mon Sep 17 00:00:00 2001
+From 93ae3c677b2ab5b3d72c044ba888ecfbf71483ad Mon Sep 17 00:00:00 2001
 From: Christoph Hellwig <hch@lst.de>
 Date: Tue, 17 Oct 2017 14:16:19 -0700
 Subject: [PATCH] xfs: fix incorrect extent state in
@@ -18,12 +18,13 @@ Signed-off-by: Christoph Hellwig <hch@lst.de>
 Reviewed-by: Brian Foster <bfoster@redhat.com>
 Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
 Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
-index 89263797cf32..a3cc8afed367 100644
+index 1b27940c517e..7cfe3d9d0ac2 100644
 --- a/fs/xfs/libxfs/xfs_bmap.c
 +++ b/fs/xfs/libxfs/xfs_bmap.c
-@@ -2560,7 +2560,7 @@ xfs_bmap_add_extent_unwritten_real(
+@@ -2568,7 +2568,7 @@ xfs_bmap_add_extent_unwritten_real(
  					&i)))
  				goto done;
  			XFS_WANT_CORRUPTED_GOTO(mp, i == 0, done);
diff --git a/queue/xfs-fix-log-block-underflow-during-recovery-cycle-ve.patch b/queue/xfs-fix-log-block-underflow-during-recovery-cycle-ve.patch
index 6098c66..f077e77 100644
--- a/queue/xfs-fix-log-block-underflow-during-recovery-cycle-ve.patch
+++ b/queue/xfs-fix-log-block-underflow-during-recovery-cycle-ve.patch
@@ -1,4 +1,4 @@
-From 9f2a4505800607e537e9dd9dea4f55c4b0c30c7a Mon Sep 17 00:00:00 2001
+From faa973f63bffe12982a86cc7c3523c87271ed138 Mon Sep 17 00:00:00 2001
 From: Brian Foster <bfoster@redhat.com>
 Date: Thu, 26 Oct 2017 09:31:16 -0700
 Subject: [PATCH] xfs: fix log block underflow during recovery cycle
@@ -25,12 +25,13 @@ Reported-by: Zorro Lang <zlang@redhat.com>
 Signed-off-by: Brian Foster <bfoster@redhat.com>
 Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
 Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
-index 89ce1926a021..f809deee53a8 100644
+index cd0b077deb35..211faaae19db 100644
 --- a/fs/xfs/xfs_log_recover.c
 +++ b/fs/xfs/xfs_log_recover.c
-@@ -763,7 +763,7 @@ xlog_find_head(
+@@ -753,7 +753,7 @@ xlog_find_head(
  	 * in the in-core log.  The following number can be made tighter if
  	 * we actually look at the block size of the filesystem.
  	 */
diff --git a/queue/xfs-truncate-pagecache-before-writeback-in-xfs_setat.patch b/queue/xfs-truncate-pagecache-before-writeback-in-xfs_setat.patch
index cd9fe0f..38fefec 100644
--- a/queue/xfs-truncate-pagecache-before-writeback-in-xfs_setat.patch
+++ b/queue/xfs-truncate-pagecache-before-writeback-in-xfs_setat.patch
@@ -1,4 +1,4 @@
-From 350976ae21873b0d36584ea005076356431b8f79 Mon Sep 17 00:00:00 2001
+From 276650c4284acb523e49e20f6a7ab8d28958a36a Mon Sep 17 00:00:00 2001
 From: Eryu Guan <eguan@redhat.com>
 Date: Wed, 1 Nov 2017 21:43:50 -0700
 Subject: [PATCH] xfs: truncate pagecache before writeback in
@@ -53,12 +53,13 @@ Acked-by: Dave Chinner <dchinner@redhat.com>
 Reviewed-by: Brian Foster <bfoster@redhat.com>
 Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
 Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
-index 8b5676d244ca..56475fcd76f2 100644
+index 077e2b2ac773..723d6a68ff99 100644
 --- a/fs/xfs/xfs_iops.c
 +++ b/fs/xfs/xfs_iops.c
-@@ -883,22 +883,6 @@ xfs_setattr_size(
+@@ -885,22 +885,6 @@ xfs_setattr_size(
  	if (error)
  		return error;
  
@@ -81,7 +82,7 @@ index 8b5676d244ca..56475fcd76f2 100644
  	/*
  	 * We've already locked out new page faults, so now we can safely remove
  	 * pages from the page cache knowing they won't get refaulted until we
-@@ -915,9 +899,29 @@ xfs_setattr_size(
+@@ -917,9 +901,29 @@ xfs_setattr_size(
  	 * user visible changes). There's not much we can do about this, except
  	 * to hope that the caller sees ENOMEM and retries the truncate
  	 * operation.
diff --git a/queue/xhci-Don-t-add-a-virt_dev-to-the-devs-array-before-i.patch b/queue/xhci-Don-t-add-a-virt_dev-to-the-devs-array-before-i.patch
index dba197f..e24b75f 100644
--- a/queue/xhci-Don-t-add-a-virt_dev-to-the-devs-array-before-i.patch
+++ b/queue/xhci-Don-t-add-a-virt_dev-to-the-devs-array-before-i.patch
@@ -1,4 +1,4 @@
-From 5d9b70f7d52eb14bb37861c663bae44de9521c35 Mon Sep 17 00:00:00 2001
+From 8cabc8de65754757548ed48d23bdbb69f191837b Mon Sep 17 00:00:00 2001
 From: Mathias Nyman <mathias.nyman@linux.intel.com>
 Date: Fri, 8 Dec 2017 18:10:05 +0200
 Subject: [PATCH] xhci: Don't add a virt_dev to the devs array before it's
@@ -21,12 +21,13 @@ but not fully initialized. Specifically, xhci->devs[i]->udev can be NULL."
 Cc: stable <stable@vger.kernel.org>
 Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index 15f7d422885f..3a29b32a3bd0 100644
+index a13152cb820c..4e6320ca6493 100644
 --- a/drivers/usb/host/xhci-mem.c
 +++ b/drivers/usb/host/xhci-mem.c
-@@ -971,10 +971,9 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id,
+@@ -1036,10 +1036,9 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id,
  		return 0;
  	}
  
@@ -39,7 +40,7 @@ index 15f7d422885f..3a29b32a3bd0 100644
  
  	/* Allocate the (output) device context that will be used in the HC. */
  	dev->out_ctx = xhci_alloc_container_ctx(xhci, XHCI_CTX_TYPE_DEVICE, flags);
-@@ -1015,9 +1014,17 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id,
+@@ -1088,9 +1087,17 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id,
  
  	trace_xhci_alloc_virt_device(dev);