re-export patches for SOB lines.

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

68 files changed, 341 insertions, 273 deletions

diff --git a/queue/ALSA-hda-Add-MIC_NO_PRESENCE-fixup-for-2-HP-machines.patch b/queue/ALSA-hda-Add-MIC_NO_PRESENCE-fixup-for-2-HP-machines.patch
index 078715f..cd9cd6b 100644
--- a/queue/ALSA-hda-Add-MIC_NO_PRESENCE-fixup-for-2-HP-machines.patch
+++ b/queue/ALSA-hda-Add-MIC_NO_PRESENCE-fixup-for-2-HP-machines.patch
@@ -1,4 +1,4 @@
-From 322f74ede933b3e2cb78768b6a6fdbfbf478a0c1 Mon Sep 17 00:00:00 2001
+From 1fd44e2a3c02dc3060c5234eb5f6fcee01167571 Mon Sep 17 00:00:00 2001
 From: Hui Wang <hui.wang@canonical.com>
 Date: Fri, 22 Dec 2017 11:17:44 +0800
 Subject: [PATCH] ALSA: hda - Add MIC_NO_PRESENCE fixup for 2 HP machines
@@ -13,6 +13,7 @@ to fix this issue.
 Cc: <stable@vger.kernel.org>
 Signed-off-by: Hui Wang <hui.wang@canonical.com>
 Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
 index a81aacf684b2..37e1cf8218ff 100644
diff --git a/queue/ALSA-hda-Drop-useless-WARN_ON.patch b/queue/ALSA-hda-Drop-useless-WARN_ON.patch
index 6a388b4..25e1faa 100644
--- a/queue/ALSA-hda-Drop-useless-WARN_ON.patch
+++ b/queue/ALSA-hda-Drop-useless-WARN_ON.patch
@@ -1,4 +1,4 @@
-From a36c2638380c0a4676647a1f553b70b20d3ebce1 Mon Sep 17 00:00:00 2001
+From 25e213e686bfd67246735e28a57d81f9ed2396f7 Mon Sep 17 00:00:00 2001
 From: Takashi Iwai <tiwai@suse.de>
 Date: Fri, 22 Dec 2017 10:45:07 +0100
 Subject: [PATCH] ALSA: hda: Drop useless WARN_ON()
@@ -16,9 +16,10 @@ Fixes: 97cc2ed27e5a ("ALSA: hda - Fix yet another i915 pointer leftover in error
 Cc: <stable@vger.kernel.org>
 Reported-by: Kouta Okamoto <kouta.okamoto@toshiba.co.jp>
 Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
-index 038a180d3f81..cbe818eda336 100644
+index 0659bf389489..f485ab4acfcc 100644
 --- a/sound/hda/hdac_i915.c
 +++ b/sound/hda/hdac_i915.c
 @@ -325,7 +325,7 @@ static int hdac_component_master_match(struct device *dev, void *data)
diff --git a/queue/ALSA-hda-change-the-location-for-one-mic-on-a-Lenovo.patch b/queue/ALSA-hda-change-the-location-for-one-mic-on-a-Lenovo.patch
index 65163ed..b975a8e 100644
--- a/queue/ALSA-hda-change-the-location-for-one-mic-on-a-Lenovo.patch
+++ b/queue/ALSA-hda-change-the-location-for-one-mic-on-a-Lenovo.patch
@@ -1,4 +1,4 @@
-From 8da5bbfc7cbba909f4f32d5e1dda3750baa5d853 Mon Sep 17 00:00:00 2001
+From 7aa2eb451f8f89db41070eb40f496ce24def58e3 Mon Sep 17 00:00:00 2001
 From: Hui Wang <hui.wang@canonical.com>
 Date: Fri, 22 Dec 2017 11:17:46 +0800
 Subject: [PATCH] ALSA: hda - change the location for one mic on a Lenovo
@@ -14,12 +14,13 @@ driver will assign "Front Mic" and "Mic" for them.
 Cc: <stable@vger.kernel.org>
 Signed-off-by: Hui Wang <hui.wang@canonical.com>
 Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 682858548b9b..1522ba31e16d 100644
+index 4de714bf31bb..310e82e9995c 100644
 --- a/sound/pci/hda/patch_realtek.c
 +++ b/sound/pci/hda/patch_realtek.c
-@@ -6328,6 +6328,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+@@ -5942,6 +5942,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
  	SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
  	SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
  	SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
diff --git a/queue/ALSA-hda-fix-headset-mic-detection-issue-on-a-Dell-m.patch b/queue/ALSA-hda-fix-headset-mic-detection-issue-on-a-Dell-m.patch
index 92c3c81..0afbba9 100644
--- a/queue/ALSA-hda-fix-headset-mic-detection-issue-on-a-Dell-m.patch
+++ b/queue/ALSA-hda-fix-headset-mic-detection-issue-on-a-Dell-m.patch
@@ -1,4 +1,4 @@
-From 285d5ddcffafa5d5e68c586f4c9eaa8b24a2897d Mon Sep 17 00:00:00 2001
+From b47bce0bf8c768722d463d1530b15d6496392e33 Mon Sep 17 00:00:00 2001
 From: Hui Wang <hui.wang@canonical.com>
 Date: Fri, 22 Dec 2017 11:17:45 +0800
 Subject: [PATCH] ALSA: hda - fix headset mic detection issue on a Dell machine
@@ -11,12 +11,13 @@ table to let it apply ALC255_FIXUP_DELL1_MIC_NO_PRESENCE.
 Cc: <stable@vger.kernel.org>
 Signed-off-by: Hui Wang <hui.wang@canonical.com>
 Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 6a4db00511ab..682858548b9b 100644
+index 310e82e9995c..34170b021199 100644
 --- a/sound/pci/hda/patch_realtek.c
 +++ b/sound/pci/hda/patch_realtek.c
-@@ -6585,6 +6585,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
+@@ -6195,6 +6195,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
  	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
  		{0x1b, 0x01011020},
  		{0x21, 0x02211010}),
diff --git a/queue/ASoC-da7218-fix-fix-child-node-lookup.patch b/queue/ASoC-da7218-fix-fix-child-node-lookup.patch
index 19c2926..a7772c1 100644
--- a/queue/ASoC-da7218-fix-fix-child-node-lookup.patch
+++ b/queue/ASoC-da7218-fix-fix-child-node-lookup.patch
@@ -1,4 +1,4 @@
-From bc6476d6c1edcb9b97621b5131bd169aa81f27db Mon Sep 17 00:00:00 2001
+From 288a038372d65ec75773c90a0ad484352f8c0714 Mon Sep 17 00:00:00 2001
 From: Johan Hovold <johan@kernel.org>
 Date: Mon, 13 Nov 2017 12:12:55 +0100
 Subject: [PATCH] ASoC: da7218: fix fix child-node lookup
@@ -16,9 +16,10 @@ Signed-off-by: Johan Hovold <johan@kernel.org>
 Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
 Signed-off-by: Mark Brown <broonie@kernel.org>
 Cc: stable <stable@vger.kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c
-index b2d42ec1dcd9..56564ce90cb6 100644
+index d256ebf9e309..96d2f63b4d9a 100644
 --- a/sound/soc/codecs/da7218.c
 +++ b/sound/soc/codecs/da7218.c
 @@ -2520,7 +2520,7 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec)
diff --git a/queue/ASoC-fsl_ssi-AC-97-ops-need-regmap-clock-and-cleanin.patch b/queue/ASoC-fsl_ssi-AC-97-ops-need-regmap-clock-and-cleanin.patch
index 00cec5e..ff5f9cc 100644
--- a/queue/ASoC-fsl_ssi-AC-97-ops-need-regmap-clock-and-cleanin.patch
+++ b/queue/ASoC-fsl_ssi-AC-97-ops-need-regmap-clock-and-cleanin.patch
@@ -1,4 +1,4 @@
-From 695b78b548d8a26288f041e907ff17758df9e1d5 Mon Sep 17 00:00:00 2001
+From 8d16fad520ab999d3ed50bc7277f0eae6ba4b63b Mon Sep 17 00:00:00 2001
 From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>
 Date: Mon, 20 Nov 2017 23:14:55 +0100
 Subject: [PATCH] ASoC: fsl_ssi: AC'97 ops need regmap, clock and cleaning up
@@ -15,12 +15,13 @@ Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
 Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
 Signed-off-by: Mark Brown <broonie@kernel.org>
 Cc: stable@vger.kernel.org
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
-index f2f51e06e22c..c3a83ed0297e 100644
+index 173cb8496641..7793982f3cce 100644
 --- a/sound/soc/fsl/fsl_ssi.c
 +++ b/sound/soc/fsl/fsl_ssi.c
-@@ -1458,12 +1458,6 @@ static int fsl_ssi_probe(struct platform_device *pdev)
+@@ -1454,12 +1454,6 @@ static int fsl_ssi_probe(struct platform_device *pdev)
  				sizeof(fsl_ssi_ac97_dai));
  
  		fsl_ac97_data = ssi_private;
@@ -33,7 +34,7 @@ index f2f51e06e22c..c3a83ed0297e 100644
  	} else {
  		/* Initialize this copy of the CPU DAI driver structure */
  		memcpy(&ssi_private->cpu_dai_drv, &fsl_ssi_dai_template,
-@@ -1574,6 +1568,14 @@ static int fsl_ssi_probe(struct platform_device *pdev)
+@@ -1570,6 +1564,14 @@ static int fsl_ssi_probe(struct platform_device *pdev)
  			return ret;
  	}
  
@@ -48,7 +49,7 @@ index f2f51e06e22c..c3a83ed0297e 100644
  	ret = devm_snd_soc_register_component(&pdev->dev, &fsl_ssi_component,
  					      &ssi_private->cpu_dai_drv, 1);
  	if (ret) {
-@@ -1657,6 +1659,10 @@ error_sound_card:
+@@ -1653,6 +1655,10 @@ static int fsl_ssi_probe(struct platform_device *pdev)
  	fsl_ssi_debugfs_remove(&ssi_private->dbg_stats);
  
  error_asoc_register:
diff --git a/queue/ASoC-tlv320aic31xx-Fix-GPIO1-register-definition.patch b/queue/ASoC-tlv320aic31xx-Fix-GPIO1-register-definition.patch
index 367c118..b01afc5 100644
--- a/queue/ASoC-tlv320aic31xx-Fix-GPIO1-register-definition.patch
+++ b/queue/ASoC-tlv320aic31xx-Fix-GPIO1-register-definition.patch
@@ -1,4 +1,4 @@
-From 737e0b7b67bdfe24090fab2852044bb283282fc5 Mon Sep 17 00:00:00 2001
+From 78330d61248c866c068ec3bef8208baf1309be44 Mon Sep 17 00:00:00 2001
 From: "Andrew F. Davis" <afd@ti.com>
 Date: Wed, 29 Nov 2017 15:32:46 -0600
 Subject: [PATCH] ASoC: tlv320aic31xx: Fix GPIO1 register definition
@@ -11,6 +11,7 @@ Fixes: bafcbfe429eb ("ASoC: tlv320aic31xx: Make the register values human readab
 Signed-off-by: Andrew F. Davis <afd@ti.com>
 Signed-off-by: Mark Brown <broonie@kernel.org>
 Cc: stable@vger.kernel.org
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h
 index 730fb2058869..1ff3edb7bbb6 100644
diff --git a/queue/ASoC-twl4030-fix-child-node-lookup.patch b/queue/ASoC-twl4030-fix-child-node-lookup.patch
index 59d0d39..00e8803 100644
--- a/queue/ASoC-twl4030-fix-child-node-lookup.patch
+++ b/queue/ASoC-twl4030-fix-child-node-lookup.patch
@@ -1,4 +1,4 @@
-From 15f8c5f2415bfac73f33a14bcd83422bcbfb5298 Mon Sep 17 00:00:00 2001
+From c3530cbfff40e0fcc895beb53029a6fa842a3dd6 Mon Sep 17 00:00:00 2001
 From: Johan Hovold <johan@kernel.org>
 Date: Mon, 13 Nov 2017 12:12:56 +0100
 Subject: [PATCH] ASoC: twl4030: fix child-node lookup
@@ -16,9 +16,10 @@ Fixes: 2d6d649a2e0f ("ASoC: twl4030: Support for DT booted kernel")
 Signed-off-by: Johan Hovold <johan@kernel.org>
 Signed-off-by: Mark Brown <broonie@kernel.org>
 Cc: stable <stable@vger.kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
-index c482b2e7a7d2..cfe72b9d4356 100644
+index a2104d68169d..26fd6a664b9b 100644
 --- a/sound/soc/codecs/twl4030.c
 +++ b/sound/soc/codecs/twl4030.c
 @@ -232,7 +232,7 @@ static struct twl4030_codec_data *twl4030_get_pdata(struct snd_soc_codec *codec)
diff --git a/queue/ASoC-wm_adsp-Fix-validation-of-firmware-and-coeff-le.patch b/queue/ASoC-wm_adsp-Fix-validation-of-firmware-and-coeff-le.patch
index 7e3586e..6654ceb 100644
--- a/queue/ASoC-wm_adsp-Fix-validation-of-firmware-and-coeff-le.patch
+++ b/queue/ASoC-wm_adsp-Fix-validation-of-firmware-and-coeff-le.patch
@@ -1,4 +1,4 @@
-From 50dd2ea8ef67a1617e0c0658bcbec4b9fb03b936 Mon Sep 17 00:00:00 2001
+From 3b8936170e64ea722a7448f81d4914d5c32761c1 Mon Sep 17 00:00:00 2001
 From: Ben Hutchings <ben.hutchings@codethink.co.uk>
 Date: Fri, 8 Dec 2017 16:15:20 +0000
 Subject: [PATCH] ASoC: wm_adsp: Fix validation of firmware and coeff lengths
@@ -19,12 +19,13 @@ Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
 Tested-by: Charles Keepax <ckeepax@opensource.cirrus.com>
 Signed-off-by: Mark Brown <broonie@kernel.org>
 Cc: stable@vger.kernel.org
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
-index 65c059b5ffd7..66e32f5d2917 100644
+index 20695b691aff..66702fc5da76 100644
 --- a/sound/soc/codecs/wm_adsp.c
 +++ b/sound/soc/codecs/wm_adsp.c
-@@ -1733,7 +1733,7 @@ static int wm_adsp_load(struct wm_adsp *dsp)
+@@ -1735,7 +1735,7 @@ static int wm_adsp_load(struct wm_adsp *dsp)
  		 le64_to_cpu(footer->timestamp));
  
  	while (pos < firmware->size &&
@@ -33,7 +34,7 @@ index 65c059b5ffd7..66e32f5d2917 100644
  		region = (void *)&(firmware->data[pos]);
  		region_name = "Unknown";
  		reg = 0;
-@@ -1782,8 +1782,8 @@ static int wm_adsp_load(struct wm_adsp *dsp)
+@@ -1784,8 +1784,8 @@ static int wm_adsp_load(struct wm_adsp *dsp)
  			 regions, le32_to_cpu(region->len), offset,
  			 region_name);
  
@@ -44,7 +45,7 @@ index 65c059b5ffd7..66e32f5d2917 100644
  			adsp_err(dsp,
  				 "%s.%d: %s region len %d bytes exceeds file length %zu\n",
  				 file, regions, region_name,
-@@ -2253,7 +2253,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
+@@ -2255,7 +2255,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
  
  	blocks = 0;
  	while (pos < firmware->size &&
@@ -53,7 +54,7 @@ index 65c059b5ffd7..66e32f5d2917 100644
  		blk = (void *)(&firmware->data[pos]);
  
  		type = le16_to_cpu(blk->type);
-@@ -2327,8 +2327,8 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
+@@ -2329,8 +2329,8 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
  		}
  
  		if (reg) {
diff --git a/queue/IB-mlx5-Serialize-access-to-the-VMA-list.patch b/queue/IB-mlx5-Serialize-access-to-the-VMA-list.patch
index 2053625..07edbc9 100644
--- a/queue/IB-mlx5-Serialize-access-to-the-VMA-list.patch
+++ b/queue/IB-mlx5-Serialize-access-to-the-VMA-list.patch
@@ -1,4 +1,4 @@
-From ad9a3668a434faca1339789ed2f043d679199309 Mon Sep 17 00:00:00 2001
+From 548e30b1d918064be75c14139fac6622b6332e02 Mon Sep 17 00:00:00 2001
 From: Majd Dibbiny <majd@mellanox.com>
 Date: Sun, 24 Dec 2017 13:54:56 +0200
 Subject: [PATCH] IB/mlx5: Serialize access to the VMA list
@@ -18,12 +18,13 @@ Reviewed-by: Yishai Hadas <yishaih@mellanox.com>
 Signed-off-by: Majd Dibbiny <majd@mellanox.com>
 Signed-off-by: Leon Romanovsky <leon@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/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
-index b4ef4d9b6ce5..8ac50de2b242 100644
+index e65ab16f1679..df0712addcfb 100644
 --- a/drivers/infiniband/hw/mlx5/main.c
 +++ b/drivers/infiniband/hw/mlx5/main.c
-@@ -1463,6 +1463,7 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev,
+@@ -1316,6 +1316,7 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev,
  	}
  
  	INIT_LIST_HEAD(&context->vma_private_list);
@@ -31,7 +32,7 @@ index b4ef4d9b6ce5..8ac50de2b242 100644
  	INIT_LIST_HEAD(&context->db_page_list);
  	mutex_init(&context->db_page_mutex);
  
-@@ -1624,7 +1625,9 @@ static void  mlx5_ib_vma_close(struct vm_area_struct *area)
+@@ -1477,7 +1478,9 @@ static void  mlx5_ib_vma_close(struct vm_area_struct *area)
  	 * mlx5_ib_disassociate_ucontext().
  	 */
  	mlx5_ib_vma_priv_data->vma = NULL;
@@ -41,7 +42,7 @@ index b4ef4d9b6ce5..8ac50de2b242 100644
  	kfree(mlx5_ib_vma_priv_data);
  }
  
-@@ -1644,10 +1647,13 @@ static int mlx5_ib_set_vma_data(struct vm_area_struct *vma,
+@@ -1497,10 +1500,13 @@ static int mlx5_ib_set_vma_data(struct vm_area_struct *vma,
  		return -ENOMEM;
  
  	vma_prv->vma = vma;
@@ -55,7 +56,7 @@ index b4ef4d9b6ce5..8ac50de2b242 100644
  
  	return 0;
  }
-@@ -1690,6 +1696,7 @@ static void mlx5_ib_disassociate_ucontext(struct ib_ucontext *ibcontext)
+@@ -1543,6 +1549,7 @@ static void mlx5_ib_disassociate_ucontext(struct ib_ucontext *ibcontext)
  	 * mlx5_ib_vma_close.
  	 */
  	down_write(&owning_mm->mmap_sem);
@@ -63,7 +64,7 @@ index b4ef4d9b6ce5..8ac50de2b242 100644
  	list_for_each_entry_safe(vma_private, n, &context->vma_private_list,
  				 list) {
  		vma = vma_private->vma;
-@@ -1704,6 +1711,7 @@ static void mlx5_ib_disassociate_ucontext(struct ib_ucontext *ibcontext)
+@@ -1557,6 +1564,7 @@ static void mlx5_ib_disassociate_ucontext(struct ib_ucontext *ibcontext)
  		list_del(&vma_private->list);
  		kfree(vma_private);
  	}
@@ -72,10 +73,10 @@ index b4ef4d9b6ce5..8ac50de2b242 100644
  	mmput(owning_mm);
  	put_task_struct(owning_process);
 diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
-index 6dd8cac78de2..2c5f3533bbc9 100644
+index bdcf25410c99..fb3daedd7ee4 100644
 --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
 +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
-@@ -115,6 +115,8 @@ enum {
+@@ -110,6 +110,8 @@ enum {
  struct mlx5_ib_vma_private_data {
  	struct list_head list;
  	struct vm_area_struct *vma;
@@ -84,7 +85,7 @@ index 6dd8cac78de2..2c5f3533bbc9 100644
  };
  
  struct mlx5_ib_ucontext {
-@@ -129,6 +131,8 @@ struct mlx5_ib_ucontext {
+@@ -124,6 +126,8 @@ struct mlx5_ib_ucontext {
  	/* Transport Domain number */
  	u32			tdn;
  	struct list_head	vma_private_list;
diff --git a/queue/IB-uverbs-Fix-command-checking-as-part-of-ib_uverbs_.patch b/queue/IB-uverbs-Fix-command-checking-as-part-of-ib_uverbs_.patch
index d36acf8..ea302e7 100644
--- a/queue/IB-uverbs-Fix-command-checking-as-part-of-ib_uverbs_.patch
+++ b/queue/IB-uverbs-Fix-command-checking-as-part-of-ib_uverbs_.patch
@@ -1,4 +1,4 @@
-From 05d14e7b0c138cb07ba30e464f47b39434f3fdef Mon Sep 17 00:00:00 2001
+From 74b984da398ca3a82a93bbae9bf042af2b8c7927 Mon Sep 17 00:00:00 2001
 From: Moni Shoua <monis@mellanox.com>
 Date: Sun, 24 Dec 2017 13:54:57 +0200
 Subject: [PATCH] IB/uverbs: Fix command checking as part of
@@ -17,12 +17,13 @@ Reviewed-by: Yishai Hadas <yishaih@mellanox.com>
 Signed-off-by: Moni Shoua <monis@mellanox.com>
 Signed-off-by: Leon Romanovsky <leon@kernel.org>
 Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
-index d0202bb176a4..840b24096690 100644
+index 5ea2d80800f9..84be73cf8ed0 100644
 --- a/drivers/infiniband/core/uverbs_cmd.c
 +++ b/drivers/infiniband/core/uverbs_cmd.c
-@@ -2074,8 +2074,8 @@ int ib_uverbs_ex_modify_qp(struct ib_uverbs_file *file,
+@@ -2079,8 +2079,8 @@ int ib_uverbs_ex_modify_qp(struct ib_uverbs_file *file,
  		return -EOPNOTSUPP;
  
  	if (ucore->inlen > sizeof(cmd)) {
diff --git a/queue/KVM-arm64-Stop-save-restoring-host-tpidr_el1-on-VHE.patch b/queue/KVM-arm64-Stop-save-restoring-host-tpidr_el1-on-VHE.patch
index 198e347..7676809 100644
--- a/queue/KVM-arm64-Stop-save-restoring-host-tpidr_el1-on-VHE.patch
+++ b/queue/KVM-arm64-Stop-save-restoring-host-tpidr_el1-on-VHE.patch
@@ -1,4 +1,4 @@
-From 1f742679c33bc083722cb0b442a95d458c491b56 Mon Sep 17 00:00:00 2001
+From aa527074e4fc2dc41919917d9d49fdd729260af8 Mon Sep 17 00:00:00 2001
 From: James Morse <james.morse@arm.com>
 Date: Mon, 8 Jan 2018 15:38:07 +0000
 Subject: [PATCH] KVM: arm64: Stop save/restoring host tpidr_el1 on VHE
@@ -19,12 +19,13 @@ need KVM to do it for non-vhe. Add the copy into kvm-init instead.
 Signed-off-by: James Morse <james.morse@arm.com>
 Reviewed-by: Christoffer Dall <cdall@linaro.org>
 Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/arch/arm64/kvm/hyp-init.S b/arch/arm64/kvm/hyp-init.S
-index 33c40b3eea01..8a00de187e56 100644
+index 3f9615582377..fbf259893f6a 100644
 --- a/arch/arm64/kvm/hyp-init.S
 +++ b/arch/arm64/kvm/hyp-init.S
-@@ -120,6 +120,10 @@ CPU_BE(	orr	x4, x4, #SCTLR_ELx_EE)
+@@ -122,6 +122,10 @@ CPU_BE(	orr	x4, x4, #SCTLR_ELx_EE)
  	kern_hyp_va	x2
  	msr	vbar_el2, x2
  
@@ -36,10 +37,10 @@ index 33c40b3eea01..8a00de187e56 100644
  	eret
  ENDPROC(__kvm_hyp_init)
 diff --git a/arch/arm64/kvm/hyp/s2-setup.c b/arch/arm64/kvm/hyp/s2-setup.c
-index 74306c33a6de..603e1ee83e89 100644
+index eb401dbb285e..b81f4091c909 100644
 --- a/arch/arm64/kvm/hyp/s2-setup.c
 +++ b/arch/arm64/kvm/hyp/s2-setup.c
-@@ -86,8 +86,5 @@ u32 __hyp_text __init_stage2_translation(void)
+@@ -84,8 +84,5 @@ u32 __hyp_text __init_stage2_translation(void)
  
  	write_sysreg(val, vtcr_el2);
  
diff --git a/queue/KVM-arm64-Store-vcpu-on-the-stack-during-__guest_ent.patch b/queue/KVM-arm64-Store-vcpu-on-the-stack-during-__guest_ent.patch
index 539b218..e88dc19 100644
--- a/queue/KVM-arm64-Store-vcpu-on-the-stack-during-__guest_ent.patch
+++ b/queue/KVM-arm64-Store-vcpu-on-the-stack-during-__guest_ent.patch
@@ -1,4 +1,4 @@
-From 32b03d1059667a39e089c45ee38ec9c16332430f Mon Sep 17 00:00:00 2001
+From 3cf0320abf6756060cba447daf89b37216d7168a Mon Sep 17 00:00:00 2001
 From: James Morse <james.morse@arm.com>
 Date: Mon, 8 Jan 2018 15:38:03 +0000
 Subject: [PATCH] KVM: arm64: Store vcpu on the stack during __guest_enter()
@@ -20,6 +20,7 @@ the vcpu.
 Signed-off-by: James Morse <james.morse@arm.com>
 Reviewed-by: Christoffer Dall <cdall@linaro.org>
 Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S
 index 9c45c6af1f58..fe4678f20a85 100644
@@ -57,10 +58,10 @@ index 9c45c6af1f58..fe4678f20a85 100644
  	ldr	x0, [x3, #VCPU_HOST_CONTEXT]
  	kern_hyp_va x0
 diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S
-index 5170ce1021da..fce7cc507e0a 100644
+index f49b53331d28..fc1613955090 100644
 --- a/arch/arm64/kvm/hyp/hyp-entry.S
 +++ b/arch/arm64/kvm/hyp/hyp-entry.S
-@@ -104,6 +104,7 @@ el1_trap:
+@@ -120,6 +120,7 @@ el1_trap:
  	/*
  	 * x0: ESR_EC
  	 */
@@ -68,7 +69,7 @@ index 5170ce1021da..fce7cc507e0a 100644
  
  	/*
  	 * We trap the first access to the FP/SIMD to save the host context
-@@ -116,19 +117,18 @@ alternative_if_not ARM64_HAS_NO_FPSIMD
+@@ -132,19 +133,18 @@ alternative_if_not ARM64_HAS_NO_FPSIMD
  	b.eq	__fpsimd_guest_restore
  alternative_else_nop_endif
  
diff --git a/queue/RDS-Check-cmsg_len-before-dereferencing-CMSG_DATA.patch b/queue/RDS-Check-cmsg_len-before-dereferencing-CMSG_DATA.patch
index ff5a3eb..4a9fade 100644
--- a/queue/RDS-Check-cmsg_len-before-dereferencing-CMSG_DATA.patch
+++ b/queue/RDS-Check-cmsg_len-before-dereferencing-CMSG_DATA.patch
@@ -1,4 +1,4 @@
-From 14e138a86f6347c6199f610576d2e11c03bec5f0 Mon Sep 17 00:00:00 2001
+From 6c62f53172d7ac052ecd6e05757eaf992f6e15aa Mon Sep 17 00:00:00 2001
 From: Avinash Repaka <avinash.repaka@oracle.com>
 Date: Thu, 21 Dec 2017 20:17:04 -0800
 Subject: [PATCH] RDS: Check cmsg_len before dereferencing CMSG_DATA
@@ -50,12 +50,13 @@ Signed-off-by: Avinash Repaka <avinash.repaka@oracle.com>
 Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
 Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/net/rds/send.c b/net/rds/send.c
-index b52cdc8ae428..f72466c63f0c 100644
+index 5cc64039caf7..0747ef618c8f 100644
 --- a/net/rds/send.c
 +++ b/net/rds/send.c
-@@ -1009,6 +1009,9 @@ static int rds_rdma_bytes(struct msghdr *msg, size_t *rdma_bytes)
+@@ -1007,6 +1007,9 @@ static int rds_rdma_bytes(struct msghdr *msg, size_t *rdma_bytes)
  			continue;
  
  		if (cmsg->cmsg_type == RDS_CMSG_RDMA_ARGS) {
diff --git a/queue/USB-serial-ftdi_sio-add-id-for-Airbus-DS-P8GR.patch b/queue/USB-serial-ftdi_sio-add-id-for-Airbus-DS-P8GR.patch
index f4b241a..20688e8 100644
--- a/queue/USB-serial-ftdi_sio-add-id-for-Airbus-DS-P8GR.patch
+++ b/queue/USB-serial-ftdi_sio-add-id-for-Airbus-DS-P8GR.patch
@@ -1,4 +1,4 @@
-From c6a36ad383559a60a249aa6016cebf3cb8b6c485 Mon Sep 17 00:00:00 2001
+From 04ebb0af4b786789a9c977668c3fd7963fb2f017 Mon Sep 17 00:00:00 2001
 From: Max Schulze <max.schulze@posteo.de>
 Date: Wed, 20 Dec 2017 20:47:44 +0100
 Subject: [PATCH] USB: serial: ftdi_sio: add id for Airbus DS P8GR
@@ -10,12 +10,13 @@ Add AIRBUS_DS_P8GR device IDs to ftdi_sio driver.
 Signed-off-by: Max Schulze <max.schulze@posteo.de>
 Cc: stable <stable@vger.kernel.org>
 Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
-index 1aba9105b369..fc68952c994a 100644
+index b3f6e7cc8292..2b3813762d25 100644
 --- a/drivers/usb/serial/ftdi_sio.c
 +++ b/drivers/usb/serial/ftdi_sio.c
-@@ -1013,6 +1013,7 @@ static const struct usb_device_id id_table_combined[] = {
+@@ -1017,6 +1017,7 @@ static const struct usb_device_id id_table_combined[] = {
  		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
  	{ USB_DEVICE(CYPRESS_VID, CYPRESS_WICED_BT_USB_PID) },
  	{ USB_DEVICE(CYPRESS_VID, CYPRESS_WICED_WL_USB_PID) },
@@ -24,10 +25,10 @@ index 1aba9105b369..fc68952c994a 100644
  };
  
 diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
-index 4faa09fe308c..8b4ecd2bd297 100644
+index f9d15bd62785..543d2801632b 100644
 --- a/drivers/usb/serial/ftdi_sio_ids.h
 +++ b/drivers/usb/serial/ftdi_sio_ids.h
-@@ -914,6 +914,12 @@
+@@ -913,6 +913,12 @@
  #define ICPDAS_I7561U_PID		0x0104
  #define ICPDAS_I7563U_PID		0x0105
  
diff --git a/queue/USB-serial-option-add-support-for-Telit-ME910-PID-0x.patch b/queue/USB-serial-option-add-support-for-Telit-ME910-PID-0x.patch
index 373798d..3ad719a 100644
--- a/queue/USB-serial-option-add-support-for-Telit-ME910-PID-0x.patch
+++ b/queue/USB-serial-option-add-support-for-Telit-ME910-PID-0x.patch
@@ -1,4 +1,4 @@
-From 08933099e6404f588f81c2050bfec7313e06eeaf Mon Sep 17 00:00:00 2001
+From 42a57a2445dc45ed559194e0a7e8ba9f53ad8164 Mon Sep 17 00:00:00 2001
 From: Daniele Palmas <dnlplm@gmail.com>
 Date: Thu, 14 Dec 2017 16:54:45 +0100
 Subject: [PATCH] USB: serial: option: add support for Telit ME910 PID 0x1101
@@ -10,12 +10,13 @@ This patch adds support for PID 0x1101 of Telit ME910.
 Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
 Cc: stable <stable@vger.kernel.org>
 Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index 3b3513874cfd..b02fb576b856 100644
+index ffa8ec917ff5..9a8c5a160a3d 100644
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
-@@ -280,6 +280,7 @@ static void option_instat_callback(struct urb *urb);
+@@ -283,6 +283,7 @@ static void option_instat_callback(struct urb *urb);
  #define TELIT_PRODUCT_LE922_USBCFG3		0x1043
  #define TELIT_PRODUCT_LE922_USBCFG5		0x1045
  #define TELIT_PRODUCT_ME910			0x1100
@@ -23,7 +24,7 @@ index 3b3513874cfd..b02fb576b856 100644
  #define TELIT_PRODUCT_LE920			0x1200
  #define TELIT_PRODUCT_LE910			0x1201
  #define TELIT_PRODUCT_LE910_USBCFG4		0x1206
-@@ -645,6 +646,11 @@ static const struct option_blacklist_info telit_me910_blacklist = {
+@@ -648,6 +649,11 @@ static const struct option_blacklist_info telit_me910_blacklist = {
  	.reserved = BIT(1) | BIT(3),
  };
  
@@ -35,7 +36,7 @@ index 3b3513874cfd..b02fb576b856 100644
  static const struct option_blacklist_info telit_le910_blacklist = {
  	.sendsetup = BIT(0),
  	.reserved = BIT(1) | BIT(2),
-@@ -1244,6 +1250,8 @@ static const struct usb_device_id option_ids[] = {
+@@ -1247,6 +1253,8 @@ static const struct usb_device_id option_ids[] = {
  		.driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg0 },
  	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910),
  		.driver_info = (kernel_ulong_t)&telit_me910_blacklist },
diff --git a/queue/USB-serial-option-adding-support-for-YUGA-CLM920-NC5.patch b/queue/USB-serial-option-adding-support-for-YUGA-CLM920-NC5.patch
index 18cf5d2..3283f63 100644
--- a/queue/USB-serial-option-adding-support-for-YUGA-CLM920-NC5.patch
+++ b/queue/USB-serial-option-adding-support-for-YUGA-CLM920-NC5.patch
@@ -1,4 +1,4 @@
-From 3920bb713038810f25770e7545b79f204685c8f2 Mon Sep 17 00:00:00 2001
+From d6e82ea18d2fb74fca83fa74d455b5067afe0e90 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?SZ=20Lin=20=28=E6=9E=97=E4=B8=8A=E6=99=BA=29?=
  <sz.lin@moxa.com>
 Date: Tue, 19 Dec 2017 17:40:32 +0800
@@ -23,12 +23,13 @@ Signed-off-by: Taiyi Wu <taiyity.wu@moxa.com>
 Signed-off-by: SZ Lin (林上智) <sz.lin@moxa.com>
 Cc: stable <stable@vger.kernel.org>
 Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index b02fb576b856..b6320e3be429 100644
+index 9a8c5a160a3d..a818c43a02ec 100644
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
-@@ -233,6 +233,8 @@ static void option_instat_callback(struct urb *urb);
+@@ -236,6 +236,8 @@ static void option_instat_callback(struct urb *urb);
  /* These Quectel products use Qualcomm's vendor ID */
  #define QUECTEL_PRODUCT_UC20			0x9003
  #define QUECTEL_PRODUCT_UC15			0x9090
@@ -37,7 +38,7 @@ index b02fb576b856..b6320e3be429 100644
  
  #define QUECTEL_VENDOR_ID			0x2c7c
  /* These Quectel products use Quectel's vendor ID */
-@@ -680,6 +682,10 @@ static const struct option_blacklist_info cinterion_rmnet2_blacklist = {
+@@ -683,6 +685,10 @@ static const struct option_blacklist_info cinterion_rmnet2_blacklist = {
  	.reserved = BIT(4) | BIT(5),
  };
  
@@ -48,7 +49,7 @@ index b02fb576b856..b6320e3be429 100644
  static const struct usb_device_id option_ids[] = {
  	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
  	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
-@@ -1184,6 +1190,9 @@ static const struct usb_device_id option_ids[] = {
+@@ -1187,6 +1193,9 @@ static const struct usb_device_id option_ids[] = {
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
  	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
diff --git a/queue/USB-serial-qcserial-add-Sierra-Wireless-EM7565.patch b/queue/USB-serial-qcserial-add-Sierra-Wireless-EM7565.patch
index 55d65a5..e5d3c76 100644
--- a/queue/USB-serial-qcserial-add-Sierra-Wireless-EM7565.patch
+++ b/queue/USB-serial-qcserial-add-Sierra-Wireless-EM7565.patch
@@ -1,4 +1,4 @@
-From 92a18a657fb2e2ffbfa0659af32cc18fd2346516 Mon Sep 17 00:00:00 2001
+From 7ebeb4180511dfcd8bd90bdc926a004f08b2bc6d Mon Sep 17 00:00:00 2001
 From: Reinhard Speyerer <rspmn@arcor.de>
 Date: Fri, 15 Dec 2017 00:39:27 +0100
 Subject: [PATCH] USB: serial: qcserial: add Sierra Wireless EM7565
@@ -50,12 +50,13 @@ order to verify backward compatibility.
 Signed-off-by: Reinhard Speyerer <rspmn@arcor.de>
 Cc: stable <stable@vger.kernel.org>
 Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
-index e3892541a489..613f91add03d 100644
+index 4516291df1b8..fb6dc16c754a 100644
 --- a/drivers/usb/serial/qcserial.c
 +++ b/drivers/usb/serial/qcserial.c
-@@ -162,6 +162,8 @@ static const struct usb_device_id id_table[] = {
+@@ -166,6 +166,8 @@ static const struct usb_device_id id_table[] = {
  	{DEVICE_SWI(0x1199, 0x9079)},	/* Sierra Wireless EM74xx */
  	{DEVICE_SWI(0x1199, 0x907a)},	/* Sierra Wireless EM74xx QDL */
  	{DEVICE_SWI(0x1199, 0x907b)},	/* Sierra Wireless EM74xx */
@@ -64,7 +65,7 @@ index e3892541a489..613f91add03d 100644
  	{DEVICE_SWI(0x413c, 0x81a2)},	/* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */
  	{DEVICE_SWI(0x413c, 0x81a3)},	/* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */
  	{DEVICE_SWI(0x413c, 0x81a4)},	/* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */
-@@ -342,6 +344,7 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
+@@ -346,6 +348,7 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
  			break;
  		case 2:
  			dev_dbg(dev, "NMEA GPS interface found\n");
diff --git a/queue/adding-missing-rcu_read_unlock-in-ipxip6_rcv.patch b/queue/adding-missing-rcu_read_unlock-in-ipxip6_rcv.patch
index 5bf966b..45e7e01 100644
--- a/queue/adding-missing-rcu_read_unlock-in-ipxip6_rcv.patch
+++ b/queue/adding-missing-rcu_read_unlock-in-ipxip6_rcv.patch
@@ -1,4 +1,4 @@
-From 74c4b656c3d92ec4c824ea1a4afd726b7b6568c8 Mon Sep 17 00:00:00 2001
+From d4f83fe1948a4c3cddb13ed332aa4ea55c4c7c67 Mon Sep 17 00:00:00 2001
 From: "Nikita V. Shirokov" <tehnerd@fb.com>
 Date: Wed, 6 Dec 2017 17:15:43 -0800
 Subject: [PATCH] adding missing rcu_read_unlock in ipxip6_rcv
@@ -17,12 +17,13 @@ Fixes: 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnels")
 Signed-off-by: Nikita V. Shirokov <tehnerd@fb.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/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
-index 3d3092adf1d2..db84f523656d 100644
+index 61fcd7b9f85a..596af8f11ee8 100644
 --- a/net/ipv6/ip6_tunnel.c
 +++ b/net/ipv6/ip6_tunnel.c
-@@ -904,7 +904,7 @@ static int ipxip6_rcv(struct sk_buff *skb, u8 ipproto,
+@@ -912,7 +912,7 @@ static int ipxip6_rcv(struct sk_buff *skb, u8 ipproto,
  		if (t->parms.collect_md) {
  			tun_dst = ipv6_tun_rx_dst(skb, 0, 0, 0);
  			if (!tun_dst)
diff --git a/queue/arm-arm64-smccc-Add-SMCCC-specific-return-codes.patch b/queue/arm-arm64-smccc-Add-SMCCC-specific-return-codes.patch
index 57eadd2..767977a 100644
--- a/queue/arm-arm64-smccc-Add-SMCCC-specific-return-codes.patch
+++ b/queue/arm-arm64-smccc-Add-SMCCC-specific-return-codes.patch
@@ -1,4 +1,4 @@
-From eff0e9e1078ea7dc1d794dc50e31baef984c46d7 Mon Sep 17 00:00:00 2001
+From 63edf67225c02513ca6a7b5b79807434b9e776b5 Mon Sep 17 00:00:00 2001
 From: Marc Zyngier <marc.zyngier@arm.com>
 Date: Tue, 29 May 2018 13:11:05 +0100
 Subject: [PATCH] arm/arm64: smccc: Add SMCCC-specific return codes
@@ -16,6 +16,7 @@ Acked-by: Will Deacon <will.deacon@arm.com>
 Reviewed-by: Mark Rutland <mark.rutland@arm.com>
 Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
 Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
 index a031897fca76..c89da86de99f 100644
diff --git a/queue/arm64-Add-per-cpu-infrastructure-to-call-ARCH_WORKAR.patch b/queue/arm64-Add-per-cpu-infrastructure-to-call-ARCH_WORKAR.patch
index 1b8a5a5..29bdb14 100644
--- a/queue/arm64-Add-per-cpu-infrastructure-to-call-ARCH_WORKAR.patch
+++ b/queue/arm64-Add-per-cpu-infrastructure-to-call-ARCH_WORKAR.patch
@@ -1,4 +1,4 @@
-From 5cf9ce6e5ea50f805c6188c04ed0daaec7b6887d Mon Sep 17 00:00:00 2001
+From a28d0fda1e6265126a40443b6adde494c1b42480 Mon Sep 17 00:00:00 2001
 From: Marc Zyngier <marc.zyngier@arm.com>
 Date: Tue, 29 May 2018 13:11:07 +0100
 Subject: [PATCH] arm64: Add per-cpu infrastructure to call ARCH_WORKAROUND_2
@@ -14,12 +14,13 @@ Reviewed-by: Mark Rutland <mark.rutland@arm.com>
 Acked-by: Will Deacon <will.deacon@arm.com>
 Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
 Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
-index c1eda6be7758..cd91ca0250f1 100644
+index e4e40628a798..60f64a0702e7 100644
 --- a/arch/arm64/kernel/cpu_errata.c
 +++ b/arch/arm64/kernel/cpu_errata.c
-@@ -233,6 +233,8 @@ enable_smccc_arch_workaround_1(const struct arm64_cpu_capabilities *entry)
+@@ -229,6 +229,8 @@ static int qcom_enable_link_stack_sanitization(void *data)
  #endif	/* CONFIG_HARDEN_BRANCH_PREDICTOR */
  
  #ifdef CONFIG_ARM64_SSBD
@@ -29,7 +30,7 @@ index c1eda6be7758..cd91ca0250f1 100644
  				       __le32 *origptr, __le32 *updptr,
  				       int nr_inst)
 diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
-index f33e6aed3037..29ad672a6abd 100644
+index f9473efee9c5..caa77d060af1 100644
 --- a/arch/arm64/kernel/entry.S
 +++ b/arch/arm64/kernel/entry.S
 @@ -140,8 +140,10 @@ alternative_else_nop_endif
@@ -59,7 +60,7 @@ index f33e6aed3037..29ad672a6abd 100644
  
  	mov	x29, xzr			// fp pointed to user-space
  	.else
-@@ -323,8 +326,8 @@ alternative_if ARM64_WORKAROUND_845719
+@@ -321,8 +324,8 @@ alternative_if ARM64_WORKAROUND_845719
  alternative_else_nop_endif
  #endif
  3:
diff --git a/queue/arm64-alternatives-use-tpidr_el2-on-VHE-hosts.patch b/queue/arm64-alternatives-use-tpidr_el2-on-VHE-hosts.patch
index 188fa7c..100533d 100644
--- a/queue/arm64-alternatives-use-tpidr_el2-on-VHE-hosts.patch
+++ b/queue/arm64-alternatives-use-tpidr_el2-on-VHE-hosts.patch
@@ -1,4 +1,4 @@
-From 6d99b68933fbcf51f84fcbba49246ce1209ec193 Mon Sep 17 00:00:00 2001
+From 9ba72323c42a30be3588e6486a41c4f1ad93bd21 Mon Sep 17 00:00:00 2001
 From: James Morse <james.morse@arm.com>
 Date: Mon, 8 Jan 2018 15:38:06 +0000
 Subject: [PATCH] arm64: alternatives: use tpidr_el2 on VHE hosts
@@ -14,12 +14,13 @@ Signed-off-by: James Morse <james.morse@arm.com>
 Reviewed-by: Christoffer Dall <cdall@linaro.org>
 Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
 Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/arch/arm64/include/asm/alternative.h b/arch/arm64/include/asm/alternative.h
-index 4a85c6952a22..669028172fd6 100644
+index 6e1cb8c5af4d..f9e2f69f296e 100644
 --- a/arch/arm64/include/asm/alternative.h
 +++ b/arch/arm64/include/asm/alternative.h
-@@ -12,6 +12,8 @@
+@@ -11,6 +11,8 @@
  #include <linux/stddef.h>
  #include <linux/stringify.h>
  
@@ -29,10 +30,10 @@ index 4a85c6952a22..669028172fd6 100644
  	s32 orig_offset;	/* offset to original instruction */
  	s32 alt_offset;		/* offset to replacement instruction */
 diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
-index a6f90b648655..5dc4856f3bb9 100644
+index f8ef1424b6c5..527aa32e4e44 100644
 --- a/arch/arm64/include/asm/assembler.h
 +++ b/arch/arm64/include/asm/assembler.h
-@@ -254,7 +254,11 @@ lr	.req	x30		// link register
+@@ -259,7 +259,11 @@ lr	.req	x30		// link register
  #else
  	adr_l	\dst, \sym
  #endif
@@ -44,7 +45,7 @@ index a6f90b648655..5dc4856f3bb9 100644
  	add	\dst, \dst, \tmp
  	.endm
  
-@@ -265,7 +269,11 @@ lr	.req	x30		// link register
+@@ -270,7 +274,11 @@ lr	.req	x30		// link register
  	 */
  	.macro ldr_this_cpu dst, sym, tmp
  	adr_l	\dst, \sym
@@ -90,7 +91,7 @@ index 3bd498e4de4c..43393208229e 100644
  
  	return off;
 diff --git a/arch/arm64/kernel/alternative.c b/arch/arm64/kernel/alternative.c
-index 6dd0a3a3e5c9..414288a558c8 100644
+index 8840c109c5d6..7293839a4e2b 100644
 --- a/arch/arm64/kernel/alternative.c
 +++ b/arch/arm64/kernel/alternative.c
 @@ -32,6 +32,8 @@
@@ -129,10 +130,10 @@ index 6dd0a3a3e5c9..414288a558c8 100644
  
  	return 0;
 diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
-index da6722db50b0..9ef84d0def9a 100644
+index 128d7f6fc190..a2f623837d81 100644
 --- a/arch/arm64/kernel/cpufeature.c
 +++ b/arch/arm64/kernel/cpufeature.c
-@@ -886,6 +886,22 @@ static int __init parse_kpti(char *str)
+@@ -857,6 +857,22 @@ static int __init parse_kpti(char *str)
  __setup("kpti=", parse_kpti);
  #endif	/* CONFIG_UNMAP_KERNEL_AT_EL0 */
  
@@ -155,7 +156,7 @@ index da6722db50b0..9ef84d0def9a 100644
  static const struct arm64_cpu_capabilities arm64_features[] = {
  	{
  		.desc = "GIC system register CPU interface",
-@@ -955,6 +971,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = {
+@@ -926,6 +942,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = {
  		.capability = ARM64_HAS_VIRT_HOST_EXTN,
  		.def_scope = SCOPE_SYSTEM,
  		.matches = runs_at_el2,
@@ -164,7 +165,7 @@ index da6722db50b0..9ef84d0def9a 100644
  	{
  		.desc = "32-bit EL0 Support",
 diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
-index bc86f7ef8620..5a59eea49395 100644
+index 27058f3fd132..abd55042bdc5 100644
 --- a/arch/arm64/mm/proc.S
 +++ b/arch/arm64/mm/proc.S
 @@ -70,7 +70,11 @@ ENTRY(cpu_do_suspend)
diff --git a/queue/arm64-ssbd-Add-global-mitigation-state-accessor.patch b/queue/arm64-ssbd-Add-global-mitigation-state-accessor.patch
index eb9553f..a2d383e 100644
--- a/queue/arm64-ssbd-Add-global-mitigation-state-accessor.patch
+++ b/queue/arm64-ssbd-Add-global-mitigation-state-accessor.patch
@@ -1,4 +1,4 @@
-From c32e1736ca03904c03de0e4459a673be194f56fd Mon Sep 17 00:00:00 2001
+From f77b6fcc9d72747cbc21640c383e37231bf84c81 Mon Sep 17 00:00:00 2001
 From: Marc Zyngier <marc.zyngier@arm.com>
 Date: Tue, 29 May 2018 13:11:10 +0100
 Subject: [PATCH] arm64: ssbd: Add global mitigation state accessor
@@ -16,12 +16,13 @@ Reviewed-by: Mark Rutland <mark.rutland@arm.com>
 Acked-by: Will Deacon <will.deacon@arm.com>
 Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
 Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
-index b50650f3e496..b0fc3224ce8a 100644
+index 0bd5ebfb328e..a2415ee6b8a3 100644
 --- a/arch/arm64/include/asm/cpufeature.h
 +++ b/arch/arm64/include/asm/cpufeature.h
-@@ -543,6 +543,16 @@ static inline u64 read_zcr_features(void)
+@@ -268,6 +268,16 @@ static inline bool system_uses_ttbr0_pan(void)
  #define ARM64_SSBD_FORCE_ENABLE		2
  #define ARM64_SSBD_MITIGATED		3
  
diff --git a/queue/arm64-ssbd-Skip-apply_ssbd-if-not-using-dynamic-miti.patch b/queue/arm64-ssbd-Skip-apply_ssbd-if-not-using-dynamic-miti.patch
index a3e19a2..fd4edf0 100644
--- a/queue/arm64-ssbd-Skip-apply_ssbd-if-not-using-dynamic-miti.patch
+++ b/queue/arm64-ssbd-Skip-apply_ssbd-if-not-using-dynamic-miti.patch
@@ -1,4 +1,4 @@
-From 986372c4367f46b34a3c0f6918d7fb95cbdf39d6 Mon Sep 17 00:00:00 2001
+From 6ea983c8250f33ec85c16d8aaccf4e5b146bf9db Mon Sep 17 00:00:00 2001
 From: Marc Zyngier <marc.zyngier@arm.com>
 Date: Tue, 29 May 2018 13:11:11 +0100
 Subject: [PATCH] arm64: ssbd: Skip apply_ssbd if not using dynamic mitigation
@@ -17,12 +17,13 @@ Reviewed-by: Mark Rutland <mark.rutland@arm.com>
 Acked-by: Will Deacon <will.deacon@arm.com>
 Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
 Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
-index 1075f90fdd8c..2797bc2c8c6a 100644
+index 6b866d90c867..23905cc19a1a 100644
 --- a/arch/arm64/kernel/cpu_errata.c
 +++ b/arch/arm64/kernel/cpu_errata.c
-@@ -289,6 +289,20 @@ void __init arm64_update_smccc_conduit(struct alt_instr *alt,
+@@ -285,6 +285,20 @@ void __init arm64_update_smccc_conduit(struct alt_instr *alt,
  	*updptr = cpu_to_le32(insn);
  }
  
@@ -44,7 +45,7 @@ index 1075f90fdd8c..2797bc2c8c6a 100644
  {
  	switch (psci_ops.conduit) {
 diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
-index 29ad672a6abd..e6f6e2339b22 100644
+index caa77d060af1..5a585976d14c 100644
 --- a/arch/arm64/kernel/entry.S
 +++ b/arch/arm64/kernel/entry.S
 @@ -142,6 +142,9 @@ alternative_else_nop_endif
diff --git a/queue/drivers-base-cacheinfo-fix-cache-type-for-non-archit.patch b/queue/drivers-base-cacheinfo-fix-cache-type-for-non-archit.patch
index 8fd1bec..781e2ba 100644
--- a/queue/drivers-base-cacheinfo-fix-cache-type-for-non-archit.patch
+++ b/queue/drivers-base-cacheinfo-fix-cache-type-for-non-archit.patch
@@ -1,4 +1,4 @@
-From f57ab9a01a36ef3454333251cc57e3a9948b17bf Mon Sep 17 00:00:00 2001
+From 8b4b6f94bd6e51b2d78cffc80092d1a82c65de2f Mon Sep 17 00:00:00 2001
 From: Sudeep Holla <sudeep.holla@arm.com>
 Date: Fri, 17 Nov 2017 11:56:41 +0000
 Subject: [PATCH] drivers: base: cacheinfo: fix cache type for non-architected
@@ -20,6 +20,7 @@ Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
 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/base/cacheinfo.c b/drivers/base/cacheinfo.c
 index eb3af2739537..07532d83be0b 100644
diff --git a/queue/gpio-fix-gpio-line-names-property-retrieval.patch b/queue/gpio-fix-gpio-line-names-property-retrieval.patch
index 4d1cfe8..931ed86 100644
--- a/queue/gpio-fix-gpio-line-names-property-retrieval.patch
+++ b/queue/gpio-fix-gpio-line-names-property-retrieval.patch
@@ -1,4 +1,4 @@
-From 822703354774ec935169cbbc8d503236bcb54fda Mon Sep 17 00:00:00 2001
+From f2f2a33131c15dd4b54adbfa3c96d69618e07524 Mon Sep 17 00:00:00 2001
 From: Christophe Leroy <christophe.leroy@c-s.fr>
 Date: Fri, 15 Dec 2017 15:02:33 +0100
 Subject: [PATCH] gpio: fix "gpio-line-names" property retrieval
@@ -22,12 +22,13 @@ Cc: stable@vger.kernel.org
 Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
 Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
-index eb4528c87c0b..d6f3d9ee1350 100644
+index 8fa5fcd00e9a..6d02e07639cf 100644
 --- a/drivers/gpio/gpiolib-acpi.c
 +++ b/drivers/gpio/gpiolib-acpi.c
-@@ -1074,7 +1074,7 @@ void acpi_gpiochip_add(struct gpio_chip *chip)
+@@ -1004,7 +1004,7 @@ void acpi_gpiochip_add(struct gpio_chip *chip)
  	}
  
  	if (!chip->names)
@@ -90,10 +91,10 @@ index 27f383bda7d9..f748aa3e77f7 100644
  		return;
  	}
 diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
-index e0d59e61b52f..72a0695d2ac3 100644
+index b13b7c7c335f..e6d51e018bf1 100644
 --- a/drivers/gpio/gpiolib-of.c
 +++ b/drivers/gpio/gpiolib-of.c
-@@ -493,7 +493,8 @@ int of_gpiochip_add(struct gpio_chip *chip)
+@@ -492,7 +492,8 @@ int of_gpiochip_add(struct gpio_chip *chip)
  
  	/* If the chip defines names itself, these take precedence */
  	if (!chip->names)
@@ -104,10 +105,10 @@ index e0d59e61b52f..72a0695d2ac3 100644
  	of_node_get(chip->of_node);
  
 diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h
-index af48322839c3..6c44d1652139 100644
+index 2495b7ee1b42..0799a25c130d 100644
 --- a/drivers/gpio/gpiolib.h
 +++ b/drivers/gpio/gpiolib.h
-@@ -228,7 +228,8 @@ static inline int gpio_chip_hwgpio(const struct gpio_desc *desc)
+@@ -210,7 +210,8 @@ static int __maybe_unused gpio_chip_hwgpio(const struct gpio_desc *desc)
  	return desc - &desc->gdev->descs[0];
  }
  
diff --git a/queue/ip6_gre-fix-device-features-for-ioctl-setup.patch b/queue/ip6_gre-fix-device-features-for-ioctl-setup.patch
index 8e9904a..213e32a 100644
--- a/queue/ip6_gre-fix-device-features-for-ioctl-setup.patch
+++ b/queue/ip6_gre-fix-device-features-for-ioctl-setup.patch
@@ -1,4 +1,4 @@
-From e5a9336adb317db55eb3fe8200856096f3c71109 Mon Sep 17 00:00:00 2001
+From 97c141ac41c58088ef57152f8010a7184738f540 Mon Sep 17 00:00:00 2001
 From: Alexey Kodanev <alexey.kodanev@oracle.com>
 Date: Wed, 20 Dec 2017 19:36:03 +0300
 Subject: [PATCH] ip6_gre: fix device features for ioctl setup
@@ -43,12 +43,13 @@ The moved code also contains two minor style fixes:
 Fixes: ac4eb009e477 ("ip6gre: Add support for basic offloads offloads excluding GSO")
 Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
-index 416c8913f132..772695960890 100644
+index 5853518d812f..e10c247b047b 100644
 --- a/net/ipv6/ip6_gre.c
 +++ b/net/ipv6/ip6_gre.c
-@@ -1014,6 +1014,36 @@ static void ip6gre_tunnel_setup(struct net_device *dev)
+@@ -1020,6 +1020,36 @@ static void ip6gre_tunnel_setup(struct net_device *dev)
  	eth_random_addr(dev->perm_addr);
  }
  
@@ -85,7 +86,7 @@ index 416c8913f132..772695960890 100644
  static int ip6gre_tunnel_init_common(struct net_device *dev)
  {
  	struct ip6_tnl *tunnel;
-@@ -1048,6 +1078,8 @@ static int ip6gre_tunnel_init_common(struct net_device *dev)
+@@ -1054,6 +1084,8 @@ static int ip6gre_tunnel_init_common(struct net_device *dev)
  	if (!(tunnel->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))
  		dev->mtu -= 8;
  
@@ -94,7 +95,7 @@ index 416c8913f132..772695960890 100644
  	return 0;
  }
  
-@@ -1298,11 +1330,6 @@ static const struct net_device_ops ip6gre_tap_netdev_ops = {
+@@ -1300,11 +1332,6 @@ static const struct net_device_ops ip6gre_tap_netdev_ops = {
  	.ndo_get_iflink = ip6_tnl_get_iflink,
  };
  
diff --git a/queue/ipv4-Fix-use-after-free-when-flushing-FIB-tables.patch b/queue/ipv4-Fix-use-after-free-when-flushing-FIB-tables.patch
index bc2f258..b929c82 100644
--- a/queue/ipv4-Fix-use-after-free-when-flushing-FIB-tables.patch
+++ b/queue/ipv4-Fix-use-after-free-when-flushing-FIB-tables.patch
@@ -1,4 +1,4 @@
-From b4681c2829e24943aadd1a7bb3a30d41d0a20050 Mon Sep 17 00:00:00 2001
+From 59da42b3afbbce660b6751dd0955b5b00270ad47 Mon Sep 17 00:00:00 2001
 From: Ido Schimmel <idosch@mellanox.com>
 Date: Wed, 20 Dec 2017 19:34:19 +0200
 Subject: [PATCH] ipv4: Fix use-after-free when flushing FIB tables
@@ -25,12 +25,13 @@ Signed-off-by: Ido Schimmel <idosch@mellanox.com>
 Reported-by: Fengguang Wu <fengguang.wu@intel.com>
 Acked-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/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
-index f52d27a422c3..08259d078b1c 100644
+index 3acc8261477c..8252f089ffed 100644
 --- a/net/ipv4/fib_frontend.c
 +++ b/net/ipv4/fib_frontend.c
-@@ -1298,14 +1298,19 @@ err_table_hash_alloc:
+@@ -1261,14 +1261,19 @@ static int __net_init ip_fib_net_init(struct net *net)
  
  static void ip_fib_net_exit(struct net *net)
  {
diff --git a/queue/iw_cxgb4-Only-validate-the-MSN-for-successful-comple.patch b/queue/iw_cxgb4-Only-validate-the-MSN-for-successful-comple.patch
index 70b9a67..8042f13 100644
--- a/queue/iw_cxgb4-Only-validate-the-MSN-for-successful-comple.patch
+++ b/queue/iw_cxgb4-Only-validate-the-MSN-for-successful-comple.patch
@@ -1,4 +1,4 @@
-From f55688c45442bc863f40ad678c638785b26cdce6 Mon Sep 17 00:00:00 2001
+From d2441e13e14ab7fe4e498b4bbabcd3ff353e562b Mon Sep 17 00:00:00 2001
 From: Steve Wise <swise@opengridcomputing.com>
 Date: Mon, 18 Dec 2017 13:10:00 -0800
 Subject: [PATCH] iw_cxgb4: Only validate the MSN for successful completions
@@ -12,12 +12,13 @@ status (BAD_MSN instead of FLUSHED).
 Cc: stable@vger.kernel.org
 Signed-off-by: Steve Wise <swise@opengridcomputing.com>
 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 b7bfc536e00f..7ed87622e461 100644
+index 620a8be5b1ce..d19c1f577104 100644
 --- a/drivers/infiniband/hw/cxgb4/cq.c
 +++ b/drivers/infiniband/hw/cxgb4/cq.c
-@@ -571,10 +571,10 @@ static int poll_cq(struct t4_wq *wq, struct t4_cq *cq, struct t4_cqe *cqe,
+@@ -588,10 +588,10 @@ static int poll_cq(struct t4_wq *wq, struct t4_cq *cq, struct t4_cqe *cqe,
  			ret = -EAGAIN;
  			goto skip_cqe;
  		}
diff --git a/queue/kbuild-add-fno-stack-check-to-kernel-build-options.patch b/queue/kbuild-add-fno-stack-check-to-kernel-build-options.patch
index 2f3ad56..be4233d 100644
--- a/queue/kbuild-add-fno-stack-check-to-kernel-build-options.patch
+++ b/queue/kbuild-add-fno-stack-check-to-kernel-build-options.patch
@@ -1,4 +1,4 @@
-From 3ce120b16cc548472f80cf8644f90eda958cf1b6 Mon Sep 17 00:00:00 2001
+From 250160ad620a002734e690cc9090af84a9aef2e0 Mon Sep 17 00:00:00 2001
 From: Linus Torvalds <torvalds@linux-foundation.org>
 Date: Fri, 29 Dec 2017 17:34:43 -0800
 Subject: [PATCH] kbuild: add '-fno-stack-check' to kernel build options
@@ -28,12 +28,13 @@ Cc: Dave Hansen <dave.hansen@intel.com>
 Cc: Jiri Kosina <jikos@kernel.org>
 Cc: Andy Lutomirski <luto@amacapital.net>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/Makefile b/Makefile
-index ac8c441866b7..92b74bcd3c2a 100644
+index 4a1766b1d5cf..53059af372f5 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -789,6 +789,9 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign)
+@@ -801,6 +801,9 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign)
  # disable invalid "can't wrap" optimizations for signed / pointers
  KBUILD_CFLAGS	+= $(call cc-option,-fno-strict-overflow)
  
diff --git a/queue/n_tty-fix-EXTPROC-vs-ICANON-interaction-with-TIOCINQ.patch b/queue/n_tty-fix-EXTPROC-vs-ICANON-interaction-with-TIOCINQ.patch
index cc7d411..9cc73f2 100644
--- a/queue/n_tty-fix-EXTPROC-vs-ICANON-interaction-with-TIOCINQ.patch
+++ b/queue/n_tty-fix-EXTPROC-vs-ICANON-interaction-with-TIOCINQ.patch
@@ -1,4 +1,4 @@
-From 966031f340185eddd05affcf72b740549f056348 Mon Sep 17 00:00:00 2001
+From f0f1be04f84475fe5f79b5bbd7522abc1e45ffd2 Mon Sep 17 00:00:00 2001
 From: Linus Torvalds <torvalds@linux-foundation.org>
 Date: Wed, 20 Dec 2017 17:57:06 -0800
 Subject: [PATCH] n_tty: fix EXTPROC vs ICANON interaction with TIOCINQ (aka
@@ -36,12 +36,13 @@ Reported-by: syzkaller <syzkaller@googlegroups.com>
 Cc: Jiri Slaby <jslaby@suse.com>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
-index 427e0d5d8f13..539b49adb6af 100644
+index bdf0e6e89991..faf50df81622 100644
 --- a/drivers/tty/n_tty.c
 +++ b/drivers/tty/n_tty.c
-@@ -1762,7 +1762,7 @@ static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
+@@ -1764,7 +1764,7 @@ static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
  {
  	struct n_tty_data *ldata = tty->disc_data;
  
@@ -50,7 +51,7 @@ index 427e0d5d8f13..539b49adb6af 100644
  		bitmap_zero(ldata->read_flags, N_TTY_BUF_SIZE);
  		ldata->line_start = ldata->read_tail;
  		if (!L_ICANON(tty) || !read_cnt(ldata)) {
-@@ -2425,7 +2425,7 @@ static int n_tty_ioctl(struct tty_struct *tty, struct file *file,
+@@ -2427,7 +2427,7 @@ static int n_tty_ioctl(struct tty_struct *tty, struct file *file,
  		return put_user(tty_chars_in_buffer(tty), (int __user *) arg);
  	case TIOCINQ:
  		down_write(&tty->termios_rwsem);
diff --git a/queue/net-dsa-bcm_sf2-Clear-IDDQ_GLOBAL_PWR-bit-for-PHY.patch b/queue/net-dsa-bcm_sf2-Clear-IDDQ_GLOBAL_PWR-bit-for-PHY.patch
index fdbcd09..deba3cd 100644
--- a/queue/net-dsa-bcm_sf2-Clear-IDDQ_GLOBAL_PWR-bit-for-PHY.patch
+++ b/queue/net-dsa-bcm_sf2-Clear-IDDQ_GLOBAL_PWR-bit-for-PHY.patch
@@ -1,4 +1,4 @@
-From 4b52d010113e11006a389f2a8315167ede9e0b10 Mon Sep 17 00:00:00 2001
+From 421b41d180ae652da0666d87dbb3cae8cfb55e59 Mon Sep 17 00:00:00 2001
 From: Florian Fainelli <f.fainelli@gmail.com>
 Date: Tue, 21 Nov 2017 17:37:46 -0800
 Subject: [PATCH] net: dsa: bcm_sf2: Clear IDDQ_GLOBAL_PWR bit for PHY
@@ -12,12 +12,13 @@ of suspend/resume cycles.
 Fixes: 0fe9933804eb ("net: dsa: bcm_sf2: Add support for BCM7278 integrated switch")
 Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
-index 93faa1fed6f2..ea01f24f15e7 100644
+index e0e14f7cd208..48965f86bef0 100644
 --- a/drivers/net/dsa/bcm_sf2.c
 +++ b/drivers/net/dsa/bcm_sf2.c
-@@ -95,7 +95,7 @@ static void bcm_sf2_gphy_enable_set(struct dsa_switch *ds, bool enable)
+@@ -159,7 +159,7 @@ static void bcm_sf2_gphy_enable_set(struct dsa_switch *ds, bool enable)
  	reg = reg_readl(priv, REG_SPHY_CNTRL);
  	if (enable) {
  		reg |= PHY_RESET;
diff --git a/queue/net-fec-unmap-the-xmit-buffer-that-are-not-transferr.patch b/queue/net-fec-unmap-the-xmit-buffer-that-are-not-transferr.patch
index c1e7067..701d6e8 100644
--- a/queue/net-fec-unmap-the-xmit-buffer-that-are-not-transferr.patch
+++ b/queue/net-fec-unmap-the-xmit-buffer-that-are-not-transferr.patch
@@ -1,4 +1,4 @@
-From 178e5f57a8d8f8fc5799a624b96fc31ef9a29ffa Mon Sep 17 00:00:00 2001
+From 0eddb5cb36619602e887930444e04e632addfb8e Mon Sep 17 00:00:00 2001
 From: Fugang Duan <fugang.duan@nxp.com>
 Date: Fri, 22 Dec 2017 17:12:09 +0800
 Subject: [PATCH] net: fec: unmap the xmit buffer that are not transferred by
@@ -21,12 +21,13 @@ So it should check the dma mapping buffer and unmap them.
 
 Signed-off-by: Fugang Duan <fugang.duan@nxp.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/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
-index 610573855213..8184d2fca9be 100644
+index 01084cd4a5c1..ce97f78edd3e 100644
 --- a/drivers/net/ethernet/freescale/fec_main.c
 +++ b/drivers/net/ethernet/freescale/fec_main.c
-@@ -818,6 +818,12 @@ static void fec_enet_bd_init(struct net_device *dev)
+@@ -816,6 +816,12 @@ static void fec_enet_bd_init(struct net_device *dev)
  		for (i = 0; i < txq->bd.ring_size; i++) {
  			/* Initialize the BD for every fragment in the page. */
  			bdp->cbd_sc = cpu_to_fec16(0);
diff --git a/queue/net-igmp-Use-correct-source-address-on-IGMPv3-report.patch b/queue/net-igmp-Use-correct-source-address-on-IGMPv3-report.patch
index fecf122..2ea5617 100644
--- a/queue/net-igmp-Use-correct-source-address-on-IGMPv3-report.patch
+++ b/queue/net-igmp-Use-correct-source-address-on-IGMPv3-report.patch
@@ -1,4 +1,4 @@
-From a46182b00290839fa3fa159d54fd3237bd8669f0 Mon Sep 17 00:00:00 2001
+From db3ec4f633d952be1c95e5bac54aaa29ad505195 Mon Sep 17 00:00:00 2001
 From: Kevin Cernekee <cernekee@chromium.org>
 Date: Mon, 11 Dec 2017 11:13:45 -0800
 Subject: [PATCH] net: igmp: Use correct source address on IGMPv3 reports
@@ -35,9 +35,10 @@ extra check to make sure this is the case.
 Signed-off-by: Kevin Cernekee <cernekee@chromium.org>
 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
-index 50448a220a1f..726f6b608274 100644
+index ae22f444a795..da059b467fab 100644
 --- a/net/ipv4/igmp.c
 +++ b/net/ipv4/igmp.c
 @@ -89,6 +89,7 @@
diff --git a/queue/net-mlx5-Fix-error-flow-in-CREATE_QP-command.patch b/queue/net-mlx5-Fix-error-flow-in-CREATE_QP-command.patch
index 141ba9a..52497f9 100644
--- a/queue/net-mlx5-Fix-error-flow-in-CREATE_QP-command.patch
+++ b/queue/net-mlx5-Fix-error-flow-in-CREATE_QP-command.patch
@@ -1,4 +1,4 @@
-From dbff26e44dc3ec4de6578733b054a0114652a764 Mon Sep 17 00:00:00 2001
+From cc84a859d58c27fc888a542b4d56789a0f1bc58d Mon Sep 17 00:00:00 2001
 From: Moni Shoua <monis@mellanox.com>
 Date: Mon, 4 Dec 2017 08:59:25 +0200
 Subject: [PATCH] net/mlx5: Fix error flow in CREATE_QP command
@@ -12,12 +12,13 @@ Fix that.
 Fixes: 09a7d9eca1a6 '{net,IB}/mlx5: QP/XRCD commands via mlx5 ifc'
 Signed-off-by: Moni Shoua <monis@mellanox.com>
 Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/qp.c b/drivers/net/ethernet/mellanox/mlx5/core/qp.c
-index db9e665ab104..889130edb715 100644
+index cbbcef2884be..3a2dca7acf9a 100644
 --- a/drivers/net/ethernet/mellanox/mlx5/core/qp.c
 +++ b/drivers/net/ethernet/mellanox/mlx5/core/qp.c
-@@ -213,8 +213,8 @@ int mlx5_core_create_qp(struct mlx5_core_dev *dev,
+@@ -214,8 +214,8 @@ int mlx5_core_create_qp(struct mlx5_core_dev *dev,
  err_cmd:
  	memset(din, 0, sizeof(din));
  	memset(dout, 0, sizeof(dout));
diff --git a/queue/net-mlx5-Fix-rate-limit-packet-pacing-naming-and-str.patch b/queue/net-mlx5-Fix-rate-limit-packet-pacing-naming-and-str.patch
index 2300283..1ddf67d 100644
--- a/queue/net-mlx5-Fix-rate-limit-packet-pacing-naming-and-str.patch
+++ b/queue/net-mlx5-Fix-rate-limit-packet-pacing-naming-and-str.patch
@@ -1,4 +1,4 @@
-From 37e92a9d4fe38dc3e7308913575983a6a088c8d4 Mon Sep 17 00:00:00 2001
+From 62ae966d0b30f78c76da7f99046ec0db0274f93a Mon Sep 17 00:00:00 2001
 From: Eran Ben Elisha <eranbe@mellanox.com>
 Date: Mon, 13 Nov 2017 10:11:27 +0200
 Subject: [PATCH] net/mlx5: Fix rate limit packet pacing naming and struct
@@ -16,9 +16,10 @@ Fixes: 7486216b3a0b ("{net,IB}/mlx5: mlx5_ifc updates")
 Fixes: 1466cc5b23d1 ("net/mlx5: Rate limit tables support")
 Signed-off-by: Eran Ben Elisha <eranbe@mellanox.com>
 Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
-index 1fffdebbc9e8..e9a1fbcc4adf 100644
+index ac0a460c006a..b75b65ef712f 100644
 --- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
 +++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
 @@ -362,7 +362,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op,
@@ -30,7 +31,7 @@ index 1fffdebbc9e8..e9a1fbcc4adf 100644
  	case MLX5_CMD_OP_QUERY_RATE_LIMIT:
  	case MLX5_CMD_OP_CREATE_SCHEDULING_ELEMENT:
  	case MLX5_CMD_OP_QUERY_SCHEDULING_ELEMENT:
-@@ -505,7 +505,7 @@ const char *mlx5_command_str(int command)
+@@ -501,7 +501,7 @@ const char *mlx5_command_str(int command)
  	MLX5_COMMAND_STR_CASE(ALLOC_Q_COUNTER);
  	MLX5_COMMAND_STR_CASE(DEALLOC_Q_COUNTER);
  	MLX5_COMMAND_STR_CASE(QUERY_Q_COUNTER);
@@ -97,10 +98,10 @@ index e651e4c02867..d3c33e9eea72 100644
  	kfree(dev->priv.rl_table.rl_entry);
  }
 diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
-index 38a7577a9ce7..d44ec5f41d4a 100644
+index e21a0b3d6454..2511dd97598b 100644
 --- a/include/linux/mlx5/mlx5_ifc.h
 +++ b/include/linux/mlx5/mlx5_ifc.h
-@@ -147,7 +147,7 @@ enum {
+@@ -144,7 +144,7 @@ enum {
  	MLX5_CMD_OP_ALLOC_Q_COUNTER               = 0x771,
  	MLX5_CMD_OP_DEALLOC_Q_COUNTER             = 0x772,
  	MLX5_CMD_OP_QUERY_Q_COUNTER               = 0x773,
@@ -109,7 +110,7 @@ index 38a7577a9ce7..d44ec5f41d4a 100644
  	MLX5_CMD_OP_QUERY_RATE_LIMIT              = 0x781,
  	MLX5_CMD_OP_CREATE_SCHEDULING_ELEMENT      = 0x782,
  	MLX5_CMD_OP_DESTROY_SCHEDULING_ELEMENT     = 0x783,
-@@ -7239,7 +7239,7 @@ struct mlx5_ifc_add_vxlan_udp_dport_in_bits {
+@@ -7108,7 +7108,7 @@ struct mlx5_ifc_add_vxlan_udp_dport_in_bits {
  	u8         vxlan_udp_port[0x10];
  };
  
@@ -118,7 +119,7 @@ index 38a7577a9ce7..d44ec5f41d4a 100644
  	u8         status[0x8];
  	u8         reserved_at_8[0x18];
  
-@@ -7248,7 +7248,7 @@ struct mlx5_ifc_set_rate_limit_out_bits {
+@@ -7117,7 +7117,7 @@ struct mlx5_ifc_set_rate_limit_out_bits {
  	u8         reserved_at_40[0x40];
  };
  
@@ -127,7 +128,7 @@ index 38a7577a9ce7..d44ec5f41d4a 100644
  	u8         opcode[0x10];
  	u8         reserved_at_10[0x10];
  
-@@ -7261,6 +7261,8 @@ struct mlx5_ifc_set_rate_limit_in_bits {
+@@ -7130,6 +7130,8 @@ struct mlx5_ifc_set_rate_limit_in_bits {
  	u8         reserved_at_60[0x20];
  
  	u8         rate_limit[0x20];
diff --git a/queue/net-mlx5e-Add-refcount-to-VXLAN-structure.patch b/queue/net-mlx5e-Add-refcount-to-VXLAN-structure.patch
index f60418e..fd64a7f 100644
--- a/queue/net-mlx5e-Add-refcount-to-VXLAN-structure.patch
+++ b/queue/net-mlx5e-Add-refcount-to-VXLAN-structure.patch
@@ -1,4 +1,4 @@
-From 23f4cc2cd9ed92570647220aca60d0197d8c1fa9 Mon Sep 17 00:00:00 2001
+From 7ba844cc4c7595f57cc68762e4e46fbabf728115 Mon Sep 17 00:00:00 2001
 From: Gal Pressman <galp@mellanox.com>
 Date: Sun, 3 Dec 2017 13:58:50 +0200
 Subject: [PATCH] net/mlx5e: Add refcount to VXLAN structure
@@ -20,6 +20,7 @@ consumers are gone.
 Fixes: b3f63c3d5e2c ("net/mlx5e: Add netdev support for VXLAN tunneling")
 Signed-off-by: Gal Pressman <galp@mellanox.com>
 Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c
 index f8238275759f..25f782344667 100644
@@ -46,7 +47,7 @@ index f8238275759f..25f782344667 100644
  
  	spin_lock_bh(&vxlan_db->lock);
  	err = radix_tree_insert(&vxlan_db->tree, vxlan->udp_port, vxlan);
-@@ -116,32 +120,33 @@ free_work:
+@@ -116,32 +120,33 @@ static void mlx5e_vxlan_add_port(struct work_struct *work)
  	kfree(vxlan_work);
  }
  
diff --git a/queue/net-mlx5e-Fix-possible-deadlock-of-VXLAN-lock.patch b/queue/net-mlx5e-Fix-possible-deadlock-of-VXLAN-lock.patch
index 80ca818..05da45d 100644
--- a/queue/net-mlx5e-Fix-possible-deadlock-of-VXLAN-lock.patch
+++ b/queue/net-mlx5e-Fix-possible-deadlock-of-VXLAN-lock.patch
@@ -1,4 +1,4 @@
-From 6323514116404cc651df1b7fffa1311ddf8ce647 Mon Sep 17 00:00:00 2001
+From bf7d49b98231159298f6d7c0463d9d7c5fe543f8 Mon Sep 17 00:00:00 2001
 From: Gal Pressman <galp@mellanox.com>
 Date: Thu, 23 Nov 2017 13:52:28 +0200
 Subject: [PATCH] net/mlx5e: Fix possible deadlock of VXLAN lock
@@ -42,6 +42,7 @@ lockdep's WARNING: inconsistent lock state
 Fixes: b3f63c3d5e2c ("net/mlx5e: Add netdev support for VXLAN tunneling")
 Signed-off-by: Gal Pressman <galp@mellanox.com>
 Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c
 index 07a9ba6cfc70..f8238275759f 100644
diff --git a/queue/net-mlx5e-Prevent-possible-races-in-VXLAN-control-fl.patch b/queue/net-mlx5e-Prevent-possible-races-in-VXLAN-control-fl.patch
index 8cb1eae..9e2f28c 100644
--- a/queue/net-mlx5e-Prevent-possible-races-in-VXLAN-control-fl.patch
+++ b/queue/net-mlx5e-Prevent-possible-races-in-VXLAN-control-fl.patch
@@ -1,4 +1,4 @@
-From 0c1cc8b2215f5122ca614b5adca60346018758c3 Mon Sep 17 00:00:00 2001
+From 91ff7c14bcae3343253af0e7cb4050cdf8804d9d Mon Sep 17 00:00:00 2001
 From: Gal Pressman <galp@mellanox.com>
 Date: Mon, 4 Dec 2017 09:57:43 +0200
 Subject: [PATCH] net/mlx5e: Prevent possible races in VXLAN control flow
@@ -16,6 +16,7 @@ order to synchronize radix-tree access from softirq context.
 Fixes: b3f63c3d5e2c ("net/mlx5e: Add netdev support for VXLAN tunneling")
 Signed-off-by: Gal Pressman <galp@mellanox.com>
 Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c
 index 25f782344667..2f74953e4561 100644
@@ -29,7 +30,7 @@ index 25f782344667..2f74953e4561 100644
  	vxlan = mlx5e_vxlan_lookup_port(priv, port);
  	if (vxlan) {
  		atomic_inc(&vxlan->refcount);
-@@ -117,6 +118,7 @@ err_free:
+@@ -117,6 +118,7 @@ static void mlx5e_vxlan_add_port(struct work_struct *work)
  err_delete_port:
  	mlx5e_vxlan_core_del_port_cmd(priv->mdev, port);
  free_work:
@@ -45,7 +46,7 @@ index 25f782344667..2f74953e4561 100644
  	spin_lock_bh(&vxlan_db->lock);
  	vxlan = radix_tree_lookup(&vxlan_db->tree, port);
  	if (!vxlan)
-@@ -147,6 +150,7 @@ out_unlock:
+@@ -147,6 +150,7 @@ static void mlx5e_vxlan_del_port(struct work_struct *work)
  		mlx5e_vxlan_core_del_port_cmd(priv->mdev, port);
  		kfree(vxlan);
  	}
diff --git a/queue/net-phy-marvell-Limit-88m1101-autoneg-errata-to-88E1.patch b/queue/net-phy-marvell-Limit-88m1101-autoneg-errata-to-88E1.patch
index b5bb720..ef0993c 100644
--- a/queue/net-phy-marvell-Limit-88m1101-autoneg-errata-to-88E1.patch
+++ b/queue/net-phy-marvell-Limit-88m1101-autoneg-errata-to-88E1.patch
@@ -1,4 +1,4 @@
-From c505873eaece2b4aefd07d339dc7e1400e0235ac Mon Sep 17 00:00:00 2001
+From e1c93b8de8ef4b0009cd880498b08e5cb6988138 Mon Sep 17 00:00:00 2001
 From: Zhao Qiang <qiang.zhao@nxp.com>
 Date: Mon, 18 Dec 2017 10:26:43 +0800
 Subject: [PATCH] net: phy: marvell: Limit 88m1101 autoneg errata to 88E1145 as
@@ -11,12 +11,13 @@ commit c505873eaece2b4aefd07d339dc7e1400e0235ac upstream.
 Fixes: f2899788353c ("net: phy: marvell: Limit errata to 88m1101")
 Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
-index b5a8f750e433..26c9a11220ca 100644
+index 57297ba23987..7d56fe83d853 100644
 --- a/drivers/net/phy/marvell.c
 +++ b/drivers/net/phy/marvell.c
-@@ -2073,7 +2073,7 @@ static struct phy_driver marvell_drivers[] = {
+@@ -2010,7 +2010,7 @@ static struct phy_driver marvell_drivers[] = {
  		.flags = PHY_HAS_INTERRUPT,
  		.probe = marvell_probe,
  		.config_init = &m88e1145_config_init,
diff --git a/queue/net-phy-micrel-ksz9031-reconfigure-autoneg-after-phy.patch b/queue/net-phy-micrel-ksz9031-reconfigure-autoneg-after-phy.patch
index 8302fa8..4179aa6 100644
--- a/queue/net-phy-micrel-ksz9031-reconfigure-autoneg-after-phy.patch
+++ b/queue/net-phy-micrel-ksz9031-reconfigure-autoneg-after-phy.patch
@@ -1,4 +1,4 @@
-From c1a8d0a3accf64a014d605e6806ce05d1c17adf1 Mon Sep 17 00:00:00 2001
+From fa0efa9d63b4f978054363f6c0375a25f69a88f8 Mon Sep 17 00:00:00 2001
 From: Grygorii Strashko <grygorii.strashko@ti.com>
 Date: Wed, 20 Dec 2017 18:45:10 -0600
 Subject: [PATCH] net: phy: micrel: ksz9031: reconfigure autoneg after phy
@@ -19,12 +19,13 @@ ksz9031_read_status().
 Fixes: d2fd719bcb0e ("net/phy: micrel: Add workaround for bad autoneg")
 Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
-index ab4614113403..422ff6333c52 100644
+index 8b2038844ba9..6f5998765b1f 100644
 --- a/drivers/net/phy/micrel.c
 +++ b/drivers/net/phy/micrel.c
-@@ -624,6 +624,7 @@ static int ksz9031_read_status(struct phy_device *phydev)
+@@ -621,6 +621,7 @@ static int ksz9031_read_status(struct phy_device *phydev)
  		phydev->link = 0;
  		if (phydev->drv->config_intr && phy_interrupt_is_valid(phydev))
  			phydev->drv->config_intr(phydev);
diff --git a/queue/net-qmi_wwan-add-Sierra-EM7565-1199-9091.patch b/queue/net-qmi_wwan-add-Sierra-EM7565-1199-9091.patch
index 2d6ab00..8bf606a 100644
--- a/queue/net-qmi_wwan-add-Sierra-EM7565-1199-9091.patch
+++ b/queue/net-qmi_wwan-add-Sierra-EM7565-1199-9091.patch
@@ -1,4 +1,4 @@
-From aceef61ee56898cfa7b6960fb60b9326c3860441 Mon Sep 17 00:00:00 2001
+From 46cdd695a7e7b56cd4186a7b93ffa91c2220c658 Mon Sep 17 00:00:00 2001
 From: Sebastian Sjoholm <ssjoholm@mac.com>
 Date: Mon, 11 Dec 2017 21:51:14 +0100
 Subject: [PATCH] net: qmi_wwan: add Sierra EM7565 1199:9091
@@ -15,9 +15,10 @@ with the EM7565.
 Signed-off-by: Sebastian Sjoholm <ssjoholm@mac.com>
 Acked-by: Bjørn Mork <bjorn@mork.no>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
-index 304ec6555cd8..d2ca5a202e8d 100644
+index 8a5f30d7a352..1e14e2accac6 100644
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
 @@ -1204,6 +1204,7 @@ static const struct usb_device_id products[] = {
diff --git a/queue/openvswitch-Fix-pop_vlan-action-for-double-tagged-fr.patch b/queue/openvswitch-Fix-pop_vlan-action-for-double-tagged-fr.patch
index 215b595..9f0ecdb 100644
--- a/queue/openvswitch-Fix-pop_vlan-action-for-double-tagged-fr.patch
+++ b/queue/openvswitch-Fix-pop_vlan-action-for-double-tagged-fr.patch
@@ -1,4 +1,4 @@
-From c48e74736fccf25fb32bb015426359e1c2016e3b Mon Sep 17 00:00:00 2001
+From 428e92f425a71a9eb8ba14e25c2e47f383706acf Mon Sep 17 00:00:00 2001
 From: Eric Garver <e@erig.me>
 Date: Wed, 20 Dec 2017 15:09:22 -0500
 Subject: [PATCH] openvswitch: Fix pop_vlan action for double tagged frames
@@ -13,12 +13,13 @@ Fixes: 5108bbaddc37 ("openvswitch: add processing of L3 packets")
 Signed-off-by: Eric Garver <e@erig.me>
 Reviewed-by: Jiri Benc <jbenc@redhat.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
-index dbe2379329c5..f039064ce922 100644
+index 3f76cb765e5b..1d20807aeddd 100644
 --- a/net/openvswitch/flow.c
 +++ b/net/openvswitch/flow.c
-@@ -579,6 +579,7 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
+@@ -532,6 +532,7 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
  			return -EINVAL;
  
  		skb_reset_network_header(skb);
@@ -26,7 +27,7 @@ index dbe2379329c5..f039064ce922 100644
  	} else {
  		eth = eth_hdr(skb);
  		ether_addr_copy(key->eth.src, eth->h_source);
-@@ -592,15 +593,23 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
+@@ -545,15 +546,23 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
  		if (unlikely(parse_vlan(skb, key)))
  			return -ENOMEM;
  
diff --git a/queue/ptr_ring-add-barriers.patch b/queue/ptr_ring-add-barriers.patch
index d1fa0a0..02da4df 100644
--- a/queue/ptr_ring-add-barriers.patch
+++ b/queue/ptr_ring-add-barriers.patch
@@ -1,4 +1,4 @@
-From a8ceb5dbfde1092b466936bca0ff3be127ecf38e Mon Sep 17 00:00:00 2001
+From 118ff818af7c0ddb3030a8e68e10a13948060a33 Mon Sep 17 00:00:00 2001
 From: "Michael S. Tsirkin" <mst@redhat.com>
 Date: Tue, 5 Dec 2017 21:29:37 +0200
 Subject: [PATCH] ptr_ring: add barriers
@@ -23,9 +23,10 @@ Suggested-by: Jason Wang <jasowang@redhat.com>
 Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
 Acked-by: Jason Wang <jasowang@redhat.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/include/linux/ptr_ring.h b/include/linux/ptr_ring.h
-index 37b4bb2545b3..6866df4f31b5 100644
+index feff771e8ea0..b26b9ef8561c 100644
 --- a/include/linux/ptr_ring.h
 +++ b/include/linux/ptr_ring.h
 @@ -101,12 +101,18 @@ static inline bool ptr_ring_full_bh(struct ptr_ring *r)
diff --git a/queue/s390-qeth-apply-takeover-changes-when-mode-is-toggle.patch b/queue/s390-qeth-apply-takeover-changes-when-mode-is-toggle.patch
index e0310d0..e149dcc 100644
--- a/queue/s390-qeth-apply-takeover-changes-when-mode-is-toggle.patch
+++ b/queue/s390-qeth-apply-takeover-changes-when-mode-is-toggle.patch
@@ -1,4 +1,4 @@
-From 7fbd9493f0eeae8cef58300505a9ef5c8fce6313 Mon Sep 17 00:00:00 2001
+From 014679f328a222700953287e62fdf592b618bbc6 Mon Sep 17 00:00:00 2001
 From: Julian Wiedmann <jwi@linux.vnet.ibm.com>
 Date: Wed, 13 Dec 2017 18:56:29 +0100
 Subject: [PATCH] s390/qeth: apply takeover changes when mode is toggled
@@ -12,12 +12,13 @@ settings.
 
 Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
-index 15015a24f8ad..51c618d9fefe 100644
+index ff16624787fe..c84593192a40 100644
 --- a/drivers/s390/net/qeth_core.h
 +++ b/drivers/s390/net/qeth_core.h
-@@ -565,7 +565,7 @@ enum qeth_cq {
+@@ -563,7 +563,7 @@ enum qeth_cq {
  };
  
  struct qeth_ipato {
@@ -27,10 +28,10 @@ index 15015a24f8ad..51c618d9fefe 100644
  	int invert6;
  	struct list_head entries;
 diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
-index 430e3214f7e2..8d18675e60e2 100644
+index 3f0711ecda8b..02df6fdef286 100644
 --- a/drivers/s390/net/qeth_core_main.c
 +++ b/drivers/s390/net/qeth_core_main.c
-@@ -1480,7 +1480,7 @@ static int qeth_setup_card(struct qeth_card *card)
+@@ -1474,7 +1474,7 @@ static int qeth_setup_card(struct qeth_card *card)
  	qeth_set_intial_options(card);
  	/* IP address takeover */
  	INIT_LIST_HEAD(&card->ipato.entries);
@@ -40,10 +41,10 @@ index 430e3214f7e2..8d18675e60e2 100644
  	card->ipato.invert6 = 0;
  	/* init QDIO stuff */
 diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
-index bd12fdf678be..198717f71b3d 100644
+index ff29a4b416b4..e82c0f388f95 100644
 --- a/drivers/s390/net/qeth_l3_sys.c
 +++ b/drivers/s390/net/qeth_l3_sys.c
-@@ -372,6 +372,7 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
+@@ -371,6 +371,7 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
  	struct qeth_card *card = dev_get_drvdata(dev);
  	struct qeth_ipaddr *addr;
  	int i, rc = 0;
@@ -51,7 +52,7 @@ index bd12fdf678be..198717f71b3d 100644
  
  	if (!card)
  		return -EINVAL;
-@@ -384,25 +385,23 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
+@@ -383,25 +384,23 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
  	}
  
  	if (sysfs_streq(buf, "toggle")) {
diff --git a/queue/s390-qeth-don-t-apply-takeover-changes-to-RXIP.patch b/queue/s390-qeth-don-t-apply-takeover-changes-to-RXIP.patch
index d819ca8..81e1bf8 100644
--- a/queue/s390-qeth-don-t-apply-takeover-changes-to-RXIP.patch
+++ b/queue/s390-qeth-don-t-apply-takeover-changes-to-RXIP.patch
@@ -1,4 +1,4 @@
-From b22d73d6689fd902a66c08ebe71ab2f3b351e22f Mon Sep 17 00:00:00 2001
+From 938c2b03fb10701719340d91ac473d0e4b44d8a0 Mon Sep 17 00:00:00 2001
 From: Julian Wiedmann <jwi@linux.vnet.ibm.com>
 Date: Wed, 13 Dec 2017 18:56:30 +0100
 Subject: [PATCH] s390/qeth: don't apply takeover changes to RXIP
@@ -13,12 +13,13 @@ addresses only.
 
 Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
-index 6a73894b0cb5..4a4be81800eb 100644
+index 97d29555061a..6fa827a49423 100644
 --- a/drivers/s390/net/qeth_l3_main.c
 +++ b/drivers/s390/net/qeth_l3_main.c
-@@ -174,6 +174,8 @@ int qeth_l3_is_addr_covered_by_ipato(struct qeth_card *card,
+@@ -173,6 +173,8 @@ int qeth_l3_is_addr_covered_by_ipato(struct qeth_card *card,
  
  	if (!card->ipato.enabled)
  		return 0;
@@ -27,7 +28,7 @@ index 6a73894b0cb5..4a4be81800eb 100644
  
  	qeth_l3_convert_addr_to_bits((u8 *) &addr->u, addr_bits,
  				  (addr->proto == QETH_PROT_IPV4)? 4:16);
-@@ -290,8 +292,7 @@ int qeth_l3_add_ip(struct qeth_card *card, struct qeth_ipaddr *tmp_addr)
+@@ -288,8 +290,7 @@ int qeth_l3_add_ip(struct qeth_card *card, struct qeth_ipaddr *tmp_addr)
  		memcpy(addr, tmp_addr, sizeof(struct qeth_ipaddr));
  		addr->ref_counter = 1;
  
@@ -38,10 +39,10 @@ index 6a73894b0cb5..4a4be81800eb 100644
  			addr->set_flags |= QETH_IPA_SETIP_TAKEOVER_FLAG;
  		}
 diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
-index 198717f71b3d..e256928092e5 100644
+index e82c0f388f95..cf864f8fa68f 100644
 --- a/drivers/s390/net/qeth_l3_sys.c
 +++ b/drivers/s390/net/qeth_l3_sys.c
-@@ -396,10 +396,11 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
+@@ -395,10 +395,11 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
  	card->ipato.enabled = enable;
  
  	hash_for_each(card->ip_htable, i, addr, hnode) {
diff --git a/queue/s390-qeth-fix-error-handling-in-checksum-cmd-callbac.patch b/queue/s390-qeth-fix-error-handling-in-checksum-cmd-callbac.patch
index 9d2cfb2..7ca00a1 100644
--- a/queue/s390-qeth-fix-error-handling-in-checksum-cmd-callbac.patch
+++ b/queue/s390-qeth-fix-error-handling-in-checksum-cmd-callbac.patch
@@ -1,4 +1,4 @@
-From ad3cbf61332914711e5f506972b1dc9af8d62146 Mon Sep 17 00:00:00 2001
+From 832daad9ca1cd452c9ccc64659f8c631944b98f1 Mon Sep 17 00:00:00 2001
 From: Julian Wiedmann <jwi@linux.vnet.ibm.com>
 Date: Wed, 20 Dec 2017 18:07:18 +0100
 Subject: [PATCH] s390/qeth: fix error handling in checksum cmd callback
@@ -11,12 +11,13 @@ response. Otherwise we risk operating on invalid data.
 Fixes: c9475369bd2b ("s390/qeth: rework RX/TX checksum offload")
 Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
-index 6c815207f4f5..3614df68830f 100644
+index d335ba5edc6d..8c28643534bc 100644
 --- a/drivers/s390/net/qeth_core_main.c
 +++ b/drivers/s390/net/qeth_core_main.c
-@@ -5386,6 +5386,13 @@ out:
+@@ -5363,6 +5363,13 @@ int qeth_poll(struct napi_struct *napi, int budget)
  }
  EXPORT_SYMBOL_GPL(qeth_poll);
  
@@ -30,7 +31,7 @@ index 6c815207f4f5..3614df68830f 100644
  int qeth_setassparms_cb(struct qeth_card *card,
  			struct qeth_reply *reply, unsigned long data)
  {
-@@ -6242,7 +6249,7 @@ static int qeth_ipa_checksum_run_cmd_cb(struct qeth_card *card,
+@@ -6217,7 +6224,7 @@ static int qeth_ipa_checksum_run_cmd_cb(struct qeth_card *card,
  				(struct qeth_checksum_cmd *)reply->param;
  
  	QETH_CARD_TEXT(card, 4, "chkdoccb");
diff --git a/queue/s390-qeth-lock-IP-table-while-applying-takeover-chan.patch b/queue/s390-qeth-lock-IP-table-while-applying-takeover-chan.patch
index cb70414..8b04563 100644
--- a/queue/s390-qeth-lock-IP-table-while-applying-takeover-chan.patch
+++ b/queue/s390-qeth-lock-IP-table-while-applying-takeover-chan.patch
@@ -1,4 +1,4 @@
-From 8a03a3692b100d84785ee7a834e9215e304c9e00 Mon Sep 17 00:00:00 2001
+From 273db13d4215c93ba59759e2ccb50742524b8ec1 Mon Sep 17 00:00:00 2001
 From: Julian Wiedmann <jwi@linux.vnet.ibm.com>
 Date: Wed, 13 Dec 2017 18:56:31 +0100
 Subject: [PATCH] s390/qeth: lock IP table while applying takeover changes
@@ -11,12 +11,13 @@ eg. concurrent removal of the same object from the IP table.
 Fixes: 5f78e29ceebf ("qeth: optimize IP handling in rx_mode callback")
 Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
-index e256928092e5..aa676b4090da 100644
+index cf864f8fa68f..d7c9871d512f 100644
 --- a/drivers/s390/net/qeth_l3_sys.c
 +++ b/drivers/s390/net/qeth_l3_sys.c
-@@ -395,6 +395,7 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
+@@ -394,6 +394,7 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
  		goto out;
  	card->ipato.enabled = enable;
  
@@ -24,7 +25,7 @@ index e256928092e5..aa676b4090da 100644
  	hash_for_each(card->ip_htable, i, addr, hnode) {
  		if (addr->type != QETH_IP_TYPE_NORMAL)
  			continue;
-@@ -403,6 +404,7 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
+@@ -402,6 +403,7 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
  		else if (qeth_l3_is_addr_covered_by_ipato(card, addr))
  			addr->set_flags |= QETH_IPA_SETIP_TAKEOVER_FLAG;
  	}
diff --git a/queue/s390-qeth-update-takeover-IPs-after-configuration-ch.patch b/queue/s390-qeth-update-takeover-IPs-after-configuration-ch.patch
index 159548d..e5f4f53 100644
--- a/queue/s390-qeth-update-takeover-IPs-after-configuration-ch.patch
+++ b/queue/s390-qeth-update-takeover-IPs-after-configuration-ch.patch
@@ -1,4 +1,4 @@
-From 02f510f326501470348a5df341e8232c3497bbbb Mon Sep 17 00:00:00 2001
+From 00239c726ce06f81de01581af9839e256c680abb Mon Sep 17 00:00:00 2001
 From: Julian Wiedmann <jwi@linux.vnet.ibm.com>
 Date: Wed, 13 Dec 2017 18:56:32 +0100
 Subject: [PATCH] s390/qeth: update takeover IPs after configuration change
@@ -11,12 +11,13 @@ for some addresses when we no longer should, or vice-versa.
 
 Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
-index 51c618d9fefe..badf42acbf95 100644
+index c84593192a40..88ab483cdd45 100644
 --- a/drivers/s390/net/qeth_core.h
 +++ b/drivers/s390/net/qeth_core.h
-@@ -566,8 +566,8 @@ enum qeth_cq {
+@@ -564,8 +564,8 @@ enum qeth_cq {
  
  struct qeth_ipato {
  	bool enabled;
@@ -28,10 +29,10 @@ index 51c618d9fefe..badf42acbf95 100644
  };
  
 diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
-index 8d18675e60e2..6c815207f4f5 100644
+index 02df6fdef286..d335ba5edc6d 100644
 --- a/drivers/s390/net/qeth_core_main.c
 +++ b/drivers/s390/net/qeth_core_main.c
-@@ -1481,8 +1481,8 @@ static int qeth_setup_card(struct qeth_card *card)
+@@ -1475,8 +1475,8 @@ static int qeth_setup_card(struct qeth_card *card)
  	/* IP address takeover */
  	INIT_LIST_HEAD(&card->ipato.entries);
  	card->ipato.enabled = false;
@@ -43,10 +44,10 @@ index 8d18675e60e2..6c815207f4f5 100644
  	qeth_init_qdio_info(card);
  	INIT_DELAYED_WORK(&card->buffer_reclaim_work, qeth_buffer_reclaim_work);
 diff --git a/drivers/s390/net/qeth_l3.h b/drivers/s390/net/qeth_l3.h
-index 194ae9b577cc..e5833837b799 100644
+index 26f79533e62e..eedf9b01a496 100644
 --- a/drivers/s390/net/qeth_l3.h
 +++ b/drivers/s390/net/qeth_l3.h
-@@ -82,7 +82,7 @@ void qeth_l3_del_vipa(struct qeth_card *, enum qeth_prot_versions, const u8 *);
+@@ -80,7 +80,7 @@ void qeth_l3_del_vipa(struct qeth_card *, enum qeth_prot_versions, const u8 *);
  int qeth_l3_add_rxip(struct qeth_card *, enum qeth_prot_versions, const u8 *);
  void qeth_l3_del_rxip(struct qeth_card *card, enum qeth_prot_versions,
  			const u8 *);
@@ -56,10 +57,10 @@ index 194ae9b577cc..e5833837b799 100644
  int qeth_l3_add_ip(struct qeth_card *, struct qeth_ipaddr *);
  int qeth_l3_delete_ip(struct qeth_card *, struct qeth_ipaddr *);
 diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
-index 4a4be81800eb..ef0961e18686 100644
+index 6fa827a49423..dd58ca08839d 100644
 --- a/drivers/s390/net/qeth_l3_main.c
 +++ b/drivers/s390/net/qeth_l3_main.c
-@@ -164,8 +164,8 @@ static void qeth_l3_convert_addr_to_bits(u8 *addr, u8 *bits, int len)
+@@ -163,8 +163,8 @@ static void qeth_l3_convert_addr_to_bits(u8 *addr, u8 *bits, int len)
  	}
  }
  
@@ -70,7 +71,7 @@ index 4a4be81800eb..ef0961e18686 100644
  {
  	struct qeth_ipato_entry *ipatoe;
  	u8 addr_bits[128] = {0, };
-@@ -606,6 +606,27 @@ int qeth_l3_setrouting_v6(struct qeth_card *card)
+@@ -603,6 +603,27 @@ int qeth_l3_setrouting_v6(struct qeth_card *card)
  /*
   * IP address takeover related functions
   */
@@ -98,7 +99,7 @@ index 4a4be81800eb..ef0961e18686 100644
  static void qeth_l3_clear_ipato_list(struct qeth_card *card)
  {
  	struct qeth_ipato_entry *ipatoe, *tmp;
-@@ -617,6 +638,7 @@ static void qeth_l3_clear_ipato_list(struct qeth_card *card)
+@@ -614,6 +635,7 @@ static void qeth_l3_clear_ipato_list(struct qeth_card *card)
  		kfree(ipatoe);
  	}
  
@@ -106,7 +107,7 @@ index 4a4be81800eb..ef0961e18686 100644
  	spin_unlock_bh(&card->ip_lock);
  }
  
-@@ -641,8 +663,10 @@ int qeth_l3_add_ipato_entry(struct qeth_card *card,
+@@ -638,8 +660,10 @@ int qeth_l3_add_ipato_entry(struct qeth_card *card,
  		}
  	}
  
@@ -118,7 +119,7 @@ index 4a4be81800eb..ef0961e18686 100644
  
  	spin_unlock_bh(&card->ip_lock);
  
-@@ -665,6 +689,7 @@ void qeth_l3_del_ipato_entry(struct qeth_card *card,
+@@ -662,6 +686,7 @@ void qeth_l3_del_ipato_entry(struct qeth_card *card,
  			    (proto == QETH_PROT_IPV4)? 4:16) &&
  		    (ipatoe->mask_bits == mask_bits)) {
  			list_del(&ipatoe->entry);
@@ -127,10 +128,10 @@ index 4a4be81800eb..ef0961e18686 100644
  		}
  	}
 diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
-index aa676b4090da..6ea2b528a64e 100644
+index d7c9871d512f..fbf2dc7b1af0 100644
 --- a/drivers/s390/net/qeth_l3_sys.c
 +++ b/drivers/s390/net/qeth_l3_sys.c
-@@ -370,9 +370,8 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
+@@ -369,9 +369,8 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
  		struct device_attribute *attr, const char *buf, size_t count)
  {
  	struct qeth_card *card = dev_get_drvdata(dev);
@@ -141,7 +142,7 @@ index aa676b4090da..6ea2b528a64e 100644
  
  	if (!card)
  		return -EINVAL;
-@@ -391,20 +390,12 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
+@@ -390,20 +389,12 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
  		goto out;
  	}
  
@@ -167,7 +168,7 @@ index aa676b4090da..6ea2b528a64e 100644
  out:
  	mutex_unlock(&card->conf_mutex);
  	return rc ? rc : count;
-@@ -430,20 +421,27 @@ static ssize_t qeth_l3_dev_ipato_invert4_store(struct device *dev,
+@@ -429,20 +420,27 @@ static ssize_t qeth_l3_dev_ipato_invert4_store(struct device *dev,
  				const char *buf, size_t count)
  {
  	struct qeth_card *card = dev_get_drvdata(dev);
@@ -202,7 +203,7 @@ index aa676b4090da..6ea2b528a64e 100644
  	mutex_unlock(&card->conf_mutex);
  	return rc ? rc : count;
  }
-@@ -609,20 +607,27 @@ static ssize_t qeth_l3_dev_ipato_invert6_store(struct device *dev,
+@@ -608,20 +606,27 @@ static ssize_t qeth_l3_dev_ipato_invert6_store(struct device *dev,
  		struct device_attribute *attr, const char *buf, size_t count)
  {
  	struct qeth_card *card = dev_get_drvdata(dev);
diff --git a/queue/sctp-Replace-use-of-sockets_allocated-with-specified.patch b/queue/sctp-Replace-use-of-sockets_allocated-with-specified.patch
index 7a06a80..2cccb0f 100644
--- a/queue/sctp-Replace-use-of-sockets_allocated-with-specified.patch
+++ b/queue/sctp-Replace-use-of-sockets_allocated-with-specified.patch
@@ -1,4 +1,4 @@
-From 8cb38a602478e9f806571f6920b0a3298aabf042 Mon Sep 17 00:00:00 2001
+From e44ec25267e544a8487701cd00199b7143915eed Mon Sep 17 00:00:00 2001
 From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
 Date: Fri, 22 Dec 2017 10:15:20 -0800
 Subject: [PATCH] sctp: Replace use of sockets_allocated with specified macro.
@@ -14,12 +14,13 @@ Fixes: 180d8cd942ce ("foundations of per-cgroup memory pressure controlling.")
 Cc: Glauber Costa <glommer@parallels.com>
 Signed-off-by: Tonghao Zhang <zhangtonghao@didichuxing.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/net/sctp/socket.c b/net/sctp/socket.c
-index 3253f724a995..b4fb6e4886d2 100644
+index f79df5115dc7..a6850a722536 100644
 --- a/net/sctp/socket.c
 +++ b/net/sctp/socket.c
-@@ -4498,7 +4498,7 @@ static int sctp_init_sock(struct sock *sk)
+@@ -4411,7 +4411,7 @@ static int sctp_init_sock(struct sock *sk)
  	SCTP_DBG_OBJCNT_INC(sock);
  
  	local_bh_disable();
@@ -28,7 +29,7 @@ index 3253f724a995..b4fb6e4886d2 100644
  	sock_prot_inuse_add(net, sk->sk_prot, 1);
  
  	/* Nothing can fail after this block, otherwise
-@@ -4542,7 +4542,7 @@ static void sctp_destroy_sock(struct sock *sk)
+@@ -4455,7 +4455,7 @@ static void sctp_destroy_sock(struct sock *sk)
  	}
  	sctp_endpoint_free(sp->ep);
  	local_bh_disable();
diff --git a/queue/sctp-make-sure-stream-nums-can-match-optlen-in-sctp_.patch b/queue/sctp-make-sure-stream-nums-can-match-optlen-in-sctp_.patch
index e3a0391..5b7f827 100644
--- a/queue/sctp-make-sure-stream-nums-can-match-optlen-in-sctp_.patch
+++ b/queue/sctp-make-sure-stream-nums-can-match-optlen-in-sctp_.patch
@@ -1,4 +1,4 @@
-From 2342b8d95bcae5946e1b9b8d58645f37500ef2e7 Mon Sep 17 00:00:00 2001
+From 3c216f0276b1b6f7fa20959444e5c7f5a8354bd2 Mon Sep 17 00:00:00 2001
 From: Xin Long <lucien.xin@gmail.com>
 Date: Sun, 10 Dec 2017 15:40:51 +0800
 Subject: [PATCH] sctp: make sure stream nums can match optlen in
@@ -25,12 +25,13 @@ Signed-off-by: Xin Long <lucien.xin@gmail.com>
 Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
 Acked-by: Neil Horman <nhorman@tuxdriver.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/net/sctp/socket.c b/net/sctp/socket.c
-index eb17a911aa29..3253f724a995 100644
+index a6850a722536..392feba9a0ce 100644
 --- a/net/sctp/socket.c
 +++ b/net/sctp/socket.c
-@@ -3891,13 +3891,17 @@ static int sctp_setsockopt_reset_streams(struct sock *sk,
+@@ -3872,13 +3872,17 @@ static int sctp_setsockopt_reset_streams(struct sock *sk,
  	struct sctp_association *asoc;
  	int retval = -EINVAL;
  
diff --git a/queue/sfc-pass-valid-pointers-from-efx_enqueue_unwind.patch b/queue/sfc-pass-valid-pointers-from-efx_enqueue_unwind.patch
index 372b76e..9fb2e44 100644
--- a/queue/sfc-pass-valid-pointers-from-efx_enqueue_unwind.patch
+++ b/queue/sfc-pass-valid-pointers-from-efx_enqueue_unwind.patch
@@ -1,4 +1,4 @@
-From d4a7a8893d4cdbc89d79ac4aa704bf8d4b67b368 Mon Sep 17 00:00:00 2001
+From 8161026cff943c6b4ed1057e0ad8632ae9e29f3d Mon Sep 17 00:00:00 2001
 From: Bert Kenward <bkenward@solarflare.com>
 Date: Thu, 7 Dec 2017 17:18:58 +0000
 Subject: [PATCH] sfc: pass valid pointers from efx_enqueue_unwind
@@ -19,9 +19,10 @@ Signed-off-by: Bert Kenward <bkenward@solarflare.com>
 Tested-by: Jarod Wilson <jarod@redhat.com>
 Acked-by: Jarod Wilson <jarod@redhat.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/tx.c b/drivers/net/ethernet/sfc/tx.c
-index 0ea7e16f2e6e..9937a2450e57 100644
+index 3bdf87f31087..1d3e40361259 100644
 --- a/drivers/net/ethernet/sfc/tx.c
 +++ b/drivers/net/ethernet/sfc/tx.c
 @@ -77,6 +77,7 @@ static void efx_dequeue_buffer(struct efx_tx_queue *tx_queue,
diff --git a/queue/sock-free-skb-in-skb_complete_tx_timestamp-on-error.patch b/queue/sock-free-skb-in-skb_complete_tx_timestamp-on-error.patch
index e3cace9..48e0d6b 100644
--- a/queue/sock-free-skb-in-skb_complete_tx_timestamp-on-error.patch
+++ b/queue/sock-free-skb-in-skb_complete_tx_timestamp-on-error.patch
@@ -1,4 +1,4 @@
-From 35b99dffc3f710cafceee6c8c6ac6a98eb2cb4bf Mon Sep 17 00:00:00 2001
+From 5883ac27076979a0a3e5fafce7e98b32ac8dd782 Mon Sep 17 00:00:00 2001
 From: Willem de Bruijn <willemb@google.com>
 Date: Wed, 13 Dec 2017 14:41:06 -0500
 Subject: [PATCH] sock: free skb in skb_complete_tx_timestamp on error
@@ -14,12 +14,13 @@ Reported-by: Richard Cochran <richardcochran@gmail.com>
 Signed-off-by: Willem de Bruijn <willemb@google.com>
 Reviewed-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/core/skbuff.c b/net/core/skbuff.c
-index 6b0ff396fa9d..a592ca025fc4 100644
+index a3ba3c1597dc..b9f962b08514 100644
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
-@@ -4293,7 +4293,7 @@ void skb_complete_tx_timestamp(struct sk_buff *skb,
+@@ -3855,7 +3855,7 @@ void skb_complete_tx_timestamp(struct sk_buff *skb,
  	struct sock *sk = skb->sk;
  
  	if (!skb_may_tx_timestamp(sk, false))
@@ -28,7 +29,7 @@ index 6b0ff396fa9d..a592ca025fc4 100644
  
  	/* Take a reference to prevent skb_orphan() from freeing the socket,
  	 * but only if the socket refcount is not zero.
-@@ -4302,7 +4302,11 @@ void skb_complete_tx_timestamp(struct sk_buff *skb,
+@@ -3864,7 +3864,11 @@ void skb_complete_tx_timestamp(struct sk_buff *skb,
  		*skb_hwtstamps(skb) = *hwtstamps;
  		__skb_complete_tx_timestamp(skb, sk, SCM_TSTAMP_SND, false);
  		sock_put(sk);
diff --git a/queue/tcp_bbr-reset-full-pipe-detection-on-loss-recovery-u.patch b/queue/tcp_bbr-reset-full-pipe-detection-on-loss-recovery-u.patch
index 10cd697..8140ee1 100644
--- a/queue/tcp_bbr-reset-full-pipe-detection-on-loss-recovery-u.patch
+++ b/queue/tcp_bbr-reset-full-pipe-detection-on-loss-recovery-u.patch
@@ -1,4 +1,4 @@
-From 2f6c498e4f15d27852c04ed46d804a39137ba364 Mon Sep 17 00:00:00 2001
+From c4ce409071f4811f69c006343f4ed9e5f23c1770 Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Thu, 7 Dec 2017 12:43:31 -0500
 Subject: [PATCH] tcp_bbr: reset full pipe detection on loss recovery undo
@@ -21,12 +21,13 @@ Signed-off-by: Neal Cardwell <ncardwell@google.com>
 Reviewed-by: Yuchung Cheng <ycheng@google.com>
 Acked-by: Soheil Hassas Yeganeh <soheil@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/tcp_bbr.c b/net/ipv4/tcp_bbr.c
-index 3089c956b9f9..ab3ff14ea7f7 100644
+index 12d361380d32..9d6723e8bc6c 100644
 --- a/net/ipv4/tcp_bbr.c
 +++ b/net/ipv4/tcp_bbr.c
-@@ -874,6 +874,10 @@ static u32 bbr_sndbuf_expand(struct sock *sk)
+@@ -873,6 +873,10 @@ static u32 bbr_sndbuf_expand(struct sock *sk)
   */
  static u32 bbr_undo_cwnd(struct sock *sk)
  {
diff --git a/queue/tcp_bbr-reset-long-term-bandwidth-sampling-on-loss-r.patch b/queue/tcp_bbr-reset-long-term-bandwidth-sampling-on-loss-r.patch
index 9a87d94..41f99a1 100644
--- a/queue/tcp_bbr-reset-long-term-bandwidth-sampling-on-loss-r.patch
+++ b/queue/tcp_bbr-reset-long-term-bandwidth-sampling-on-loss-r.patch
@@ -1,4 +1,4 @@
-From 600647d467c6d04b3954b41a6ee1795b5ae00550 Mon Sep 17 00:00:00 2001
+From a486aaf657465301d660cdfc375e9c784fbf653f Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Thu, 7 Dec 2017 12:43:32 -0500
 Subject: [PATCH] tcp_bbr: reset long-term bandwidth sampling on loss recovery
@@ -20,12 +20,13 @@ Signed-off-by: Neal Cardwell <ncardwell@google.com>
 Reviewed-by: Yuchung Cheng <ycheng@google.com>
 Acked-by: Soheil Hassas Yeganeh <soheil@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/tcp_bbr.c b/net/ipv4/tcp_bbr.c
-index ab3ff14ea7f7..8322f26e770e 100644
+index 9d6723e8bc6c..621ba48c6f31 100644
 --- a/net/ipv4/tcp_bbr.c
 +++ b/net/ipv4/tcp_bbr.c
-@@ -878,6 +878,7 @@ static u32 bbr_undo_cwnd(struct sock *sk)
+@@ -877,6 +877,7 @@ static u32 bbr_undo_cwnd(struct sock *sk)
  
  	bbr->full_bw = 0;   /* spurious slow-down; reset full pipe detection */
  	bbr->full_bw_cnt = 0;
diff --git a/queue/tg3-Fix-rx-hang-on-MTU-change-with-5717-5719.patch b/queue/tg3-Fix-rx-hang-on-MTU-change-with-5717-5719.patch
index 2322322..bca357e 100644
--- a/queue/tg3-Fix-rx-hang-on-MTU-change-with-5717-5719.patch
+++ b/queue/tg3-Fix-rx-hang-on-MTU-change-with-5717-5719.patch
@@ -1,4 +1,4 @@
-From 748a240c589824e9121befb1cba5341c319885bc Mon Sep 17 00:00:00 2001
+From 6ae40bfc5c05e0f41f7bbff067095ec48a257b43 Mon Sep 17 00:00:00 2001
 From: Brian King <brking@linux.vnet.ibm.com>
 Date: Fri, 15 Dec 2017 15:21:50 -0600
 Subject: [PATCH] tg3: Fix rx hang on MTU change with 5717/5719
@@ -14,9 +14,10 @@ hardware and has been confirmed to resolve the hang issue.
 
 Signed-off-by: Brian King <brking@linux.vnet.ibm.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/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
-index de51c2177d03..d09c5a9c53b5 100644
+index 537d571ee601..7dc8ba0b9e45 100644
 --- a/drivers/net/ethernet/broadcom/tg3.c
 +++ b/drivers/net/ethernet/broadcom/tg3.c
 @@ -14225,7 +14225,9 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu)
diff --git a/queue/timers-Reinitialize-per-cpu-bases-on-hotplug.patch b/queue/timers-Reinitialize-per-cpu-bases-on-hotplug.patch
index 537ab85..7a21fdd 100644
--- a/queue/timers-Reinitialize-per-cpu-bases-on-hotplug.patch
+++ b/queue/timers-Reinitialize-per-cpu-bases-on-hotplug.patch
@@ -1,4 +1,4 @@
-From 26456f87aca7157c057de65c9414b37f1ab881d1 Mon Sep 17 00:00:00 2001
+From befb807263939a03a249c01264b7db074ab6cb46 Mon Sep 17 00:00:00 2001
 From: Thomas Gleixner <tglx@linutronix.de>
 Date: Wed, 27 Dec 2017 21:37:25 +0100
 Subject: [PATCH] timers: Reinitialize per cpu bases on hotplug
@@ -24,12 +24,13 @@ Cc: Sebastian Siewior <bigeasy@linutronix.de>
 Cc: Anna-Maria Gleixner <anna-maria@linutronix.de>
 Cc: stable@vger.kernel.org
 Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1712272152200.2431@nanos
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
-index 201ab7267986..1a32e558eb11 100644
+index 30b86efea2bc..c8976526d9e9 100644
 --- a/include/linux/cpuhotplug.h
 +++ b/include/linux/cpuhotplug.h
-@@ -86,7 +86,7 @@ enum cpuhp_state {
+@@ -68,7 +68,7 @@ enum cpuhp_state {
  	CPUHP_MM_ZSWP_POOL_PREPARE,
  	CPUHP_KVM_PPC_BOOK3S_PREPARE,
  	CPUHP_ZCOMP_PREPARE,
@@ -39,10 +40,10 @@ index 201ab7267986..1a32e558eb11 100644
  	CPUHP_BP_PREPARE_DYN,
  	CPUHP_BP_PREPARE_DYN_END		= CPUHP_BP_PREPARE_DYN + 20,
 diff --git a/include/linux/timer.h b/include/linux/timer.h
-index 04af640ea95b..2448f9cc48a3 100644
+index e6789b8757d5..4f9ef32df695 100644
 --- a/include/linux/timer.h
 +++ b/include/linux/timer.h
-@@ -207,9 +207,11 @@ unsigned long round_jiffies_up(unsigned long j);
+@@ -231,9 +231,11 @@ unsigned long round_jiffies_up(unsigned long j);
  unsigned long round_jiffies_up_relative(unsigned long j);
  
  #ifdef CONFIG_HOTPLUG_CPU
@@ -56,10 +57,10 @@ index 04af640ea95b..2448f9cc48a3 100644
  
  #endif
 diff --git a/kernel/cpu.c b/kernel/cpu.c
-index 41376c3ac93b..97858477e586 100644
+index 026b2e3ab73c..e9f4e6d15ab4 100644
 --- a/kernel/cpu.c
 +++ b/kernel/cpu.c
-@@ -1277,9 +1277,9 @@ static struct cpuhp_step cpuhp_bp_states[] = {
+@@ -1185,9 +1185,9 @@ static struct cpuhp_step cpuhp_bp_states[] = {
  	 * before blk_mq_queue_reinit_notify() from notify_dead(),
  	 * otherwise a RCU stall occurs.
  	 */
@@ -72,10 +73,10 @@ index 41376c3ac93b..97858477e586 100644
  	},
  	/* Kicks the plugged cpu into life */
 diff --git a/kernel/time/timer.c b/kernel/time/timer.c
-index 19a9c3da7698..6be576e02209 100644
+index d35f58b8d938..38dc78c8db12 100644
 --- a/kernel/time/timer.c
 +++ b/kernel/time/timer.c
-@@ -1853,6 +1853,21 @@ static void migrate_timer_list(struct timer_base *new_base, struct hlist_head *h
+@@ -1801,6 +1801,21 @@ static void migrate_timer_list(struct timer_base *new_base, struct hlist_head *h
  	}
  }
  
diff --git a/queue/timers-Use-deferrable-base-independent-of-base-nohz_.patch b/queue/timers-Use-deferrable-base-independent-of-base-nohz_.patch
index 9737ea5..b71c03b 100644
--- a/queue/timers-Use-deferrable-base-independent-of-base-nohz_.patch
+++ b/queue/timers-Use-deferrable-base-independent-of-base-nohz_.patch
@@ -1,4 +1,4 @@
-From ced6d5c11d3e7b342f1a80f908e6756ebd4b8ddd Mon Sep 17 00:00:00 2001
+From fe66391e034eb4e994d0ab38a7e9d3c45b23b5ea Mon Sep 17 00:00:00 2001
 From: Anna-Maria Gleixner <anna-maria@linutronix.de>
 Date: Fri, 22 Dec 2017 15:51:12 +0100
 Subject: [PATCH] timers: Use deferrable base independent of base::nohz_active
@@ -29,12 +29,13 @@ Cc: stable@vger.kernel.org
 Cc: rt@linutronix.de
 Cc: Paul McKenney <paulmck@linux.vnet.ibm.com>
 Link: https://lkml.kernel.org/r/20171222145337.633328378@linutronix.de
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/kernel/time/timer.c b/kernel/time/timer.c
-index ffebcf878fba..19a9c3da7698 100644
+index 36cec054b8ae..882473e7fe2e 100644
 --- a/kernel/time/timer.c
 +++ b/kernel/time/timer.c
-@@ -823,11 +823,10 @@ static inline struct timer_base *get_timer_cpu_base(u32 tflags, u32 cpu)
+@@ -814,11 +814,10 @@ static inline struct timer_base *get_timer_cpu_base(u32 tflags, u32 cpu)
  	struct timer_base *base = per_cpu_ptr(&timer_bases[BASE_STD], cpu);
  
  	/*
@@ -49,7 +50,7 @@ index ffebcf878fba..19a9c3da7698 100644
  		base = per_cpu_ptr(&timer_bases[BASE_DEF], cpu);
  	return base;
  }
-@@ -837,11 +836,10 @@ static inline struct timer_base *get_timer_this_cpu_base(u32 tflags)
+@@ -828,11 +827,10 @@ static inline struct timer_base *get_timer_this_cpu_base(u32 tflags)
  	struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
  
  	/*
@@ -64,7 +65,7 @@ index ffebcf878fba..19a9c3da7698 100644
  		base = this_cpu_ptr(&timer_bases[BASE_DEF]);
  	return base;
  }
-@@ -1684,7 +1682,7 @@ static __latent_entropy void run_timer_softirq(struct softirq_action *h)
+@@ -1644,7 +1642,7 @@ static __latent_entropy void run_timer_softirq(struct softirq_action *h)
  	base->must_forward_clk = false;
  
  	__run_timers(base);
diff --git a/queue/tracing-Fix-crash-when-it-fails-to-alloc-ring-buffer.patch b/queue/tracing-Fix-crash-when-it-fails-to-alloc-ring-buffer.patch
index 1412ed1..d264b03 100644
--- a/queue/tracing-Fix-crash-when-it-fails-to-alloc-ring-buffer.patch
+++ b/queue/tracing-Fix-crash-when-it-fails-to-alloc-ring-buffer.patch
@@ -1,4 +1,4 @@
-From 24f2aaf952ee0b59f31c3a18b8b36c9e3d3c2cf5 Mon Sep 17 00:00:00 2001
+From a4fb05c57fdea63dae60df67ec993cfb628560aa Mon Sep 17 00:00:00 2001
 From: Jing Xia <jing.xia@spreadtrum.com>
 Date: Tue, 26 Dec 2017 15:12:53 +0800
 Subject: [PATCH] tracing: Fix crash when it fails to alloc ring buffer
@@ -38,12 +38,13 @@ Fixes: 737223fbca3b1 ("tracing: Consolidate buffer allocation code")
 Signed-off-by: Jing Xia <jing.xia@spreadtrum.com>
 Signed-off-by: Chunyan Zhang <chunyan.zhang@spreadtrum.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 73652d5318b2..0e53d46544b8 100644
+index 46b3fc1f0a6a..c75af896e516 100644
 --- a/kernel/trace/trace.c
 +++ b/kernel/trace/trace.c
-@@ -7603,7 +7603,9 @@ static int allocate_trace_buffers(struct trace_array *tr, int size)
+@@ -7414,7 +7414,9 @@ static int allocate_trace_buffers(struct trace_array *tr, int size)
  				    allocate_snapshot ? size : 1);
  	if (WARN_ON(ret)) {
  		ring_buffer_free(tr->trace_buffer.buffer);
diff --git a/queue/tracing-Fix-possible-double-free-on-failure-of-alloc.patch b/queue/tracing-Fix-possible-double-free-on-failure-of-alloc.patch
index 1917a9e..517cc69 100644
--- a/queue/tracing-Fix-possible-double-free-on-failure-of-alloc.patch
+++ b/queue/tracing-Fix-possible-double-free-on-failure-of-alloc.patch
@@ -1,4 +1,4 @@
-From 4397f04575c44e1440ec2e49b6302785c95fd2f8 Mon Sep 17 00:00:00 2001
+From 0d24b17916332d0085704dfdf2b047f47fbb63a3 Mon Sep 17 00:00:00 2001
 From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
 Date: Tue, 26 Dec 2017 20:07:34 -0500
 Subject: [PATCH] tracing: Fix possible double free on failure of allocating
@@ -19,12 +19,13 @@ Fixes: 737223fbca3b1 ("tracing: Consolidate buffer allocation code")
 Reported-by: Jing Xia <jing.xia@spreadtrum.com>
 Reported-by: Chunyan Zhang <chunyan.zhang@spreadtrum.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 0e53d46544b8..2a8d8a294345 100644
+index 78c84524a1de..46b3fc1f0a6a 100644
 --- a/kernel/trace/trace.c
 +++ b/kernel/trace/trace.c
-@@ -7580,6 +7580,7 @@ allocate_trace_buffer(struct trace_array *tr, struct trace_buffer *buf, int size
+@@ -7390,6 +7390,7 @@ allocate_trace_buffer(struct trace_array *tr, struct trace_buffer *buf, int size
  	buf->data = alloc_percpu(struct trace_array_cpu);
  	if (!buf->data) {
  		ring_buffer_free(buf->buffer);
diff --git a/queue/tracing-Remove-extra-zeroing-out-of-the-ring-buffer-.patch b/queue/tracing-Remove-extra-zeroing-out-of-the-ring-buffer-.patch
index cd78b75..9e4dd76 100644
--- a/queue/tracing-Remove-extra-zeroing-out-of-the-ring-buffer-.patch
+++ b/queue/tracing-Remove-extra-zeroing-out-of-the-ring-buffer-.patch
@@ -1,4 +1,4 @@
-From 6b7e633fe9c24682df550e5311f47fb524701586 Mon Sep 17 00:00:00 2001
+From 9523c35181a2dd01bf8d4e86d4b523d457876b34 Mon Sep 17 00:00:00 2001
 From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
 Date: Fri, 22 Dec 2017 20:38:57 -0500
 Subject: [PATCH] tracing: Remove extra zeroing out of the ring buffer page
@@ -14,12 +14,13 @@ nasty bug because of it.
 Cc: stable@vger.kernel.org
 Fixes: 2711ca237a084 ("ring-buffer: Move zeroing out excess in page to ring buffer code")
 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 59518b8126d0..73652d5318b2 100644
+index 2c46847a1557..78c84524a1de 100644
 --- a/kernel/trace/trace.c
 +++ b/kernel/trace/trace.c
-@@ -6769,7 +6769,7 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
+@@ -6564,7 +6564,7 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
  		.spd_release	= buffer_spd_release,
  	};
  	struct buffer_ref *ref;
@@ -28,7 +29,7 @@ index 59518b8126d0..73652d5318b2 100644
  	ssize_t ret = 0;
  
  #ifdef CONFIG_TRACER_MAX_TRACE
-@@ -6823,14 +6823,6 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
+@@ -6618,14 +6618,6 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
  			break;
  		}
  
diff --git a/queue/tty-fix-tty_ldisc_receive_buf-documentation.patch b/queue/tty-fix-tty_ldisc_receive_buf-documentation.patch
index b6ef1d7..7d91863 100644
--- a/queue/tty-fix-tty_ldisc_receive_buf-documentation.patch
+++ b/queue/tty-fix-tty_ldisc_receive_buf-documentation.patch
@@ -1,4 +1,4 @@
-From e7e51dcf3b8a5f65c5653a054ad57eb2492a90d0 Mon Sep 17 00:00:00 2001
+From 16e088b368e0bf24add34ef84066d77dcada8e11 Mon Sep 17 00:00:00 2001
 From: Johan Hovold <johan@kernel.org>
 Date: Fri, 3 Nov 2017 15:18:05 +0100
 Subject: [PATCH] tty: fix tty_ldisc_receive_buf() documentation
@@ -11,6 +11,7 @@ processed so drop the bogus "not" from the kernel doc comment.
 Fixes: 8d082cd300ab ("tty: Unify receive_buf() code paths")
 Signed-off-by: Johan Hovold <johan@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/tty_buffer.c b/drivers/tty/tty_buffer.c
 index f8eba1c5412f..677fa99b7747 100644
diff --git a/queue/usb-Add-device-quirk-for-Logitech-HD-Pro-Webcam-C925.patch b/queue/usb-Add-device-quirk-for-Logitech-HD-Pro-Webcam-C925.patch
index 52007df..aae999a 100644
--- a/queue/usb-Add-device-quirk-for-Logitech-HD-Pro-Webcam-C925.patch
+++ b/queue/usb-Add-device-quirk-for-Logitech-HD-Pro-Webcam-C925.patch
@@ -1,4 +1,4 @@
-From 7f038d256c723dd390d2fca942919573995f4cfd Mon Sep 17 00:00:00 2001
+From cc3942f3000d12ee57ee573806717cccc7c68246 Mon Sep 17 00:00:00 2001
 From: Dmitry Fleytman Dmitry Fleytman <dmitry.fleytman@gmail.com>
 Date: Tue, 19 Dec 2017 06:02:04 +0200
 Subject: [PATCH] usb: Add device quirk for Logitech HD Pro Webcam C925e
@@ -17,12 +17,13 @@ See aforementioned commit message for detailed explanation of the problem.
 Signed-off-by: Dmitry Fleytman <dmitry.fleytman@gmail.com>
 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/core/quirks.c b/drivers/usb/core/quirks.c
-index 95812656d9b9..4024926c1d68 100644
+index 50010282c010..60674a932c77 100644
 --- a/drivers/usb/core/quirks.c
 +++ b/drivers/usb/core/quirks.c
-@@ -52,10 +52,11 @@ static const struct usb_device_id usb_quirk_list[] = {
+@@ -57,10 +57,11 @@ static const struct usb_device_id usb_quirk_list[] = {
  	/* Microsoft LifeCam-VX700 v2.0 */
  	{ USB_DEVICE(0x045e, 0x0770), .driver_info = USB_QUIRK_RESET_RESUME },
  
diff --git a/queue/usb-add-RESET_RESUME-for-ELSA-MicroLink-56K.patch b/queue/usb-add-RESET_RESUME-for-ELSA-MicroLink-56K.patch
index a11a120..6529063 100644
--- a/queue/usb-add-RESET_RESUME-for-ELSA-MicroLink-56K.patch
+++ b/queue/usb-add-RESET_RESUME-for-ELSA-MicroLink-56K.patch
@@ -1,4 +1,4 @@
-From b9096d9f15c142574ebebe8fbb137012bb9d99c2 Mon Sep 17 00:00:00 2001
+From 5a8c9a32be514c627663fd32a9a2494e67ba9ce0 Mon Sep 17 00:00:00 2001
 From: Oliver Neukum <oneukum@suse.com>
 Date: Tue, 12 Dec 2017 16:11:30 +0100
 Subject: [PATCH] usb: add RESET_RESUME for ELSA MicroLink 56K
@@ -11,12 +11,13 @@ resumed without reset.
 Signed-off-by: Oliver Neukum <oneukum@suse.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/quirks.c b/drivers/usb/core/quirks.c
-index a10b346b9777..95812656d9b9 100644
+index 60674a932c77..c05c4f877750 100644
 --- a/drivers/usb/core/quirks.c
 +++ b/drivers/usb/core/quirks.c
-@@ -149,6 +149,9 @@ static const struct usb_device_id usb_quirk_list[] = {
+@@ -155,6 +155,9 @@ static const struct usb_device_id usb_quirk_list[] = {
  	/* Genesys Logic hub, internally used by KY-688 USB 3.1 Type-C Hub */
  	{ USB_DEVICE(0x05e3, 0x0612), .driver_info = USB_QUIRK_NO_LPM },
  
diff --git a/queue/usb-xhci-Add-XHCI_TRUST_TX_LENGTH-for-Renesas-uPD720.patch b/queue/usb-xhci-Add-XHCI_TRUST_TX_LENGTH-for-Renesas-uPD720.patch
index 1e5a9f8..f4b2f34 100644
--- a/queue/usb-xhci-Add-XHCI_TRUST_TX_LENGTH-for-Renesas-uPD720.patch
+++ b/queue/usb-xhci-Add-XHCI_TRUST_TX_LENGTH-for-Renesas-uPD720.patch
@@ -1,4 +1,4 @@
-From da99706689481717998d1d48edd389f339eea979 Mon Sep 17 00:00:00 2001
+From 9f0207e7b8ab5f7a4144de6484899c474f4a3fdf Mon Sep 17 00:00:00 2001
 From: Daniel Thompson <daniel.thompson@linaro.org>
 Date: Thu, 21 Dec 2017 15:06:15 +0200
 Subject: [PATCH] usb: xhci: Add XHCI_TRUST_TX_LENGTH for Renesas uPD720201
@@ -18,12 +18,13 @@ Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
 Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.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-pci.c b/drivers/usb/host/xhci-pci.c
-index 7ef1274ef7f7..1aad89b8aba0 100644
+index 5ea60a101596..0689fc5c9a9e 100644
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
-@@ -177,6 +177,9 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
+@@ -189,6 +189,9 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
  		xhci->quirks |= XHCI_TRUST_TX_LENGTH;
  		xhci->quirks |= XHCI_BROKEN_STREAMS;
  	}
diff --git a/queue/usbip-fix-usbip-bind-writing-random-string-after-com.patch b/queue/usbip-fix-usbip-bind-writing-random-string-after-com.patch
index dc6b665..ead2d46 100644
--- a/queue/usbip-fix-usbip-bind-writing-random-string-after-com.patch
+++ b/queue/usbip-fix-usbip-bind-writing-random-string-after-com.patch
@@ -1,4 +1,4 @@
-From 544c4605acc5ae4afe7dd5914147947db182f2fb Mon Sep 17 00:00:00 2001
+From 3ddb67819a9814d22218449af49dfb088f5ddd56 Mon Sep 17 00:00:00 2001
 From: Juan Zea <juan.zea@qindel.com>
 Date: Fri, 15 Dec 2017 10:21:20 +0100
 Subject: [PATCH] usbip: fix usbip bind writing random string after command in
@@ -14,6 +14,7 @@ Signed-off-by: Juan Zea <juan.zea@qindel.com>
 Acked-by: Shuah Khan <shuahkh@osg.samsung.com>
 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/tools/usb/usbip/src/utils.c b/tools/usb/usbip/src/utils.c
 index 2b3d6d235015..3d7b42e77299 100644
diff --git a/queue/usbip-prevent-leaking-socket-pointer-address-in-mess.patch b/queue/usbip-prevent-leaking-socket-pointer-address-in-mess.patch
index f8296e2..be29642 100644
--- a/queue/usbip-prevent-leaking-socket-pointer-address-in-mess.patch
+++ b/queue/usbip-prevent-leaking-socket-pointer-address-in-mess.patch
@@ -1,4 +1,4 @@
-From 90120d15f4c397272aaf41077960a157fc4212bf Mon Sep 17 00:00:00 2001
+From 7ae04f3983db76c04ee073550acffef4ca8fcf31 Mon Sep 17 00:00:00 2001
 From: Shuah Khan <shuahkh@osg.samsung.com>
 Date: Fri, 15 Dec 2017 10:50:09 -0700
 Subject: [PATCH] usbip: prevent leaking socket pointer address in messages
@@ -12,12 +12,13 @@ are useful for debugging.
 Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
 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/usbip/stub_dev.c b/drivers/usb/usbip/stub_dev.c
-index a3df8ee82faf..e31a6f204397 100644
+index c653ce533430..720408d39f11 100644
 --- a/drivers/usb/usbip/stub_dev.c
 +++ b/drivers/usb/usbip/stub_dev.c
-@@ -149,8 +149,7 @@ static void stub_shutdown_connection(struct usbip_device *ud)
+@@ -163,8 +163,7 @@ static void stub_shutdown_connection(struct usbip_device *ud)
  	 * step 1?
  	 */
  	if (ud->tcp_socket) {
@@ -28,10 +29,10 @@ index a3df8ee82faf..e31a6f204397 100644
  	}
  
 diff --git a/drivers/usb/usbip/usbip_common.c b/drivers/usb/usbip/usbip_common.c
-index f7978933b402..7b219d9109b4 100644
+index cab2b71a80d0..c0e656ecc092 100644
 --- a/drivers/usb/usbip/usbip_common.c
 +++ b/drivers/usb/usbip/usbip_common.c
-@@ -317,26 +317,20 @@ int usbip_recv(struct socket *sock, void *buf, int size)
+@@ -331,26 +331,20 @@ int usbip_recv(struct socket *sock, void *buf, int size)
  	struct msghdr msg = {.msg_flags = MSG_NOSIGNAL};
  	int total = 0;
  
@@ -64,10 +65,10 @@ index f7978933b402..7b219d9109b4 100644
  		total += result;
  	} while (msg_data_left(&msg));
 diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
-index 9efab3dc3734..c3e1008aa491 100644
+index 0585078638db..1485603890c9 100644
 --- a/drivers/usb/usbip/vhci_hcd.c
 +++ b/drivers/usb/usbip/vhci_hcd.c
-@@ -965,7 +965,7 @@ static void vhci_shutdown_connection(struct usbip_device *ud)
+@@ -797,7 +797,7 @@ static void vhci_shutdown_connection(struct usbip_device *ud)
  
  	/* need this? see stub_dev.c */
  	if (ud->tcp_socket) {
diff --git a/queue/usbip-stub-stop-printing-kernel-pointer-addresses-in.patch b/queue/usbip-stub-stop-printing-kernel-pointer-addresses-in.patch
index a5b20ef..a1ca304 100644
--- a/queue/usbip-stub-stop-printing-kernel-pointer-addresses-in.patch
+++ b/queue/usbip-stub-stop-printing-kernel-pointer-addresses-in.patch
@@ -1,4 +1,4 @@
-From 248a22044366f588d46754c54dfe29ffe4f8b4df Mon Sep 17 00:00:00 2001
+From 4515c6423bc14b20f74d582905cf7e189963bb90 Mon Sep 17 00:00:00 2001
 From: Shuah Khan <shuahkh@osg.samsung.com>
 Date: Mon, 18 Dec 2017 17:23:37 -0700
 Subject: [PATCH] usbip: stub: stop printing kernel pointer addresses in
@@ -12,12 +12,13 @@ kernel pointer addresses.
 Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
 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/usbip/stub_main.c b/drivers/usb/usbip/stub_main.c
-index 4f48b306713f..c31c8402a0c5 100644
+index af10f7b131a4..325b4c05acdd 100644
 --- a/drivers/usb/usbip/stub_main.c
 +++ b/drivers/usb/usbip/stub_main.c
-@@ -237,11 +237,12 @@ void stub_device_cleanup_urbs(struct stub_device *sdev)
+@@ -252,11 +252,12 @@ void stub_device_cleanup_urbs(struct stub_device *sdev)
  	struct stub_priv *priv;
  	struct urb *urb;
  
@@ -33,10 +34,10 @@ index 4f48b306713f..c31c8402a0c5 100644
  
  		kmem_cache_free(stub_priv_cache, priv);
 diff --git a/drivers/usb/usbip/stub_rx.c b/drivers/usb/usbip/stub_rx.c
-index 493ac2928391..2f29be474098 100644
+index 283a9be77a22..5b807185f79e 100644
 --- a/drivers/usb/usbip/stub_rx.c
 +++ b/drivers/usb/usbip/stub_rx.c
-@@ -211,9 +211,6 @@ static int stub_recv_cmd_unlink(struct stub_device *sdev,
+@@ -225,9 +225,6 @@ static int stub_recv_cmd_unlink(struct stub_device *sdev,
  		if (priv->seqnum != pdu->u.cmd_unlink.seqnum)
  			continue;
  
@@ -46,7 +47,7 @@ index 493ac2928391..2f29be474098 100644
  		/*
  		 * This matched urb is not completed yet (i.e., be in
  		 * flight in usb hcd hardware/driver). Now we are
-@@ -252,8 +249,8 @@ static int stub_recv_cmd_unlink(struct stub_device *sdev,
+@@ -266,8 +263,8 @@ static int stub_recv_cmd_unlink(struct stub_device *sdev,
  		ret = usb_unlink_urb(priv->urb);
  		if (ret != -EINPROGRESS)
  			dev_err(&priv->urb->dev->dev,
@@ -58,10 +59,10 @@ index 493ac2928391..2f29be474098 100644
  		return 0;
  	}
 diff --git a/drivers/usb/usbip/stub_tx.c b/drivers/usb/usbip/stub_tx.c
-index 53172b1f6257..f0ec41a50cbc 100644
+index 87ff94be4235..96aa375b80d9 100644
 --- a/drivers/usb/usbip/stub_tx.c
 +++ b/drivers/usb/usbip/stub_tx.c
-@@ -88,7 +88,7 @@ void stub_complete(struct urb *urb)
+@@ -102,7 +102,7 @@ void stub_complete(struct urb *urb)
  	/* link a urb to the queue of tx. */
  	spin_lock_irqsave(&sdev->priv_lock, flags);
  	if (sdev->ud.tcp_socket == NULL) {
@@ -70,7 +71,7 @@ index 53172b1f6257..f0ec41a50cbc 100644
  		/* It will be freed in stub_device_cleanup_urbs(). */
  	} else if (priv->unlinking) {
  		stub_enqueue_ret_unlink(sdev, priv->seqnum, urb->status);
-@@ -190,8 +190,8 @@ static int stub_send_ret_submit(struct stub_device *sdev)
+@@ -204,8 +204,8 @@ static int stub_send_ret_submit(struct stub_device *sdev)
  
  		/* 1. setup usbip_header */
  		setup_ret_submit_pdu(&pdu_header, urb);