diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-09-17 14:21:07 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-09-17 14:21:07 -0400 |
commit | 9e507982d8398d13cfcdddffc94321b458d1ac97 (patch) | |
tree | a3d2a285e2c34701e6d98143c26d30739b64f295 | |
parent | cbce914af274b1456487ec64fcb8cdc8c760b082 (diff) | |
download | longterm-queue-5.2-9e507982d8398d13cfcdddffc94321b458d1ac97.tar.gz |
re-export commits with SOB lines added
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
128 files changed, 555 insertions, 427 deletions
diff --git a/queue/ALSA-echoaudio-Fix-potential-Oops-in-snd_echo_resume.patch b/queue/ALSA-echoaudio-Fix-potential-Oops-in-snd_echo_resume.patch index 23a4bb5c..e2f7653b 100644 --- a/queue/ALSA-echoaudio-Fix-potential-Oops-in-snd_echo_resume.patch +++ b/queue/ALSA-echoaudio-Fix-potential-Oops-in-snd_echo_resume.patch @@ -1,4 +1,4 @@ -From 5a25de6df789cc805a9b8ba7ab5deef5067af47e Mon Sep 17 00:00:00 2001 +From 6abcfe3bb5d7be4e521d7fd872eb482a52dbc199 Mon Sep 17 00:00:00 2001 From: Dinghao Liu <dinghao.liu@zju.edu.cn> Date: Thu, 13 Aug 2020 15:46:30 +0800 Subject: [PATCH] ALSA: echoaudio: Fix potential Oops in snd_echo_resume() @@ -13,12 +13,13 @@ Fixes: 47b5d028fdce8 ("ALSA: Echoaudio - Add suspend support #2") Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> Link: https://lore.kernel.org/r/20200813074632.17022-1-dinghao.liu@zju.edu.cn Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c -index 1b7a67ccabce..a20b2bb5c898 100644 +index b612a536a5a1..0e15d497946a 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c -@@ -2212,7 +2212,6 @@ static int snd_echo_resume(struct device *dev) +@@ -2199,7 +2199,6 @@ static int snd_echo_resume(struct device *dev) if (err < 0) { kfree(commpage_bak); dev_err(dev, "resume init_hw err=%d\n", err); @@ -26,7 +27,7 @@ index 1b7a67ccabce..a20b2bb5c898 100644 return err; } -@@ -2239,7 +2238,6 @@ static int snd_echo_resume(struct device *dev) +@@ -2226,7 +2225,6 @@ static int snd_echo_resume(struct device *dev) if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED, KBUILD_MODNAME, chip)) { dev_err(chip->card->dev, "cannot grab irq\n"); diff --git a/queue/ALSA-hda-realtek-Improved-routing-for-Thinkpad-X1-7t.patch b/queue/ALSA-hda-realtek-Improved-routing-for-Thinkpad-X1-7t.patch index 44e5c928..98457911 100644 --- a/queue/ALSA-hda-realtek-Improved-routing-for-Thinkpad-X1-7t.patch +++ b/queue/ALSA-hda-realtek-Improved-routing-for-Thinkpad-X1-7t.patch @@ -1,4 +1,4 @@ -From 6a6660d049f88b89fd9a4b9db3581b245f7782fa Mon Sep 17 00:00:00 2001 +From 6efb865f09f77191376cac90ae99770816cba1be Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai@suse.de> Date: Thu, 3 Sep 2020 10:33:00 +0200 Subject: [PATCH] ALSA: hda/realtek - Improved routing for Thinkpad X1 7th/8th @@ -58,12 +58,13 @@ BugLink: https://gist.github.com/hamidzr/dd81e429dc86f4327ded7a2030e7d7d9#gistco Link: https://lore/kernel.org/r/20200829112746.3118-1-benjamin.poirier@gmail.com Link: https://lore.kernel.org/r/20200903083300.6333-1-tiwai@suse.de 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 2ef8b080d84b..c521a1f17096 100644 +index 0a3d985e3400..d496ad64a880 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c -@@ -5868,6 +5868,39 @@ static void alc275_fixup_gpio4_off(struct hda_codec *codec, +@@ -5848,6 +5848,39 @@ static void alc275_fixup_gpio4_off(struct hda_codec *codec, } } @@ -103,7 +104,7 @@ index 2ef8b080d84b..c521a1f17096 100644 static void alc233_alc662_fixup_lenovo_dual_codecs(struct hda_codec *codec, const struct hda_fixup *fix, int action) -@@ -6136,6 +6169,7 @@ enum { +@@ -6114,6 +6147,7 @@ enum { ALC289_FIXUP_DUAL_SPK, ALC294_FIXUP_SPK2_TO_DAC1, ALC294_FIXUP_ASUS_DUAL_SPK, @@ -111,7 +112,7 @@ index 2ef8b080d84b..c521a1f17096 100644 ALC285_FIXUP_THINKPAD_HEADSET_JACK, ALC294_FIXUP_ASUS_HPE, ALC294_FIXUP_ASUS_COEF_1B, -@@ -7281,11 +7315,17 @@ static const struct hda_fixup alc269_fixups[] = { +@@ -7242,11 +7276,17 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC294_FIXUP_SPK2_TO_DAC1 }, diff --git a/queue/IB-uverbs-Set-IOVA-on-IB-MR-in-uverbs-layer.patch b/queue/IB-uverbs-Set-IOVA-on-IB-MR-in-uverbs-layer.patch index 9792247e..070f69b3 100644 --- a/queue/IB-uverbs-Set-IOVA-on-IB-MR-in-uverbs-layer.patch +++ b/queue/IB-uverbs-Set-IOVA-on-IB-MR-in-uverbs-layer.patch @@ -1,4 +1,4 @@ -From 04c0a5fcfcf65aade2fb238b6336445f1a99b646 Mon Sep 17 00:00:00 2001 +From c4f7fdd914ed9bbb4b44761ef8fc8fb60cc71bed Mon Sep 17 00:00:00 2001 From: Yishai Hadas <yishaih@mellanox.com> Date: Tue, 30 Jun 2020 12:39:11 +0300 Subject: [PATCH] IB/uverbs: Set IOVA on IB MR in uverbs layer @@ -15,12 +15,13 @@ Link: https://lore.kernel.org/r/20200630093916.332097-3-leon@kernel.org Signed-off-by: Yishai Hadas <yishaih@mellanox.com> Signed-off-by: Leon Romanovsky <leonro@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.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 89ff5d06c5d7..68c9a0210220 100644 +index e01bb641e5ae..6273d2430736 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c -@@ -764,6 +764,7 @@ static int ib_uverbs_reg_mr(struct uverbs_attr_bundle *attrs) +@@ -760,6 +760,7 @@ static int ib_uverbs_reg_mr(struct uverbs_attr_bundle *attrs) mr->uobject = uobj; atomic_inc(&pd->usecnt); mr->res.type = RDMA_RESTRACK_MR; @@ -28,7 +29,7 @@ index 89ff5d06c5d7..68c9a0210220 100644 rdma_restrack_uadd(&mr->res); uobj->object = mr; -@@ -855,6 +856,9 @@ static int ib_uverbs_rereg_mr(struct uverbs_attr_bundle *attrs) +@@ -850,6 +851,9 @@ static int ib_uverbs_rereg_mr(struct uverbs_attr_bundle *attrs) atomic_dec(&old_pd->usecnt); } @@ -39,10 +40,10 @@ index 89ff5d06c5d7..68c9a0210220 100644 resp.lkey = mr->lkey; resp.rkey = mr->rkey; diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c -index ea6fb2c5b1a7..73936c3341b7 100644 +index 69b287d025f7..7af958b3318e 100644 --- a/drivers/infiniband/hw/cxgb4/mem.c +++ b/drivers/infiniband/hw/cxgb4/mem.c -@@ -399,7 +399,6 @@ static int finish_mem_reg(struct c4iw_mr *mhp, u32 stag) +@@ -398,7 +398,6 @@ static int finish_mem_reg(struct c4iw_mr *mhp, u32 stag) mmid = stag >> 8; mhp->ibmr.rkey = mhp->ibmr.lkey = stag; mhp->ibmr.length = mhp->attr.len; @@ -51,10 +52,10 @@ index ea6fb2c5b1a7..73936c3341b7 100644 pr_debug("mmid 0x%x mhp %p\n", mmid, mhp); return xa_insert_irq(&mhp->rhp->mrs, mmid, mhp, GFP_KERNEL); diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c -index 6eecedeff2d3..1d5ef0de12c9 100644 +index 355205a28544..6fd661076ade 100644 --- a/drivers/infiniband/hw/mlx4/mr.c +++ b/drivers/infiniband/hw/mlx4/mr.c -@@ -439,7 +439,6 @@ struct ib_mr *mlx4_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, +@@ -440,7 +440,6 @@ struct ib_mr *mlx4_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, mr->ibmr.rkey = mr->ibmr.lkey = mr->mmr.key; mr->ibmr.length = length; diff --git a/queue/Input-sentelic-fix-error-return-when-fsp_reg_write-f.patch b/queue/Input-sentelic-fix-error-return-when-fsp_reg_write-f.patch index 22b478d6..84b4608e 100644 --- a/queue/Input-sentelic-fix-error-return-when-fsp_reg_write-f.patch +++ b/queue/Input-sentelic-fix-error-return-when-fsp_reg_write-f.patch @@ -1,4 +1,4 @@ -From ea38f06e0291986eb93beb6d61fd413607a30ca4 Mon Sep 17 00:00:00 2001 +From 105a047986d37a8ab024ee80b38215ccb2d9c426 Mon Sep 17 00:00:00 2001 From: Colin Ian King <colin.king@canonical.com> Date: Thu, 6 Aug 2020 15:35:34 -0700 Subject: [PATCH] Input: sentelic - fix error return when fsp_reg_write fails @@ -14,9 +14,10 @@ Fixes: fc69f4a6af49 ("Input: add new driver for Sentelic Finger Sensing Pad") Signed-off-by: Colin Ian King <colin.king@canonical.com> Link: https://lore.kernel.org/r/20200603141218.131663-1-colin.king@canonical.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c -index 9f7ecc72093a..2716d2ba386a 100644 +index e99d9bf1a267..e78c4c7eda34 100644 --- a/drivers/input/mouse/sentelic.c +++ b/drivers/input/mouse/sentelic.c @@ -441,7 +441,7 @@ static ssize_t fsp_attr_set_setreg(struct psmouse *psmouse, void *data, diff --git a/queue/Linux-5.2.60.patch b/queue/Linux-5.2.60.patch index 5535bf57..d99cd932 100644 --- a/queue/Linux-5.2.60.patch +++ b/queue/Linux-5.2.60.patch @@ -1,8 +1,9 @@ -From 1e2552e2529a49c8e10f6f535321e9c6ff613814 Mon Sep 17 00:00:00 2001 +From 8f2eda95a2187e220481605ca5f2b87413f7ae8e Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Thu, 17 Sep 2020 13:57:32 -0400 Subject: [PATCH] Linux 5.2.60 +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/Makefile b/Makefile index f42134a1b5bd..caecba89599c 100644 diff --git a/queue/MIPS-CPU-0-is-not-hotpluggable.patch b/queue/MIPS-CPU-0-is-not-hotpluggable.patch index 4cd96250..7ea2e228 100644 --- a/queue/MIPS-CPU-0-is-not-hotpluggable.patch +++ b/queue/MIPS-CPU-0-is-not-hotpluggable.patch @@ -1,4 +1,4 @@ -From 9cce844abf07b683cff5f0273977d5f8d0af94c7 Mon Sep 17 00:00:00 2001 +From aa8faf4566562b176bdbec4ad449426f266eec75 Mon Sep 17 00:00:00 2001 From: Huacai Chen <chenhc@lemote.com> Date: Thu, 16 Jul 2020 18:40:23 +0800 Subject: [PATCH] MIPS: CPU#0 is not hotpluggable @@ -11,6 +11,7 @@ Now CPU#0 is not hotpluggable on MIPS, so prevent to create /sys/devices Cc: stable@vger.kernel.org Signed-off-by: Huacai Chen <chenhc@lemote.com> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/kernel/topology.c b/arch/mips/kernel/topology.c index cd3e1f82e1a5..08ad6371fbe0 100644 diff --git a/queue/PCI-Add-device-even-if-driver-attach-failed.patch b/queue/PCI-Add-device-even-if-driver-attach-failed.patch index 5e7283ac..c7e17fef 100644 --- a/queue/PCI-Add-device-even-if-driver-attach-failed.patch +++ b/queue/PCI-Add-device-even-if-driver-attach-failed.patch @@ -1,4 +1,4 @@ -From 2194bc7c39610be7cabe7456c5f63a570604f015 Mon Sep 17 00:00:00 2001 +From 790ab192a5306b97192a9a26e3276a8b775db15e Mon Sep 17 00:00:00 2001 From: Rajat Jain <rajatja@google.com> Date: Mon, 6 Jul 2020 16:32:40 -0700 Subject: [PATCH] PCI: Add device even if driver attach failed @@ -20,9 +20,10 @@ Signed-off-by: Rajat Jain <rajatja@google.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: stable@vger.kernel.org # v4.6+ +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c -index 8e40b3e6da77..3cef835b375f 100644 +index 495059d923f7..ff1170dd172d 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -322,12 +322,8 @@ void pci_bus_add_device(struct pci_dev *dev) diff --git a/queue/PCI-Mark-AMD-Navi10-GPU-rev-0x00-ATS-as-broken.patch b/queue/PCI-Mark-AMD-Navi10-GPU-rev-0x00-ATS-as-broken.patch index 3cf8ad20..08af8eb3 100644 --- a/queue/PCI-Mark-AMD-Navi10-GPU-rev-0x00-ATS-as-broken.patch +++ b/queue/PCI-Mark-AMD-Navi10-GPU-rev-0x00-ATS-as-broken.patch @@ -1,4 +1,4 @@ -From 45beb31d3afb651bb5c41897e46bd4fa9980c51c Mon Sep 17 00:00:00 2001 +From 2a6f2dec0b72e273fee49296c54a335459a75c03 Mon Sep 17 00:00:00 2001 From: Kai-Heng Feng <kai.heng.feng@canonical.com> Date: Tue, 28 Jul 2020 18:45:53 +0800 Subject: [PATCH] PCI: Mark AMD Navi10 GPU rev 0x00 ATS as broken @@ -25,12 +25,13 @@ Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 812bfc32ecb8..052efeb9f053 100644 +index 14412a66b897..2984ff2e1ea6 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -5192,7 +5192,8 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0422, quirk_no_ext_tags); +@@ -5118,7 +5118,8 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0422, quirk_no_ext_tags); */ static void quirk_amd_harvest_no_ats(struct pci_dev *pdev) { @@ -40,7 +41,7 @@ index 812bfc32ecb8..052efeb9f053 100644 return; pci_info(pdev, "disabling ATS\n"); -@@ -5203,6 +5204,8 @@ static void quirk_amd_harvest_no_ats(struct pci_dev *pdev) +@@ -5129,6 +5130,8 @@ static void quirk_amd_harvest_no_ats(struct pci_dev *pdev) DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x98e4, quirk_amd_harvest_no_ats); /* AMD Iceland dGPU */ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x6900, quirk_amd_harvest_no_ats); diff --git a/queue/PCI-hotplug-ACPI-Fix-context-refcounting-in-acpiphp_.patch b/queue/PCI-hotplug-ACPI-Fix-context-refcounting-in-acpiphp_.patch index 3a4a777b..3333e2dd 100644 --- a/queue/PCI-hotplug-ACPI-Fix-context-refcounting-in-acpiphp_.patch +++ b/queue/PCI-hotplug-ACPI-Fix-context-refcounting-in-acpiphp_.patch @@ -1,4 +1,4 @@ -From dae68d7fd4930315389117e9da35b763f12238f9 Mon Sep 17 00:00:00 2001 +From f13a287f1b74dea4e34a8c4c7c98dedd045720f9 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> Date: Fri, 26 Jun 2020 19:42:34 +0200 Subject: [PATCH] PCI: hotplug: ACPI: Fix context refcounting in @@ -15,9 +15,10 @@ Fixes: edf5bf34d408 ("ACPI / dock: Use callback pointers from devices' ACPI hotp Reported-by: Vasily Averin <vvs@virtuozzo.com> Cc: 3.15+ <stable@vger.kernel.org> # 3.15+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c -index b4c92cee13f8..3365c93abf0e 100644 +index b3869951c0eb..6e60b4b1bf53 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -122,13 +122,21 @@ static struct acpiphp_context *acpiphp_grab_context(struct acpi_device *adev) diff --git a/queue/PCI-qcom-Add-support-for-tx-term-offset-for-rev-2.1..patch b/queue/PCI-qcom-Add-support-for-tx-term-offset-for-rev-2.1..patch index a25ccc49..b44fc699 100644 --- a/queue/PCI-qcom-Add-support-for-tx-term-offset-for-rev-2.1..patch +++ b/queue/PCI-qcom-Add-support-for-tx-term-offset-for-rev-2.1..patch @@ -1,4 +1,4 @@ -From 7c9d5d15b713f94102aaf82ad79b54f725c2a875 Mon Sep 17 00:00:00 2001 +From 608838157f268584f253a29051a227e225b8ee44 Mon Sep 17 00:00:00 2001 From: Ansuel Smith <ansuelsmth@gmail.com> Date: Mon, 15 Jun 2020 23:06:04 +0200 Subject: [PATCH] PCI: qcom: Add support for tx term offset for rev 2.1.0 @@ -15,6 +15,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Acked-by: Stanimir Varbanov <svarbanov@mm-sol.com> Cc: stable@vger.kernel.org # v4.5+ +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 8611760c9501..a16994e59776 100644 diff --git a/queue/PCI-qcom-Define-some-PARF-params-needed-for-ipq8064-.patch b/queue/PCI-qcom-Define-some-PARF-params-needed-for-ipq8064-.patch index fb9baa55..eeb5df70 100644 --- a/queue/PCI-qcom-Define-some-PARF-params-needed-for-ipq8064-.patch +++ b/queue/PCI-qcom-Define-some-PARF-params-needed-for-ipq8064-.patch @@ -1,4 +1,4 @@ -From 5149901e9e6deca487c01cc434a3ac4125c7b00b Mon Sep 17 00:00:00 2001 +From 964aec4313702b433d66895ba1e761ab2a457cfa Mon Sep 17 00:00:00 2001 From: Ansuel Smith <ansuelsmth@gmail.com> Date: Mon, 15 Jun 2020 23:06:03 +0200 Subject: [PATCH] PCI: qcom: Define some PARF params needed for ipq8064 SoC @@ -16,12 +16,13 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Reviewed-by: Rob Herring <robh@kernel.org> Acked-by: Stanimir Varbanov <svarbanov@mm-sol.com> Cc: stable@vger.kernel.org # v4.5+ +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c -index 8cb36cbcde46..69c7b119e81a 100644 +index fbf7a006d854..8611760c9501 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c -@@ -77,6 +77,18 @@ +@@ -76,6 +76,18 @@ #define DBI_RO_WR_EN 1 #define PERST_DELAY_US 1000 @@ -40,7 +41,7 @@ index 8cb36cbcde46..69c7b119e81a 100644 #define PCIE20_v3_PARF_SLV_ADDR_SPACE_SIZE 0x358 #define SLV_ADDR_SPACE_SZ 0x10000000 -@@ -293,6 +305,7 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) +@@ -275,6 +287,7 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0; struct dw_pcie *pci = pcie->pci; struct device *dev = pci->dev; @@ -48,7 +49,7 @@ index 8cb36cbcde46..69c7b119e81a 100644 u32 val; int ret; -@@ -347,6 +360,17 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) +@@ -319,6 +332,17 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) val &= ~BIT(0); writel(val, pcie->parf + PCIE20_PARF_PHY_CTRL); diff --git a/queue/RDMA-ipoib-Fix-ABBA-deadlock-with-ipoib_reap_ah.patch b/queue/RDMA-ipoib-Fix-ABBA-deadlock-with-ipoib_reap_ah.patch index 76a48a7a..6bf7f2b0 100644 --- a/queue/RDMA-ipoib-Fix-ABBA-deadlock-with-ipoib_reap_ah.patch +++ b/queue/RDMA-ipoib-Fix-ABBA-deadlock-with-ipoib_reap_ah.patch @@ -1,4 +1,4 @@ -From 65936bf25f90fe440bb2d11624c7d10fab266639 Mon Sep 17 00:00:00 2001 +From 7ca5488566d243f06ba818f7e98dcb483448c100 Mon Sep 17 00:00:00 2001 From: Jason Gunthorpe <jgg@nvidia.com> Date: Thu, 25 Jun 2020 20:42:19 +0300 Subject: [PATCH] RDMA/ipoib: Fix ABBA deadlock with ipoib_reap_ah() @@ -47,12 +47,13 @@ Link: https://lore.kernel.org/r/20200625174219.290842-1-kamalheib1@gmail.com Reported-by: Kamal Heib <kheib@redhat.com> Tested-by: Kamal Heib <kheib@redhat.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c -index 6ee64c25aaff..494f413dc3c6 100644 +index d10da34d9fef..7b598b66f235 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c -@@ -670,13 +670,12 @@ int ipoib_send(struct net_device *dev, struct sk_buff *skb, +@@ -669,13 +669,12 @@ int ipoib_send(struct net_device *dev, struct sk_buff *skb, return rc; } @@ -68,7 +69,7 @@ index 6ee64c25aaff..494f413dc3c6 100644 spin_lock_irqsave(&priv->lock, flags); list_for_each_entry_safe(ah, tah, &priv->dead_ahs, list) -@@ -687,37 +686,37 @@ static void __ipoib_reap_ah(struct net_device *dev) +@@ -686,37 +685,37 @@ static void __ipoib_reap_ah(struct net_device *dev) } spin_unlock_irqrestore(&priv->lock, flags); @@ -119,7 +120,7 @@ index 6ee64c25aaff..494f413dc3c6 100644 } static int recvs_pending(struct net_device *dev) -@@ -846,16 +845,6 @@ timeout: +@@ -845,16 +844,6 @@ int ipoib_ib_dev_stop_default(struct net_device *dev) return 0; } @@ -136,7 +137,7 @@ index 6ee64c25aaff..494f413dc3c6 100644 int ipoib_ib_dev_open_default(struct net_device *dev) { struct ipoib_dev_priv *priv = ipoib_priv(dev); -@@ -899,10 +888,7 @@ int ipoib_ib_dev_open(struct net_device *dev) +@@ -898,10 +887,7 @@ int ipoib_ib_dev_open(struct net_device *dev) return -1; } @@ -148,7 +149,7 @@ index 6ee64c25aaff..494f413dc3c6 100644 if (priv->rn_ops->ndo_open(dev)) { pr_warn("%s: Failed to open dev\n", dev->name); goto dev_stop; -@@ -913,13 +899,20 @@ int ipoib_ib_dev_open(struct net_device *dev) +@@ -912,13 +898,20 @@ int ipoib_ib_dev_open(struct net_device *dev) return 0; dev_stop: @@ -173,7 +174,7 @@ index 6ee64c25aaff..494f413dc3c6 100644 void ipoib_pkey_dev_check_presence(struct net_device *dev) { struct ipoib_dev_priv *priv = ipoib_priv(dev); -@@ -1230,7 +1223,7 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv, +@@ -1229,7 +1222,7 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv, ipoib_mcast_dev_flush(dev); if (oper_up) set_bit(IPOIB_FLAG_OPER_UP, &priv->flags); @@ -182,7 +183,7 @@ index 6ee64c25aaff..494f413dc3c6 100644 } if (level >= IPOIB_FLUSH_NORMAL) -@@ -1305,7 +1298,7 @@ void ipoib_ib_dev_cleanup(struct net_device *dev) +@@ -1304,7 +1297,7 @@ void ipoib_ib_dev_cleanup(struct net_device *dev) * the neighbor garbage collection is stopped and reaped. * That should all be done now, so make a final ah flush. */ @@ -192,10 +193,10 @@ index 6ee64c25aaff..494f413dc3c6 100644 clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags); diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c -index 3cfb682b91b0..ef60e8e4ae67 100644 +index 4fd095fd63b6..044bcacad6e4 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c -@@ -1976,6 +1976,8 @@ static void ipoib_ndo_uninit(struct net_device *dev) +@@ -1979,6 +1979,8 @@ static void ipoib_ndo_uninit(struct net_device *dev) /* no more works over the priv->wq */ if (priv->wq) { diff --git a/queue/RDMA-ipoib-Return-void-from-ipoib_ib_dev_stop.patch b/queue/RDMA-ipoib-Return-void-from-ipoib_ib_dev_stop.patch index f3b00960..e0fc580c 100644 --- a/queue/RDMA-ipoib-Return-void-from-ipoib_ib_dev_stop.patch +++ b/queue/RDMA-ipoib-Return-void-from-ipoib_ib_dev_stop.patch @@ -1,4 +1,4 @@ -From 95a5631f6c9f3045f26245e6045244652204dfdb Mon Sep 17 00:00:00 2001 +From cc440178d387c2b811af124650a0e8b46fcc8adc Mon Sep 17 00:00:00 2001 From: Kamal Heib <kamalheib1@gmail.com> Date: Tue, 23 Jun 2020 13:52:36 +0300 Subject: [PATCH] RDMA/ipoib: Return void from ipoib_ib_dev_stop() @@ -11,9 +11,10 @@ void. Link: https://lore.kernel.org/r/20200623105236.18683-1-kamalheib1@gmail.com Signed-off-by: Kamal Heib <kamalheib1@gmail.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h -index 15f519ce7e0b..3440dc48d02c 100644 +index 0e5f27caf2b2..50a355738609 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/drivers/infiniband/ulp/ipoib/ipoib.h @@ -515,7 +515,7 @@ void ipoib_ib_dev_cleanup(struct net_device *dev); @@ -26,10 +27,10 @@ index 15f519ce7e0b..3440dc48d02c 100644 void ipoib_ib_dev_down(struct net_device *dev); int ipoib_ib_dev_stop_default(struct net_device *dev); diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c -index da3c5315bbb5..6ee64c25aaff 100644 +index aec931973fd8..d10da34d9fef 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c -@@ -846,7 +846,7 @@ timeout: +@@ -845,7 +845,7 @@ int ipoib_ib_dev_stop_default(struct net_device *dev) return 0; } @@ -38,7 +39,7 @@ index da3c5315bbb5..6ee64c25aaff 100644 { struct ipoib_dev_priv *priv = ipoib_priv(dev); -@@ -854,8 +854,6 @@ int ipoib_ib_dev_stop(struct net_device *dev) +@@ -853,8 +853,6 @@ int ipoib_ib_dev_stop(struct net_device *dev) clear_bit(IPOIB_FLAG_INITIALIZED, &priv->flags); ipoib_flush_ah(dev); diff --git a/queue/RDMA-mlx4-Read-pkey-table-length-instead-of-hardcode.patch b/queue/RDMA-mlx4-Read-pkey-table-length-instead-of-hardcode.patch index ba6f1a59..27624501 100644 --- a/queue/RDMA-mlx4-Read-pkey-table-length-instead-of-hardcode.patch +++ b/queue/RDMA-mlx4-Read-pkey-table-length-instead-of-hardcode.patch @@ -1,4 +1,4 @@ -From ec78b3bd66bc9a015505df0ef0eb153d9e64b03b Mon Sep 17 00:00:00 2001 +From f417b2cb102f14d06f85ffdbb11a0eaafe05bec5 Mon Sep 17 00:00:00 2001 From: Mark Bloch <markb@mellanox.com> Date: Mon, 24 Aug 2020 14:02:29 +0300 Subject: [PATCH] RDMA/mlx4: Read pkey table length instead of hardcoded value @@ -21,12 +21,13 @@ Signed-off-by: Mark Bloch <markb@mellanox.com> Reviewed-by: Maor Gottlieb <maorg@nvidia.com> Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c -index 5e7910a517da..bd4f975e7f9a 100644 +index 7d64e70e54c6..4aa439a7ce61 100644 --- a/drivers/infiniband/hw/mlx4/main.c +++ b/drivers/infiniband/hw/mlx4/main.c -@@ -784,7 +784,8 @@ static int eth_link_query_port(struct ib_device *ibdev, u8 port, +@@ -780,7 +780,8 @@ static int eth_link_query_port(struct ib_device *ibdev, u8 port, props->ip_gids = true; props->gid_tbl_len = mdev->dev->caps.gid_table_len[port]; props->max_msg_sz = mdev->dev->caps.max_msg_sz; diff --git a/queue/USB-serial-ftdi_sio-clean-up-receive-processing.patch b/queue/USB-serial-ftdi_sio-clean-up-receive-processing.patch index 39a528d8..c41ee293 100644 --- a/queue/USB-serial-ftdi_sio-clean-up-receive-processing.patch +++ b/queue/USB-serial-ftdi_sio-clean-up-receive-processing.patch @@ -1,4 +1,4 @@ -From ce054039ba5e47b75a3be02a00274e52b06a6456 Mon Sep 17 00:00:00 2001 +From 765fd98acaf87df59fc8ff041ea7c9b574228d8e Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Wed, 8 Jul 2020 14:49:52 +0200 Subject: [PATCH] USB: serial: ftdi_sio: clean up receive processing @@ -13,12 +13,13 @@ characters by adding an explicit continue. Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 96b9e2768ac5..33f1cca7eaa6 100644 +index 2587dcd3de68..13aaf0687367 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c -@@ -2483,7 +2483,6 @@ static int ftdi_process_packet(struct usb_serial_port *port, +@@ -2440,7 +2440,6 @@ static int ftdi_process_packet(struct usb_serial_port *port, struct ftdi_private *priv, unsigned char *buf, int len) { unsigned char status; @@ -26,7 +27,7 @@ index 96b9e2768ac5..33f1cca7eaa6 100644 int i; char flag; -@@ -2526,8 +2525,7 @@ static int ftdi_process_packet(struct usb_serial_port *port, +@@ -2483,8 +2482,7 @@ static int ftdi_process_packet(struct usb_serial_port *port, else priv->transmit_empty = 0; @@ -36,7 +37,7 @@ index 96b9e2768ac5..33f1cca7eaa6 100644 return 0; /* status only */ /* -@@ -2556,19 +2554,20 @@ static int ftdi_process_packet(struct usb_serial_port *port, +@@ -2513,19 +2511,20 @@ static int ftdi_process_packet(struct usb_serial_port *port, } } diff --git a/queue/USB-serial-ftdi_sio-make-process-packet-buffer-unsig.patch b/queue/USB-serial-ftdi_sio-make-process-packet-buffer-unsig.patch index 3fd1c674..a2345807 100644 --- a/queue/USB-serial-ftdi_sio-make-process-packet-buffer-unsig.patch +++ b/queue/USB-serial-ftdi_sio-make-process-packet-buffer-unsig.patch @@ -1,4 +1,4 @@ -From ab4cc4ef6724ea588e835fc1e764c4b4407a70b7 Mon Sep 17 00:00:00 2001 +From 28e44a0d07582d455d4e0f93a20870bc0887e9fc Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Wed, 8 Jul 2020 14:49:51 +0200 Subject: [PATCH] USB: serial: ftdi_sio: make process-packet buffer unsigned @@ -10,12 +10,13 @@ a more apt name. Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 9ad44a96dfe3..96b9e2768ac5 100644 +index 0346b046cca2..2587dcd3de68 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c -@@ -2480,12 +2480,12 @@ static int ftdi_prepare_write_buffer(struct usb_serial_port *port, +@@ -2437,12 +2437,12 @@ static int ftdi_prepare_write_buffer(struct usb_serial_port *port, #define FTDI_RS_ERR_MASK (FTDI_RS_BI | FTDI_RS_PE | FTDI_RS_FE | FTDI_RS_OE) static int ftdi_process_packet(struct usb_serial_port *port, @@ -31,7 +32,7 @@ index 9ad44a96dfe3..96b9e2768ac5 100644 if (len < 2) { dev_dbg(&port->dev, "malformed packet\n"); -@@ -2495,7 +2495,7 @@ static int ftdi_process_packet(struct usb_serial_port *port, +@@ -2452,7 +2452,7 @@ static int ftdi_process_packet(struct usb_serial_port *port, /* Compare new line status to the old one, signal if different/ N.B. packet may be processed more than once, but differences are only processed once. */ @@ -40,7 +41,7 @@ index 9ad44a96dfe3..96b9e2768ac5 100644 if (status != priv->prev_status) { char diff_status = status ^ priv->prev_status; -@@ -2521,7 +2521,7 @@ static int ftdi_process_packet(struct usb_serial_port *port, +@@ -2478,7 +2478,7 @@ static int ftdi_process_packet(struct usb_serial_port *port, } /* save if the transmitter is empty or not */ @@ -49,7 +50,7 @@ index 9ad44a96dfe3..96b9e2768ac5 100644 priv->transmit_empty = 1; else priv->transmit_empty = 0; -@@ -2535,29 +2535,29 @@ static int ftdi_process_packet(struct usb_serial_port *port, +@@ -2492,29 +2492,29 @@ static int ftdi_process_packet(struct usb_serial_port *port, * data payload to avoid over-reporting. */ flag = TTY_NORMAL; diff --git a/queue/arm64-perf-Correct-the-event-index-in-sysfs.patch b/queue/arm64-perf-Correct-the-event-index-in-sysfs.patch index ba920e43..1808a00f 100644 --- a/queue/arm64-perf-Correct-the-event-index-in-sysfs.patch +++ b/queue/arm64-perf-Correct-the-event-index-in-sysfs.patch @@ -1,4 +1,4 @@ -From 7c6cbf242ba663b2d2dc552acb37a81a58ec1a33 Mon Sep 17 00:00:00 2001 +From fabef2fc9a81373331ccfb2556aba99e99035f2f Mon Sep 17 00:00:00 2001 From: Shaokun Zhang <zhangshaokun@hisilicon.com> Date: Thu, 18 Jun 2020 21:35:44 +0800 Subject: [PATCH] arm64: perf: Correct the event index in sysfs @@ -23,6 +23,7 @@ Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/1592487344-30555-3-git-send-email-zhangshaokun@hisilicon.com [will: fixed formatting of 'if' condition] Signed-off-by: Will Deacon <will@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 96e90e270042..1439cff99a28 100644 diff --git a/queue/bcache-allocate-meta-data-pages-as-compound-pages.patch b/queue/bcache-allocate-meta-data-pages-as-compound-pages.patch index e311f915..7110948e 100644 --- a/queue/bcache-allocate-meta-data-pages-as-compound-pages.patch +++ b/queue/bcache-allocate-meta-data-pages-as-compound-pages.patch @@ -1,4 +1,4 @@ -From 5fe48867856367142d91a82f2cbf7a57a24cbb70 Mon Sep 17 00:00:00 2001 +From 38fde51131c5cb12f9fd4e0e13812d26e3b4d77e Mon Sep 17 00:00:00 2001 From: Coly Li <colyli@suse.de> Date: Sat, 25 Jul 2020 20:00:16 +0800 Subject: [PATCH] bcache: allocate meta data pages as compound pages @@ -21,12 +21,13 @@ as compound pages now. Signed-off-by: Coly Li <colyli@suse.de> Cc: stable@vger.kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c -index 4995fcaefe29..67a2c47f4201 100644 +index 268f1b685084..ec48cf86cab6 100644 --- a/drivers/md/bcache/bset.c +++ b/drivers/md/bcache/bset.c -@@ -322,7 +322,7 @@ int bch_btree_keys_alloc(struct btree_keys *b, +@@ -321,7 +321,7 @@ int bch_btree_keys_alloc(struct btree_keys *b, b->page_order = page_order; @@ -36,10 +37,10 @@ index 4995fcaefe29..67a2c47f4201 100644 goto err; diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c -index d5c51e332046..1e3bd5ea5486 100644 +index b6a50e5e818e..b60cb7a99b18 100644 --- a/drivers/md/bcache/btree.c +++ b/drivers/md/bcache/btree.c -@@ -785,7 +785,7 @@ int bch_btree_cache_alloc(struct cache_set *c) +@@ -836,7 +836,7 @@ int bch_btree_cache_alloc(struct cache_set *c) mutex_init(&c->verify_lock); c->verify_ondisk = (void *) @@ -49,10 +50,10 @@ index d5c51e332046..1e3bd5ea5486 100644 c->verify_data = mca_bucket_alloc(c, &ZERO_KEY, GFP_KERNEL); diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c -index 90aac4e2333f..d8586b6ccb76 100644 +index 33556acdcf9c..e145c2b1e2c9 100644 --- a/drivers/md/bcache/journal.c +++ b/drivers/md/bcache/journal.c -@@ -999,8 +999,8 @@ int bch_journal_alloc(struct cache_set *c) +@@ -865,8 +865,8 @@ int bch_journal_alloc(struct cache_set *c) j->w[1].c = c; if (!(init_fifo(&j->pin, JOURNAL_PIN, GFP_KERNEL)) || @@ -64,10 +65,10 @@ index 90aac4e2333f..d8586b6ccb76 100644 return 0; diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c -index fb54a59ffe12..4a77bfd4009f 100644 +index de6d60ca1bd2..5248bca5e2ed 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c -@@ -1784,7 +1784,7 @@ void bch_cache_set_unregister(struct cache_set *c) +@@ -1703,7 +1703,7 @@ void bch_cache_set_unregister(struct cache_set *c) } #define alloc_bucket_pages(gfp, c) \ diff --git a/queue/bcache-fix-overflow-in-offset_to_stripe.patch b/queue/bcache-fix-overflow-in-offset_to_stripe.patch index 70f4bda8..af452ad4 100644 --- a/queue/bcache-fix-overflow-in-offset_to_stripe.patch +++ b/queue/bcache-fix-overflow-in-offset_to_stripe.patch @@ -1,4 +1,4 @@ -From 7a1481267999c02abf4a624515c1b5c7c1fccbd6 Mon Sep 17 00:00:00 2001 +From 08791c9c3bc83d095cd0836a27b1f7b5aea1413e Mon Sep 17 00:00:00 2001 From: Coly Li <colyli@suse.de> Date: Sat, 25 Jul 2020 20:00:22 +0800 Subject: [PATCH] bcache: fix overflow in offset_to_stripe() @@ -35,9 +35,10 @@ Signed-off-by: Coly Li <colyli@suse.de> Cc: stable@vger.kernel.org Link: https://bugzilla.redhat.com/show_bug.cgi?id=1783075 Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h -index 3c708e8b5e2d..2d1743c0217a 100644 +index eb918b2dc805..2e396954b39d 100644 --- a/drivers/md/bcache/bcache.h +++ b/drivers/md/bcache/bcache.h @@ -264,7 +264,7 @@ struct bcache_device { @@ -50,10 +51,10 @@ index 3c708e8b5e2d..2d1743c0217a 100644 atomic_t *stripe_sectors_dirty; unsigned long *full_dirty_stripes; diff --git a/drivers/md/bcache/writeback.c b/drivers/md/bcache/writeback.c -index 5397a2c5d6cc..4f4ad6b3d43a 100644 +index e9ffcea1ca50..58bedd51e11b 100644 --- a/drivers/md/bcache/writeback.c +++ b/drivers/md/bcache/writeback.c -@@ -521,15 +521,19 @@ void bcache_dev_sectors_dirty_add(struct cache_set *c, unsigned int inode, +@@ -516,15 +516,19 @@ void bcache_dev_sectors_dirty_add(struct cache_set *c, unsigned int inode, uint64_t offset, int nr_sectors) { struct bcache_device *d = c->devices[inode]; @@ -75,7 +76,7 @@ index 5397a2c5d6cc..4f4ad6b3d43a 100644 stripe_offset = offset & (d->stripe_size - 1); while (nr_sectors) { -@@ -569,12 +573,12 @@ static bool dirty_pred(struct keybuf *buf, struct bkey *k) +@@ -564,12 +568,12 @@ static bool dirty_pred(struct keybuf *buf, struct bkey *k) static void refill_full_stripes(struct cached_dev *dc) { struct keybuf *buf = &dc->writeback_keys; @@ -92,10 +93,10 @@ index 5397a2c5d6cc..4f4ad6b3d43a 100644 start_stripe = stripe; diff --git a/drivers/md/bcache/writeback.h b/drivers/md/bcache/writeback.h -index b029843ce5b6..3f1230e22de0 100644 +index 4e4c6810dc3c..c4ff76037227 100644 --- a/drivers/md/bcache/writeback.h +++ b/drivers/md/bcache/writeback.h -@@ -52,10 +52,22 @@ static inline uint64_t bcache_dev_sectors_dirty(struct bcache_device *d) +@@ -33,10 +33,22 @@ static inline uint64_t bcache_dev_sectors_dirty(struct bcache_device *d) return ret; } @@ -119,7 +120,7 @@ index b029843ce5b6..3f1230e22de0 100644 return offset; } -@@ -63,7 +75,10 @@ static inline bool bcache_dev_stripe_dirty(struct cached_dev *dc, +@@ -44,7 +56,10 @@ static inline bool bcache_dev_stripe_dirty(struct cached_dev *dc, uint64_t offset, unsigned int nr_sectors) { diff --git a/queue/block-Set-same_page-to-false-in-__bio_try_merge_page.patch b/queue/block-Set-same_page-to-false-in-__bio_try_merge_page.patch index dcb71431..99629121 100644 --- a/queue/block-Set-same_page-to-false-in-__bio_try_merge_page.patch +++ b/queue/block-Set-same_page-to-false-in-__bio_try_merge_page.patch @@ -1,4 +1,4 @@ -From 2cd896a5e86fc326bda8614b96c0401dcc145868 Mon Sep 17 00:00:00 2001 +From 42cbb41f8607f21114c134a7bbba1c4013519503 Mon Sep 17 00:00:00 2001 From: Ritesh Harjani <riteshh@linux.ibm.com> Date: Wed, 9 Sep 2020 08:44:25 +0530 Subject: [PATCH] block: Set same_page to false in __bio_try_merge_page if ret @@ -38,12 +38,13 @@ Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com> Reviewed-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/block/bio.c b/block/bio.c -index a9931f23d933..e865ea55b9f9 100644 +index 7eea97790851..22280cfba22f 100644 --- a/block/bio.c +++ b/block/bio.c -@@ -879,8 +879,10 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page, +@@ -835,8 +835,10 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page, struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1]; if (page_is_mergeable(bv, page, len, off, same_page)) { diff --git a/queue/btrfs-don-t-allocate-anonymous-block-device-for-user.patch b/queue/btrfs-don-t-allocate-anonymous-block-device-for-user.patch index 0ef78a3a..94c36585 100644 --- a/queue/btrfs-don-t-allocate-anonymous-block-device-for-user.patch +++ b/queue/btrfs-don-t-allocate-anonymous-block-device-for-user.patch @@ -1,4 +1,4 @@ -From 851fd730a743e072badaf67caf39883e32439431 Mon Sep 17 00:00:00 2001 +From b53cf7796169f16bc4770c597cd8d88a59a63a7e Mon Sep 17 00:00:00 2001 From: Qu Wenruo <wqu@suse.com> Date: Tue, 16 Jun 2020 10:17:34 +0800 Subject: [PATCH] btrfs: don't allocate anonymous block device for user @@ -59,12 +59,13 @@ Reviewed-by: Josef Bacik <josef@toxicpanda.com> Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c -index dbf90cd49513..c90edf04a9db 100644 +index 54d9af9ddb1a..fc5c9b797e31 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c -@@ -1424,9 +1424,16 @@ static int btrfs_init_fs_root(struct btrfs_root *root) +@@ -1511,9 +1511,16 @@ int btrfs_init_fs_root(struct btrfs_root *root) spin_lock_init(&root->ino_cache_lock); init_waitqueue_head(&root->ino_cache_wait); diff --git a/queue/btrfs-don-t-traverse-into-the-seed-devices-in-show_d.patch b/queue/btrfs-don-t-traverse-into-the-seed-devices-in-show_d.patch index 1d9e12bf..fc5f5578 100644 --- a/queue/btrfs-don-t-traverse-into-the-seed-devices-in-show_d.patch +++ b/queue/btrfs-don-t-traverse-into-the-seed-devices-in-show_d.patch @@ -1,4 +1,4 @@ -From 4faf55b03823e96c44dc4e364520000ed3b12fdb Mon Sep 17 00:00:00 2001 +From aacdeba343dd3a7c712878d259f6bfa37e3b1fe6 Mon Sep 17 00:00:00 2001 From: Anand Jain <anand.jain@oracle.com> Date: Fri, 10 Jul 2020 14:37:38 +0800 Subject: [PATCH] btrfs: don't traverse into the seed devices in show_devname @@ -75,12 +75,13 @@ Tested-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Anand Jain <anand.jain@oracle.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c -index 7c052a542412..58f890f73650 100644 +index 620a9b3962a8..c3aac0cec84f 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c -@@ -2351,9 +2351,7 @@ static int btrfs_unfreeze(struct super_block *sb) +@@ -2265,9 +2265,7 @@ static int btrfs_unfreeze(struct super_block *sb) static int btrfs_show_devname(struct seq_file *m, struct dentry *root) { struct btrfs_fs_info *fs_info = btrfs_sb(root->d_sb); @@ -90,7 +91,7 @@ index 7c052a542412..58f890f73650 100644 /* * Lightweight locking of the devices. We should not need -@@ -2363,18 +2361,13 @@ static int btrfs_show_devname(struct seq_file *m, struct dentry *root) +@@ -2277,18 +2275,13 @@ static int btrfs_show_devname(struct seq_file *m, struct dentry *root) * least until the rcu_read_unlock. */ rcu_read_lock(); diff --git a/queue/btrfs-fix-memory-leaks-after-failure-to-lookup-check.patch b/queue/btrfs-fix-memory-leaks-after-failure-to-lookup-check.patch index 820f1ec1..c0cd3258 100644 --- a/queue/btrfs-fix-memory-leaks-after-failure-to-lookup-check.patch +++ b/queue/btrfs-fix-memory-leaks-after-failure-to-lookup-check.patch @@ -1,4 +1,4 @@ -From 4f26433e9b3eb7a55ed70d8f882ae9cd48ba448b Mon Sep 17 00:00:00 2001 +From c5a7aacf7074f89e069f3d95988a92c1751f2955 Mon Sep 17 00:00:00 2001 From: Filipe Manana <fdmanana@suse.com> Date: Wed, 29 Jul 2020 10:17:50 +0100 Subject: [PATCH] btrfs: fix memory leaks after failure to lookup checksums @@ -21,12 +21,13 @@ Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Signed-off-by: Filipe Manana <fdmanana@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c -index ea8136dcf71f..696dd861cc3c 100644 +index 40683b2b9707..e2e361d09959 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c -@@ -4036,11 +4036,8 @@ static noinline int copy_items(struct btrfs_trans_handle *trans, +@@ -4049,11 +4049,8 @@ static noinline int copy_items(struct btrfs_trans_handle *trans, fs_info->csum_root, ds + cs, ds + cs + cl - 1, &ordered_sums, 0); @@ -40,7 +41,7 @@ index ea8136dcf71f..696dd861cc3c 100644 } } } -@@ -4053,7 +4050,6 @@ static noinline int copy_items(struct btrfs_trans_handle *trans, +@@ -4066,7 +4063,6 @@ static noinline int copy_items(struct btrfs_trans_handle *trans, * we have to do this after the loop above to avoid changing the * log tree while trying to change the log tree. */ diff --git a/queue/btrfs-fix-messages-after-changing-compression-level-.patch b/queue/btrfs-fix-messages-after-changing-compression-level-.patch index 93caf4ae..0a701748 100644 --- a/queue/btrfs-fix-messages-after-changing-compression-level-.patch +++ b/queue/btrfs-fix-messages-after-changing-compression-level-.patch @@ -1,4 +1,4 @@ -From 27942c9971cc405c60432eca9395e514a2ae9f5e Mon Sep 17 00:00:00 2001 +From 2657be917d75a68f5d9bde8209eb5729549c8638 Mon Sep 17 00:00:00 2001 From: David Sterba <dsterba@suse.com> Date: Thu, 23 Jul 2020 19:08:55 +0200 Subject: [PATCH] btrfs: fix messages after changing compression level by @@ -31,12 +31,13 @@ in that case too and use separate message for 'no' compression. CC: stable@vger.kernel.org # 4.19+ Signed-off-by: David Sterba <dsterba@suse.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c -index 5a9dc31d95c9..aa73422b0678 100644 +index c3aac0cec84f..0050eb146b96 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c -@@ -517,6 +517,7 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options, +@@ -432,6 +432,7 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options, char *compress_type; bool compress_force = false; enum btrfs_compression_type saved_compress_type; @@ -44,7 +45,7 @@ index 5a9dc31d95c9..aa73422b0678 100644 bool saved_compress_force; int no_compress = 0; -@@ -598,6 +599,7 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options, +@@ -514,6 +515,7 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options, info->compress_type : BTRFS_COMPRESS_NONE; saved_compress_force = btrfs_test_opt(info, FORCE_COMPRESS); @@ -52,7 +53,7 @@ index 5a9dc31d95c9..aa73422b0678 100644 if (token == Opt_compress || token == Opt_compress_force || strncmp(args[0].from, "zlib", 4) == 0) { -@@ -642,6 +644,8 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options, +@@ -558,6 +560,8 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options, no_compress = 0; } else if (strncmp(args[0].from, "no", 2) == 0) { compress_type = "no"; @@ -61,7 +62,7 @@ index 5a9dc31d95c9..aa73422b0678 100644 btrfs_clear_opt(info->mount_opt, COMPRESS); btrfs_clear_opt(info->mount_opt, FORCE_COMPRESS); compress_force = false; -@@ -662,11 +666,11 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options, +@@ -578,11 +582,11 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options, */ btrfs_clear_opt(info->mount_opt, FORCE_COMPRESS); } diff --git a/queue/btrfs-free-anon-block-device-right-after-subvolume-d.patch b/queue/btrfs-free-anon-block-device-right-after-subvolume-d.patch index 50d61dfe..e4ef99b0 100644 --- a/queue/btrfs-free-anon-block-device-right-after-subvolume-d.patch +++ b/queue/btrfs-free-anon-block-device-right-after-subvolume-d.patch @@ -1,4 +1,4 @@ -From 082b6c970f02fefd278c7833880cda29691a5f34 Mon Sep 17 00:00:00 2001 +From ceea4b1f2711f14c730f68423b4d974c8d48d39d Mon Sep 17 00:00:00 2001 From: Qu Wenruo <wqu@suse.com> Date: Tue, 16 Jun 2020 10:17:37 +0800 Subject: [PATCH] btrfs: free anon block device right after subvolume deletion @@ -47,12 +47,13 @@ Reviewed-by: Josef Bacik <josef@toxicpanda.com> Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c -index 5d2ce8092531..f066cad2d039 100644 +index 6a57bf38e761..fe10da44a4d2 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c -@@ -4026,6 +4026,8 @@ int btrfs_delete_subvolume(struct inode *dir, struct dentry *dentry) +@@ -4547,6 +4547,8 @@ int btrfs_delete_subvolume(struct inode *dir, struct dentry *dentry) } } diff --git a/queue/btrfs-move-the-chunk_mutex-in-btrfs_read_chunk_tree.patch b/queue/btrfs-move-the-chunk_mutex-in-btrfs_read_chunk_tree.patch index 6a3f8815..bfd3a23f 100644 --- a/queue/btrfs-move-the-chunk_mutex-in-btrfs_read_chunk_tree.patch +++ b/queue/btrfs-move-the-chunk_mutex-in-btrfs_read_chunk_tree.patch @@ -1,4 +1,4 @@ -From 01d01caf19ff7c537527d352d169c4368375c0a1 Mon Sep 17 00:00:00 2001 +From e0dc4a635f191fcfcffd2bcbdc330b38f56aa3ba Mon Sep 17 00:00:00 2001 From: Josef Bacik <josef@toxicpanda.com> Date: Fri, 17 Jul 2020 15:12:28 -0400 Subject: [PATCH] btrfs: move the chunk_mutex in btrfs_read_chunk_tree @@ -128,12 +128,13 @@ Reviewed-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: Josef Bacik <josef@toxicpanda.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c -index 084b8227ea2c..d7670e2a9f39 100644 +index cf2f2b6ab663..81edabb2524d 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c -@@ -7077,7 +7077,6 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info) +@@ -7245,7 +7245,6 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info) * otherwise we don't need it. */ mutex_lock(&uuid_mutex); @@ -141,7 +142,7 @@ index 084b8227ea2c..d7670e2a9f39 100644 /* * It is possible for mount and umount to race in such a way that -@@ -7135,7 +7134,9 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info) +@@ -7290,7 +7289,9 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info) } else if (found_key.type == BTRFS_CHUNK_ITEM_KEY) { struct btrfs_chunk *chunk; chunk = btrfs_item_ptr(leaf, slot, struct btrfs_chunk); @@ -151,7 +152,7 @@ index 084b8227ea2c..d7670e2a9f39 100644 if (ret) goto error; } -@@ -7165,7 +7166,6 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info) +@@ -7320,7 +7321,6 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info) } ret = 0; error: diff --git a/queue/btrfs-only-search-for-left_info-if-there-is-no-right.patch b/queue/btrfs-only-search-for-left_info-if-there-is-no-right.patch index 59563626..a2b8f924 100644 --- a/queue/btrfs-only-search-for-left_info-if-there-is-no-right.patch +++ b/queue/btrfs-only-search-for-left_info-if-there-is-no-right.patch @@ -1,4 +1,4 @@ -From 1d37ee6f9b40e63fbe59a858a11b26c9381c51d0 Mon Sep 17 00:00:00 2001 +From c1d956c0330dc6e6c4706027bf8c77e7fee97c00 Mon Sep 17 00:00:00 2001 From: Josef Bacik <josef@toxicpanda.com> Date: Mon, 27 Jul 2020 10:28:05 -0400 Subject: [PATCH] btrfs: only search for left_info if there is no right_info in @@ -35,6 +35,7 @@ Fixes: 963030817060 ("Btrfs: use hybrid extents+bitmap rb tree for free space") CC: stable@vger.kernel.org # 4.4+ Signed-off-by: Josef Bacik <josef@toxicpanda.com> Signed-off-by: David Sterba <dsterba@suse.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index 4efc36c35dd9..eaf1a31ceaf2 100644 diff --git a/queue/btrfs-open-device-without-device_list_mutex.patch b/queue/btrfs-open-device-without-device_list_mutex.patch index 76f41e4d..710d4099 100644 --- a/queue/btrfs-open-device-without-device_list_mutex.patch +++ b/queue/btrfs-open-device-without-device_list_mutex.patch @@ -1,4 +1,4 @@ -From 18c850fdc5a801bad4977b0f1723761d42267e45 Mon Sep 17 00:00:00 2001 +From 9017374aca712a4de6d98aebe12069eaa7710598 Mon Sep 17 00:00:00 2001 From: Josef Bacik <josef@toxicpanda.com> Date: Fri, 17 Jul 2020 15:12:27 -0400 Subject: [PATCH] btrfs: open device without device_list_mutex @@ -184,12 +184,13 @@ Signed-off-by: Josef Bacik <josef@toxicpanda.com> Reviewed-by: David Sterba <dsterba@suse.com> [ add some comments ] Signed-off-by: David Sterba <dsterba@suse.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c -index 537ccf66ee20..084b8227ea2c 100644 +index 0cfe95f5529f..cf2f2b6ab663 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c -@@ -245,7 +245,9 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, +@@ -216,7 +216,9 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, * * global::fs_devs - add, remove, updates to the global list * @@ -200,7 +201,7 @@ index 537ccf66ee20..084b8227ea2c 100644 * * btrfs_device::name - renames (write side), read is RCU * -@@ -258,6 +260,9 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, +@@ -229,6 +231,9 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, * may be used to exclude some operations from running concurrently without any * modifications to the list (see write_all_supers) * @@ -210,7 +211,7 @@ index 537ccf66ee20..084b8227ea2c 100644 * balance_mutex * ------------- * protects balance structures (status, state) and context accessed from -@@ -602,6 +607,11 @@ static int btrfs_free_stale_devices(const char *path, +@@ -786,6 +791,11 @@ static int btrfs_free_stale_devices(const char *path, return ret; } @@ -222,7 +223,7 @@ index 537ccf66ee20..084b8227ea2c 100644 static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, struct btrfs_device *device, fmode_t flags, void *holder) -@@ -1229,8 +1239,14 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices, +@@ -1422,8 +1432,14 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices, int ret; lockdep_assert_held(&uuid_mutex); @@ -238,7 +239,7 @@ index 537ccf66ee20..084b8227ea2c 100644 if (fs_devices->opened) { fs_devices->opened++; ret = 0; -@@ -1238,7 +1254,6 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices, +@@ -1431,7 +1447,6 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices, list_sort(NULL, &fs_devices->devices, devid_cmp); ret = open_fs_devices(fs_devices, flags, holder); } diff --git a/queue/btrfs-ref-verify-fix-memory-leak-in-add_block_entry.patch b/queue/btrfs-ref-verify-fix-memory-leak-in-add_block_entry.patch index 2107a31e..44bcf1fc 100644 --- a/queue/btrfs-ref-verify-fix-memory-leak-in-add_block_entry.patch +++ b/queue/btrfs-ref-verify-fix-memory-leak-in-add_block_entry.patch @@ -1,4 +1,4 @@ -From d60ba8de1164e1b42e296ff270c622a070ef8fe7 Mon Sep 17 00:00:00 2001 +From 70be0e60798844d35022d3a244ad10b8aaf810d8 Mon Sep 17 00:00:00 2001 From: Tom Rix <trix@redhat.com> Date: Tue, 7 Jul 2020 06:29:08 -0700 Subject: [PATCH] btrfs: ref-verify: fix memory leak in add_block_entry @@ -29,9 +29,10 @@ CC: stable@vger.kernel.org # 4.19+ Signed-off-by: Tom Rix <trix@redhat.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/btrfs/ref-verify.c b/fs/btrfs/ref-verify.c -index af92525dbb16..7f03dbe5b609 100644 +index 454a1015d026..9a2f15f4c80e 100644 --- a/fs/btrfs/ref-verify.c +++ b/fs/btrfs/ref-verify.c @@ -286,6 +286,8 @@ static struct block_entry *add_block_entry(struct btrfs_fs_info *fs_info, diff --git a/queue/cifs-Fix-leak-when-handling-lease-break-for-cached-r.patch b/queue/cifs-Fix-leak-when-handling-lease-break-for-cached-r.patch index 5065394b..4ffc15af 100644 --- a/queue/cifs-Fix-leak-when-handling-lease-break-for-cached-r.patch +++ b/queue/cifs-Fix-leak-when-handling-lease-break-for-cached-r.patch @@ -1,4 +1,4 @@ -From 3ad081ac9a2e11b981a7c575cb146e80df02cd75 Mon Sep 17 00:00:00 2001 +From b8688bc72a70d533920de61782987e03ebb63659 Mon Sep 17 00:00:00 2001 From: Paul Aurich <paul@darkrain42.org> Date: Thu, 9 Jul 2020 22:01:16 -0700 Subject: [PATCH] cifs: Fix leak when handling lease break for cached root fid @@ -26,6 +26,7 @@ Signed-off-by: Paul Aurich <paul@darkrain42.org> CC: Stable <stable@vger.kernel.org> # v4.18+ Reviewed-by: Aurelien Aptel <aaptel@suse.com> Signed-off-by: Steve French <stfrench@microsoft.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/cifs/smb2misc.c b/fs/cifs/smb2misc.c index 14265b4bbcc0..2fc96f7923ee 100644 diff --git a/queue/clk-actions-Fix-h_clk-for-Actions-S500-SoC.patch b/queue/clk-actions-Fix-h_clk-for-Actions-S500-SoC.patch index 6fbdfb30..547b30d4 100644 --- a/queue/clk-actions-Fix-h_clk-for-Actions-S500-SoC.patch +++ b/queue/clk-actions-Fix-h_clk-for-Actions-S500-SoC.patch @@ -1,4 +1,4 @@ -From f47ee279d25fb0e010cae5d6e758e39b40eb6378 Mon Sep 17 00:00:00 2001 +From d33ee00a1251e0d6ebb1c2784842565ecbf32da0 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea <cristian.ciocaltea@gmail.com> Date: Fri, 3 Jul 2020 20:05:07 +0300 Subject: [PATCH] clk: actions: Fix h_clk for Actions S500 SoC @@ -13,6 +13,7 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@gmail.com> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Link: https://lore.kernel.org/r/c57e7ebabfa970014f073b92fe95b47d3e5a70b1.1593788312.git.cristian.ciocaltea@gmail.com Signed-off-by: Stephen Boyd <sboyd@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/clk/actions/owl-s500.c b/drivers/clk/actions/owl-s500.c index e2007ac4d235..0eb83a0b70bc 100644 diff --git a/queue/clk-clk-atlas6-fix-return-value-check-in-atlas6_clk_.patch b/queue/clk-clk-atlas6-fix-return-value-check-in-atlas6_clk_.patch index 2856d040..51911fba 100644 --- a/queue/clk-clk-atlas6-fix-return-value-check-in-atlas6_clk_.patch +++ b/queue/clk-clk-atlas6-fix-return-value-check-in-atlas6_clk_.patch @@ -1,4 +1,4 @@ -From 12b90b40854a8461a02ef19f6f4474cc88d64b66 Mon Sep 17 00:00:00 2001 +From bdd848539e5529e4d0790c0ad0a7cf3d73065891 Mon Sep 17 00:00:00 2001 From: Xu Wang <vulab@iscas.ac.cn> Date: Mon, 13 Jul 2020 03:21:43 +0000 Subject: [PATCH] clk: clk-atlas6: fix return value check in atlas6_clk_init() @@ -14,6 +14,7 @@ Link: https://lore.kernel.org/r/20200713032143.21362-1-vulab@iscas.ac.cn Acked-by: Barry Song <baohua@kernel.org> Fixes: 7bf21bc81f28 ("clk: sirf: re-arch to make the codes support both prima2 and atlas6") Signed-off-by: Stephen Boyd <sboyd@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/clk/sirf/clk-atlas6.c b/drivers/clk/sirf/clk-atlas6.c index c84d5bab7ac2..b95483bb6a5e 100644 diff --git a/queue/clk-qcom-gcc-sdm660-Fix-up-gcc_mss_mnoc_bimc_axi_clk.patch b/queue/clk-qcom-gcc-sdm660-Fix-up-gcc_mss_mnoc_bimc_axi_clk.patch index be4a9d2b..dc2108bb 100644 --- a/queue/clk-qcom-gcc-sdm660-Fix-up-gcc_mss_mnoc_bimc_axi_clk.patch +++ b/queue/clk-qcom-gcc-sdm660-Fix-up-gcc_mss_mnoc_bimc_axi_clk.patch @@ -1,4 +1,4 @@ -From 3386af51d3bcebcba3f7becdb1ef2e384abe90cf Mon Sep 17 00:00:00 2001 +From 46fe46629ad9d9ef4047bbc68d0ba2e7e4f5364d Mon Sep 17 00:00:00 2001 From: Konrad Dybcio <konradybcio@gmail.com> Date: Sun, 26 Jul 2020 13:12:05 +0200 Subject: [PATCH] clk: qcom: gcc-sdm660: Fix up gcc_mss_mnoc_bimc_axi_clk @@ -12,9 +12,10 @@ Signed-off-by: Konrad Dybcio <konradybcio@gmail.com> Link: https://lore.kernel.org/r/20200726111215.22361-9-konradybcio@gmail.com Fixes: f2a76a2955c0 ("clk: qcom: Add Global Clock controller (GCC) driver for SDM660") Signed-off-by: Stephen Boyd <sboyd@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/clk/qcom/gcc-sdm660.c b/drivers/clk/qcom/gcc-sdm660.c -index a85283786278..f0b47b7d50ca 100644 +index 8827db23066f..e111bfcd3230 100644 --- a/drivers/clk/qcom/gcc-sdm660.c +++ b/drivers/clk/qcom/gcc-sdm660.c @@ -1715,6 +1715,9 @@ static struct clk_branch gcc_mss_cfg_ahb_clk = { diff --git a/queue/crypto-af_alg-Fix-regression-on-empty-requests.patch b/queue/crypto-af_alg-Fix-regression-on-empty-requests.patch index 4542ff8b..be2ea563 100644 --- a/queue/crypto-af_alg-Fix-regression-on-empty-requests.patch +++ b/queue/crypto-af_alg-Fix-regression-on-empty-requests.patch @@ -1,4 +1,4 @@ -From 662bb52f50bca16a74fe92b487a14d7dccb85e1a Mon Sep 17 00:00:00 2001 +From bcfd3852ae84d5c144f957b1cf489ba64d23a521 Mon Sep 17 00:00:00 2001 From: Herbert Xu <herbert@gondor.apana.org.au> Date: Thu, 2 Jul 2020 13:32:21 +1000 Subject: [PATCH] crypto: af_alg - Fix regression on empty requests @@ -16,9 +16,10 @@ Reported-by: Sachin Sant <sachinp@linux.vnet.ibm.com> Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org> Fixes: f3c802a1f300 ("crypto: algif_aead - Only wake up when...") Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/crypto/af_alg.c b/crypto/af_alg.c -index 9fcb91ea10c4..5882ed46f1ad 100644 +index ed8ace8675b7..35e026ba2c7e 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -851,6 +851,7 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size, diff --git a/queue/crypto-af_alg-Work-around-empty-control-messages-wit.patch b/queue/crypto-af_alg-Work-around-empty-control-messages-wit.patch index 5eb48bf0..e93bdb38 100644 --- a/queue/crypto-af_alg-Work-around-empty-control-messages-wit.patch +++ b/queue/crypto-af_alg-Work-around-empty-control-messages-wit.patch @@ -1,4 +1,4 @@ -From c195d66a8a75c60515819b101975f38b7ec6577f Mon Sep 17 00:00:00 2001 +From 70d64c4abbc6a2a93fb6c0392fb07f90971a5c24 Mon Sep 17 00:00:00 2001 From: Herbert Xu <herbert@gondor.apana.org.au> Date: Thu, 27 Aug 2020 17:14:36 +1000 Subject: [PATCH] crypto: af_alg - Work around empty control messages without @@ -26,9 +26,10 @@ Reported-by: Caleb Jorden <caljorden@hotmail.com> Fixes: f3c802a1f300 ("crypto: algif_aead - Only wake up when...") Cc: <stable@vger.kernel.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/crypto/af_alg.c b/crypto/af_alg.c -index a6f581ab200c..8be8bec07cdd 100644 +index 35e026ba2c7e..1d4b0157ee5d 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -16,6 +16,7 @@ @@ -39,7 +40,7 @@ index a6f581ab200c..8be8bec07cdd 100644 #include <linux/sched/signal.h> #include <linux/security.h> -@@ -845,9 +846,15 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size, +@@ -847,9 +848,15 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size, } lock_sock(sk); diff --git a/queue/crypto-algif_aead-Only-wake-up-when-ctx-more-is-zero.patch b/queue/crypto-algif_aead-Only-wake-up-when-ctx-more-is-zero.patch index 36b80902..e24e6612 100644 --- a/queue/crypto-algif_aead-Only-wake-up-when-ctx-more-is-zero.patch +++ b/queue/crypto-algif_aead-Only-wake-up-when-ctx-more-is-zero.patch @@ -1,4 +1,4 @@ -From f3c802a1f30013f8f723b62d7fa49eb9e991da23 Mon Sep 17 00:00:00 2001 +From ec07479e654b513876b885cb332f8ae9b1751e55 Mon Sep 17 00:00:00 2001 From: Herbert Xu <herbert@gondor.apana.org.au> Date: Sat, 30 May 2020 00:23:49 +1000 Subject: [PATCH] crypto: algif_aead - Only wake up when ctx->more is zero @@ -15,9 +15,10 @@ of data is available if there is more data to come. Fixes: 2d97591ef43d ("crypto: af_alg - consolidation of...") Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/crypto/af_alg.c b/crypto/af_alg.c -index 28fc323e3fe3..9fcb91ea10c4 100644 +index a3b9df99af6d..ed8ace8675b7 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -635,6 +635,7 @@ void af_alg_pull_tsgl(struct sock *sk, size_t used, struct scatterlist *dst, @@ -99,7 +100,7 @@ index ec5567c87a6d..a51ba22fef58 100644 return err; } diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h -index 088c1ded2714..ee6412314f8f 100644 +index 864849e942c4..c1a8d4a41bb1 100644 --- a/include/crypto/if_alg.h +++ b/include/crypto/if_alg.h @@ -135,6 +135,7 @@ struct af_alg_async_req { diff --git a/queue/crypto-algif_aead-fix-uninitialized-ctx-init.patch b/queue/crypto-algif_aead-fix-uninitialized-ctx-init.patch index 0e39786c..aa6ee1da 100644 --- a/queue/crypto-algif_aead-fix-uninitialized-ctx-init.patch +++ b/queue/crypto-algif_aead-fix-uninitialized-ctx-init.patch @@ -1,4 +1,4 @@ -From 21dfbcd1f5cbff9cf2f9e7e43475aed8d072b0dd Mon Sep 17 00:00:00 2001 +From d54668f5c1bc2432937edf5391d132c0193bebb0 Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek <omosnace@redhat.com> Date: Wed, 12 Aug 2020 14:58:25 +0200 Subject: [PATCH] crypto: algif_aead - fix uninitialized ctx->init @@ -21,6 +21,7 @@ Fixes: f3c802a1f300 ("crypto: algif_aead - Only wake up when ctx->more is zero") Suggested-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c index d48d2156e621..43c6aa784858 100644 diff --git a/queue/debugfs-Fix-module-state-check-condition.patch b/queue/debugfs-Fix-module-state-check-condition.patch index 30bed333..9cf95f82 100644 --- a/queue/debugfs-Fix-module-state-check-condition.patch +++ b/queue/debugfs-Fix-module-state-check-condition.patch @@ -1,4 +1,4 @@ -From efada04c8a646ca83cbb23c41bf6c2def3b9e005 Mon Sep 17 00:00:00 2001 +From edae5ae37d8599ad12d8e53f175f2808f2651ca3 Mon Sep 17 00:00:00 2001 From: Vladis Dronov <vdronov@redhat.com> Date: Tue, 11 Aug 2020 17:01:29 +0200 Subject: [PATCH] debugfs: Fix module state check condition @@ -14,6 +14,7 @@ Signed-off-by: Vladis Dronov <vdronov@redhat.com> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200811150129.53343-1-vdronov@redhat.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c index d7cfc8fb4632..6cfe9c175977 100644 diff --git a/queue/devres-keep-both-device-name-and-resource-name-in-pr.patch b/queue/devres-keep-both-device-name-and-resource-name-in-pr.patch index 98b65bbb..c0f4b050 100644 --- a/queue/devres-keep-both-device-name-and-resource-name-in-pr.patch +++ b/queue/devres-keep-both-device-name-and-resource-name-in-pr.patch @@ -1,4 +1,4 @@ -From 35bd8c07db2ce8fd2834ef866240613a4ef982e7 Mon Sep 17 00:00:00 2001 +From 157f4cd073844d8d8e0de00573b64ae5e42ec8b5 Mon Sep 17 00:00:00 2001 From: Vladimir Oltean <vladimir.oltean@nxp.com> Date: Mon, 1 Jun 2020 12:58:26 +0300 Subject: [PATCH] devres: keep both device name and resource name in pretty @@ -74,12 +74,13 @@ Fixes: 8d84b18f5678 ("devres: always use dev_name() in devm_ioremap_resource()") Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Link: https://lore.kernel.org/r/20200601095826.1757621-1-olteanv@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/lib/devres.c b/lib/devres.c -index 6ef51f159c54..ca0d28727cce 100644 +index 17624d35e82d..77c80ca9e485 100644 --- a/lib/devres.c +++ b/lib/devres.c -@@ -119,6 +119,7 @@ __devm_ioremap_resource(struct device *dev, const struct resource *res, +@@ -155,6 +155,7 @@ void __iomem *devm_ioremap_resource(struct device *dev, { resource_size_t size; void __iomem *dest_ptr; @@ -87,7 +88,7 @@ index 6ef51f159c54..ca0d28727cce 100644 BUG_ON(!dev); -@@ -129,7 +130,15 @@ __devm_ioremap_resource(struct device *dev, const struct resource *res, +@@ -165,7 +166,15 @@ void __iomem *devm_ioremap_resource(struct device *dev, size = resource_size(res); diff --git a/queue/dm-rq-don-t-call-blk_mq_queue_stopped-in-dm_stop_que.patch b/queue/dm-rq-don-t-call-blk_mq_queue_stopped-in-dm_stop_que.patch index aabd88d1..f55575f1 100644 --- a/queue/dm-rq-don-t-call-blk_mq_queue_stopped-in-dm_stop_que.patch +++ b/queue/dm-rq-don-t-call-blk_mq_queue_stopped-in-dm_stop_que.patch @@ -1,4 +1,4 @@ -From e766668c6cd49d741cfb49eaeb38998ba34d27bc Mon Sep 17 00:00:00 2001 +From 650badd18a5816546745986e2f2c439bf76a04eb Mon Sep 17 00:00:00 2001 From: Ming Lei <ming.lei@redhat.com> Date: Fri, 19 Jun 2020 16:42:14 +0800 Subject: [PATCH] dm rq: don't call blk_mq_queue_stopped() in dm_stop_queue() @@ -19,9 +19,10 @@ blk_mq_quiesce_queue() is in-progress. Fixes: 7b17c2f7292ba ("dm: Fix a race condition related to stopping and starting queues") Signed-off-by: Ming Lei <ming.lei@redhat.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c -index 85e0daabad49..20745e2e34b9 100644 +index b41ecb451c78..99784f16cb56 100644 --- a/drivers/md/dm-rq.c +++ b/drivers/md/dm-rq.c @@ -70,9 +70,6 @@ void dm_start_queue(struct request_queue *q) diff --git a/queue/driver-core-Avoid-binding-drivers-to-dead-devices.patch b/queue/driver-core-Avoid-binding-drivers-to-dead-devices.patch index 0fa5a1c7..d8a6a617 100644 --- a/queue/driver-core-Avoid-binding-drivers-to-dead-devices.patch +++ b/queue/driver-core-Avoid-binding-drivers-to-dead-devices.patch @@ -1,4 +1,4 @@ -From 654888327e9f655a9d55ad477a9583e90e8c9b5c Mon Sep 17 00:00:00 2001 +From 284846ea774c7559a8e79918d406ba8a244a20af Mon Sep 17 00:00:00 2001 From: Lukas Wunner <lukas@wunner.de> Date: Wed, 8 Jul 2020 15:27:01 +0200 Subject: [PATCH] driver core: Avoid binding drivers to dead devices @@ -35,12 +35,13 @@ Cc: stable@vger.kernel.org # v5.1+ Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com> Link: https://lore.kernel.org/r/de88a23a6fe0ef70f7cfd13c8aea9ab51b4edab6.1594214103.git.lukas@wunner.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/base/dd.c b/drivers/base/dd.c -index fce8e35b6367..b29faa24eef8 100644 +index 98c1d471a8eb..432a6f52cadb 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c -@@ -864,7 +864,9 @@ static int __device_attach(struct device *dev, bool allow_async) +@@ -819,7 +819,9 @@ static int __device_attach(struct device *dev, bool allow_async) int ret = 0; device_lock(dev); diff --git a/queue/drm-Added-orientation-quirk-for-ASUS-tablet-model-T1.patch b/queue/drm-Added-orientation-quirk-for-ASUS-tablet-model-T1.patch index 283f0dd3..d4dfc12c 100644 --- a/queue/drm-Added-orientation-quirk-for-ASUS-tablet-model-T1.patch +++ b/queue/drm-Added-orientation-quirk-for-ASUS-tablet-model-T1.patch @@ -1,4 +1,4 @@ -From b5ac98cbb8e5e30c34ebc837d1e5a3982d2b5f5c Mon Sep 17 00:00:00 2001 +From a157cefac2b40fb4ab322c42d117a31bc651c9dc Mon Sep 17 00:00:00 2001 From: Marius Iacob <themariusus@gmail.com> Date: Sat, 1 Aug 2020 15:34:46 +0300 Subject: [PATCH] drm: Added orientation quirk for ASUS tablet model T103HAF @@ -9,6 +9,7 @@ Signed-off-by: Marius Iacob <themariusus@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20200801123445.1514567-1-themariusus@gmail.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/drm_panel_orientation_quirks.c b/drivers/gpu/drm/drm_panel_orientation_quirks.c index d00ea384dcbf..58f5dc2f6dd5 100644 diff --git a/queue/drm-amdgpu-Fix-bug-where-DPM-is-not-enabled-after-hi.patch b/queue/drm-amdgpu-Fix-bug-where-DPM-is-not-enabled-after-hi.patch index e78adf63..88bae524 100644 --- a/queue/drm-amdgpu-Fix-bug-where-DPM-is-not-enabled-after-hi.patch +++ b/queue/drm-amdgpu-Fix-bug-where-DPM-is-not-enabled-after-hi.patch @@ -1,4 +1,4 @@ -From f87812284172a9809820d10143b573d833cd3f75 Mon Sep 17 00:00:00 2001 +From 0e28804507dcc46d0a1df142d40260ccaa5ef664 Mon Sep 17 00:00:00 2001 From: Sandeep Raghuraman <sandy.8925@gmail.com> Date: Thu, 6 Aug 2020 22:52:20 +0530 Subject: [PATCH] drm/amdgpu: Fix bug where DPM is not enabled after hibernate @@ -37,12 +37,13 @@ Bug: https://bugzilla.kernel.org/show_bug.cgi?id=208839 Signed-off-by: Sandeep Raghuraman <sandy.8925@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c -index 02159ca29fa2..c18169aa59ce 100644 +index 7627792cda93..4de562758436 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c -@@ -2725,7 +2725,10 @@ static int ci_initialize_mc_reg_table(struct pp_hwmgr *hwmgr) +@@ -2724,7 +2724,10 @@ static int ci_initialize_mc_reg_table(struct pp_hwmgr *hwmgr) static bool ci_is_dpm_running(struct pp_hwmgr *hwmgr) { diff --git a/queue/drm-fix-drm_dp_mst_port-refcount-leaks-in-drm_dp_mst.patch b/queue/drm-fix-drm_dp_mst_port-refcount-leaks-in-drm_dp_mst.patch index 848d22c0..8c6390d3 100644 --- a/queue/drm-fix-drm_dp_mst_port-refcount-leaks-in-drm_dp_mst.patch +++ b/queue/drm-fix-drm_dp_mst_port-refcount-leaks-in-drm_dp_mst.patch @@ -1,4 +1,4 @@ -From a34a0a632dd991a371fec56431d73279f9c54029 Mon Sep 17 00:00:00 2001 +From 3e246244864c81b2b485628c1f889ba921f2cea3 Mon Sep 17 00:00:00 2001 From: Xin Xiong <xiongx18@fudan.edu.cn> Date: Sun, 19 Jul 2020 23:45:45 +0800 Subject: [PATCH] drm: fix drm_dp_mst_port refcount leaks in @@ -31,12 +31,13 @@ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn> Reviewed-by: Lyude Paul <lyude@redhat.com> Signed-off-by: Lyude Paul <lyude@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200719154545.GA41231@xin-virtual-machine +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c -index 09b32289497e..b23cb2fec3f3 100644 +index d4cc602a9bd5..aa6e6d88f30b 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c -@@ -4308,11 +4308,11 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, +@@ -3241,11 +3241,11 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, { int ret; @@ -51,7 +52,7 @@ index 09b32289497e..b23cb2fec3f3 100644 return false; if (port->vcpi.vcpi > 0) { -@@ -4328,6 +4328,7 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, +@@ -3261,6 +3261,7 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, if (ret) { DRM_DEBUG_KMS("failed to init vcpi slots=%d max=63 ret=%d\n", DIV_ROUND_UP(pbn, mgr->pbn_div), ret); diff --git a/queue/drm-imx-imx-ldb-Disable-both-channels-for-split-mode.patch b/queue/drm-imx-imx-ldb-Disable-both-channels-for-split-mode.patch index 949f123e..b5234afa 100644 --- a/queue/drm-imx-imx-ldb-Disable-both-channels-for-split-mode.patch +++ b/queue/drm-imx-imx-ldb-Disable-both-channels-for-split-mode.patch @@ -1,4 +1,4 @@ -From 3b2a999582c467d1883716b37ffcc00178a13713 Mon Sep 17 00:00:00 2001 +From 6eff69dea01e0ff664ed4e0af1d5b7e5a8879f2e Mon Sep 17 00:00:00 2001 From: Liu Ying <victor.liu@nxp.com> Date: Thu, 9 Jul 2020 10:28:52 +0800 Subject: [PATCH] drm/imx: imx-ldb: Disable both channels for split mode in @@ -18,12 +18,13 @@ Cc: NXP Linux Team <linux-imx@nxp.com> Cc: <stable@vger.kernel.org> Signed-off-by: Liu Ying <victor.liu@nxp.com> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c -index 909682a74474..8791d60be92e 100644 +index 720f2cc84433..c92a5149ae4e 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c -@@ -296,18 +296,19 @@ static void imx_ldb_encoder_disable(struct drm_encoder *encoder) +@@ -303,18 +303,19 @@ static void imx_ldb_encoder_disable(struct drm_encoder *encoder) { struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder); struct imx_ldb *ldb = imx_ldb_ch->ldb; diff --git a/queue/drm-vmwgfx-Fix-two-list_for_each-loop-exit-tests.patch b/queue/drm-vmwgfx-Fix-two-list_for_each-loop-exit-tests.patch index 8d42cbe0..e1f18d72 100644 --- a/queue/drm-vmwgfx-Fix-two-list_for_each-loop-exit-tests.patch +++ b/queue/drm-vmwgfx-Fix-two-list_for_each-loop-exit-tests.patch @@ -1,4 +1,4 @@ -From 4437c1152ce0e57ab8f401aa696ea6291cc07ab1 Mon Sep 17 00:00:00 2001 +From f423a40fc1bf5b012e10b113c6ae1fc56b8e12c5 Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter@oracle.com> Date: Fri, 26 Jun 2020 13:39:59 +0300 Subject: [PATCH] drm/vmwgfx: Fix two list_for_each loop exit tests @@ -20,12 +20,13 @@ Fixes: a278724aa23c ("drm/vmwgfx: Implement fbdev on kms v2") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Roland Scheidegger <sroland@vmware.com> Signed-off-by: Roland Scheidegger <sroland@vmware.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c -index bbce45d142aa..6e9a6135533a 100644 +index b97bc8e5944b..e9f7c67a5499 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c -@@ -2575,7 +2575,7 @@ int vmw_kms_fbdev_init_data(struct vmw_private *dev_priv, +@@ -2657,7 +2657,7 @@ int vmw_kms_fbdev_init_data(struct vmw_private *dev_priv, ++i; } @@ -34,7 +35,7 @@ index bbce45d142aa..6e9a6135533a 100644 DRM_ERROR("Could not find initial display unit.\n"); ret = -EINVAL; goto out_unlock; -@@ -2599,13 +2599,13 @@ int vmw_kms_fbdev_init_data(struct vmw_private *dev_priv, +@@ -2681,13 +2681,13 @@ int vmw_kms_fbdev_init_data(struct vmw_private *dev_priv, break; } diff --git a/queue/drm-vmwgfx-Use-correct-vmw_legacy_display_unit-point.patch b/queue/drm-vmwgfx-Use-correct-vmw_legacy_display_unit-point.patch index 00056ba4..1be06c3a 100644 --- a/queue/drm-vmwgfx-Use-correct-vmw_legacy_display_unit-point.patch +++ b/queue/drm-vmwgfx-Use-correct-vmw_legacy_display_unit-point.patch @@ -1,4 +1,4 @@ -From 1d2c0c565bc0da25f5e899a862fb58e612b222df Mon Sep 17 00:00:00 2001 +From 67341672bca392d0c8d5a641f60ac61364bd9c17 Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter@oracle.com> Date: Fri, 26 Jun 2020 13:34:37 +0300 Subject: [PATCH] drm/vmwgfx: Use correct vmw_legacy_display_unit pointer @@ -15,12 +15,13 @@ Fixes: d7e1958dbe4a ("drm/vmwgfx: Support older hardware.") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Roland Scheidegger <sroland@vmware.com> Signed-off-by: Roland Scheidegger <sroland@vmware.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c -index 16dafff5cab1..009f1742bed5 100644 +index 25e6343bcf21..9fa16361ee2a 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c -@@ -81,7 +81,7 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv) +@@ -79,7 +79,7 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv) struct vmw_legacy_display_unit *entry; struct drm_framebuffer *fb = NULL; struct drm_crtc *crtc = NULL; @@ -29,7 +30,7 @@ index 16dafff5cab1..009f1742bed5 100644 /* If there is no display topology the host just assumes * that the guest will set the same layout as the host. -@@ -92,12 +92,11 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv) +@@ -90,12 +90,11 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv) crtc = &entry->base.crtc; w = max(w, crtc->x + crtc->mode.hdisplay); h = max(h, crtc->y + crtc->mode.vdisplay); diff --git a/queue/dt-bindings-iio-io-channel-mux-Fix-compatible-string.patch b/queue/dt-bindings-iio-io-channel-mux-Fix-compatible-string.patch index cd88bfe2..a124c025 100644 --- a/queue/dt-bindings-iio-io-channel-mux-Fix-compatible-string.patch +++ b/queue/dt-bindings-iio-io-channel-mux-Fix-compatible-string.patch @@ -1,4 +1,4 @@ -From add48ba425192c6e04ce70549129cacd01e2a09e Mon Sep 17 00:00:00 2001 +From 2287506a34edd9f22fd08c23469c6c79f282da22 Mon Sep 17 00:00:00 2001 From: Christian Eggers <ceggers@arri.de> Date: Mon, 27 Jul 2020 12:16:05 +0200 Subject: [PATCH] dt-bindings: iio: io-channel-mux: Fix compatible string in @@ -14,6 +14,7 @@ Reviewed-by: Peter Rosin <peda@axentia.se> Signed-off-by: Christian Eggers <ceggers@arri.de> Link: https://lore.kernel.org/r/20200727101605.24384-1-ceggers@arri.de Signed-off-by: Rob Herring <robh@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt b/Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt index c82794002595..89647d714387 100644 diff --git a/queue/ext2-fix-missing-percpu_counter_inc.patch b/queue/ext2-fix-missing-percpu_counter_inc.patch index ae122143..084bba0b 100644 --- a/queue/ext2-fix-missing-percpu_counter_inc.patch +++ b/queue/ext2-fix-missing-percpu_counter_inc.patch @@ -1,4 +1,4 @@ -From bc2fbaa4d3808aef82dd1064a8e61c16549fe956 Mon Sep 17 00:00:00 2001 +From eb6331f935b2051ce9dda25ccdab446e47636a35 Mon Sep 17 00:00:00 2001 From: Mikulas Patocka <mpatocka@redhat.com> Date: Mon, 20 Apr 2020 16:02:21 -0400 Subject: [PATCH] ext2: fix missing percpu_counter_inc @@ -18,9 +18,10 @@ Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Cc: stable@vger.kernel.org Signed-off-by: Jan Kara <jack@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c -index fda7d3f5b4be..432c3febea6d 100644 +index a0c5ea91fcd4..8c29d4d6bfd5 100644 --- a/fs/ext2/ialloc.c +++ b/fs/ext2/ialloc.c @@ -80,6 +80,7 @@ static void ext2_release_inode(struct super_block *sb, int group, int dir) @@ -31,7 +32,7 @@ index fda7d3f5b4be..432c3febea6d 100644 if (dir) percpu_counter_dec(&EXT2_SB(sb)->s_dirs_counter); mark_buffer_dirty(bh); -@@ -528,7 +529,7 @@ got: +@@ -529,7 +530,7 @@ struct inode *ext2_new_inode(struct inode *dir, umode_t mode, goto fail; } diff --git a/queue/fs-minix-fix-block-limit-check-for-V1-filesystems.patch b/queue/fs-minix-fix-block-limit-check-for-V1-filesystems.patch index d3730cd4..0625a062 100644 --- a/queue/fs-minix-fix-block-limit-check-for-V1-filesystems.patch +++ b/queue/fs-minix-fix-block-limit-check-for-V1-filesystems.patch @@ -1,4 +1,4 @@ -From 0a12c4a8069607247cb8edc3b035a664e636fd9a Mon Sep 17 00:00:00 2001 +From 353b9d7a68291251e3ba0c6b58325b795b45cea6 Mon Sep 17 00:00:00 2001 From: Eric Biggers <ebiggers@google.com> Date: Tue, 11 Aug 2020 18:35:36 -0700 Subject: [PATCH] fs/minix: fix block limit check for V1 filesystems @@ -18,6 +18,7 @@ Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Qiujun Huang <anenbupt@gmail.com> Link: http://lkml.kernel.org/r/20200628060846.682158-6-ebiggers@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/minix/itree_v1.c b/fs/minix/itree_v1.c index c0d418209ead..405573a79aab 100644 diff --git a/queue/fs-minix-remove-expected-error-message-in-block_to_p.patch b/queue/fs-minix-remove-expected-error-message-in-block_to_p.patch index 30c78060..92a50751 100644 --- a/queue/fs-minix-remove-expected-error-message-in-block_to_p.patch +++ b/queue/fs-minix-remove-expected-error-message-in-block_to_p.patch @@ -1,4 +1,4 @@ -From f666f9fb9a36f1c833b9d18923572f0e4d304754 Mon Sep 17 00:00:00 2001 +From 6f2c84721f447d4829cf5c7d3032a840dac7d2fe Mon Sep 17 00:00:00 2001 From: Eric Biggers <ebiggers@google.com> Date: Tue, 11 Aug 2020 18:35:39 -0700 Subject: [PATCH] fs/minix: remove expected error message in block_to_path() @@ -19,6 +19,7 @@ Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Qiujun Huang <anenbupt@gmail.com> Link: http://lkml.kernel.org/r/20200628060846.682158-7-ebiggers@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/minix/itree_v1.c b/fs/minix/itree_v1.c index 405573a79aab..1fed906042aa 100644 diff --git a/queue/fs-minix-set-s_maxbytes-correctly.patch b/queue/fs-minix-set-s_maxbytes-correctly.patch index 2a77540f..1cb437fa 100644 --- a/queue/fs-minix-set-s_maxbytes-correctly.patch +++ b/queue/fs-minix-set-s_maxbytes-correctly.patch @@ -1,4 +1,4 @@ -From 32ac86efff91a3e4ef8c3d1cadd4559e23c8e73a Mon Sep 17 00:00:00 2001 +From 15a227220913c06e2849c312670fe1c1c17cecc9 Mon Sep 17 00:00:00 2001 From: Eric Biggers <ebiggers@google.com> Date: Tue, 11 Aug 2020 18:35:33 -0700 Subject: [PATCH] fs/minix: set s_maxbytes correctly @@ -19,9 +19,10 @@ Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Qiujun Huang <anenbupt@gmail.com> Link: http://lkml.kernel.org/r/20200628060846.682158-5-ebiggers@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/minix/inode.c b/fs/minix/inode.c -index 0dd929346f3f..7b09a9158e40 100644 +index 6aa51afe2f1a..53337020d9d0 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c @@ -150,8 +150,10 @@ static int minix_remount (struct super_block * sb, int * flags, char * data) diff --git a/queue/fs-ufs-avoid-potential-u32-multiplication-overflow.patch b/queue/fs-ufs-avoid-potential-u32-multiplication-overflow.patch index 39d63142..1583759c 100644 --- a/queue/fs-ufs-avoid-potential-u32-multiplication-overflow.patch +++ b/queue/fs-ufs-avoid-potential-u32-multiplication-overflow.patch @@ -1,4 +1,4 @@ -From 88b2e9b06381551b707d980627ad0591191f7a2d Mon Sep 17 00:00:00 2001 +From a3467fbb66e7833f6b772044a7579ef9bdf2dc14 Mon Sep 17 00:00:00 2001 From: Colin Ian King <colin.king@canonical.com> Date: Tue, 11 Aug 2020 18:35:53 -0700 Subject: [PATCH] fs/ufs: avoid potential u32 multiplication overflow @@ -19,9 +19,10 @@ Cc: Alexey Dobriyan <adobriyan@gmail.com> Link: http://lkml.kernel.org/r/20200715170355.1081713-1-colin.king@canonical.com Addresses-Coverity: ("Unintentional integer overflow") Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/ufs/super.c b/fs/ufs/super.c -index 1da0be667409..e3b69fb280e8 100644 +index 3d247c0d92aa..15677eebef4c 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c @@ -101,7 +101,7 @@ static struct inode *ufs_nfs_get_inode(struct super_block *sb, u64 ino, u32 gene diff --git a/queue/ftrace-Setup-correct-FTRACE_FL_REGS-flags-for-module.patch b/queue/ftrace-Setup-correct-FTRACE_FL_REGS-flags-for-module.patch index 684ad416..a59b8d5e 100644 --- a/queue/ftrace-Setup-correct-FTRACE_FL_REGS-flags-for-module.patch +++ b/queue/ftrace-Setup-correct-FTRACE_FL_REGS-flags-for-module.patch @@ -1,4 +1,4 @@ -From 8a224ffb3f52b0027f6b7279854c71a31c48fc97 Mon Sep 17 00:00:00 2001 +From 7f6c391e31b01082256ae697a3552110e1010882 Mon Sep 17 00:00:00 2001 From: Chengming Zhou <zhouchengming@bytedance.com> Date: Wed, 29 Jul 2020 02:05:53 +0800 Subject: [PATCH] ftrace: Setup correct FTRACE_FL_REGS flags for module @@ -21,12 +21,13 @@ Fixes: 8c4f3c3fa9681 ("ftrace: Check module functions being traced on reload") Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com> Signed-off-by: Muchun Song <songmuchun@bytedance.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c -index c141d347f71a..d052f856f1cf 100644 +index ed0db562b267..9a2c0ce707f6 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c -@@ -6198,8 +6198,11 @@ static int referenced_filters(struct dyn_ftrace *rec) +@@ -5678,8 +5678,11 @@ static int referenced_filters(struct dyn_ftrace *rec) int cnt = 0; for (ops = ftrace_ops_list; ops != &ftrace_list_end; ops = ops->next) { @@ -40,7 +41,7 @@ index c141d347f71a..d052f856f1cf 100644 } return cnt; -@@ -6378,8 +6381,8 @@ void ftrace_module_enable(struct module *mod) +@@ -5856,8 +5859,8 @@ void ftrace_module_enable(struct module *mod) if (ftrace_start_up) cnt += referenced_filters(rec); diff --git a/queue/gpu-ipu-v3-image-convert-Combine-rotate-no-rotate-ir.patch b/queue/gpu-ipu-v3-image-convert-Combine-rotate-no-rotate-ir.patch index d57517c6..54ee3371 100644 --- a/queue/gpu-ipu-v3-image-convert-Combine-rotate-no-rotate-ir.patch +++ b/queue/gpu-ipu-v3-image-convert-Combine-rotate-no-rotate-ir.patch @@ -1,4 +1,4 @@ -From 0f6245f42ce9b7e4d20f2cda8d5f12b55a44d7d1 Mon Sep 17 00:00:00 2001 +From 72e75958d21eea41e623a58084f55be2856a8737 Mon Sep 17 00:00:00 2001 From: Steve Longerbeam <slongerbeam@gmail.com> Date: Wed, 17 Jun 2020 15:40:37 -0700 Subject: [PATCH] gpu: ipu-v3: image-convert: Combine rotate/no-rotate irq @@ -11,12 +11,13 @@ eof_irq() handler. Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/ipu-v3/ipu-image-convert.c b/drivers/gpu/ipu-v3/ipu-image-convert.c -index eeca50d9a1ee..f8b031ded3cf 100644 +index e744f3527ce1..42d9cd856ed3 100644 --- a/drivers/gpu/ipu-v3/ipu-image-convert.c +++ b/drivers/gpu/ipu-v3/ipu-image-convert.c -@@ -1709,9 +1709,10 @@ done: +@@ -1653,9 +1653,10 @@ static irqreturn_t do_irq(struct ipu_image_convert_run *run) return IRQ_WAKE_THREAD; } @@ -28,7 +29,7 @@ index eeca50d9a1ee..f8b031ded3cf 100644 struct ipu_image_convert_ctx *ctx; struct ipu_image_convert_run *run; unsigned long flags; -@@ -1728,45 +1729,26 @@ static irqreturn_t norotate_irq(int irq, void *data) +@@ -1672,45 +1673,26 @@ static irqreturn_t norotate_irq(int irq, void *data) ctx = run->ctx; @@ -90,7 +91,7 @@ index eeca50d9a1ee..f8b031ded3cf 100644 ret = do_irq(run); out: spin_unlock_irqrestore(&chan->irqlock, flags); -@@ -1859,7 +1841,7 @@ static int get_ipu_resources(struct ipu_image_convert_chan *chan) +@@ -1803,7 +1785,7 @@ static int get_ipu_resources(struct ipu_image_convert_chan *chan) chan->out_chan, IPU_IRQ_EOF); @@ -99,7 +100,7 @@ index eeca50d9a1ee..f8b031ded3cf 100644 0, "ipu-ic", chan); if (ret < 0) { dev_err(priv->ipu->dev, "could not acquire irq %d\n", -@@ -1872,7 +1854,7 @@ static int get_ipu_resources(struct ipu_image_convert_chan *chan) +@@ -1816,7 +1798,7 @@ static int get_ipu_resources(struct ipu_image_convert_chan *chan) chan->rotation_out_chan, IPU_IRQ_EOF); diff --git a/queue/gpu-ipu-v3-image-convert-Wait-for-all-EOFs-before-co.patch b/queue/gpu-ipu-v3-image-convert-Wait-for-all-EOFs-before-co.patch index f0411b11..2f6973ac 100644 --- a/queue/gpu-ipu-v3-image-convert-Wait-for-all-EOFs-before-co.patch +++ b/queue/gpu-ipu-v3-image-convert-Wait-for-all-EOFs-before-co.patch @@ -1,4 +1,4 @@ -From bf51b2f4266049a7ac6cf8caf380d6fef669d636 Mon Sep 17 00:00:00 2001 +From 3e50264bdedec63d35719a7dedba31e3360cda0b Mon Sep 17 00:00:00 2001 From: Steve Longerbeam <slongerbeam@gmail.com> Date: Thu, 25 Jun 2020 11:13:37 -0700 Subject: [PATCH] gpu: ipu-v3: image-convert: Wait for all EOFs before @@ -17,6 +17,7 @@ channel when attempting to re-start it for the next tile. Fixes: 0537db801bb01 ("gpu: ipu-v3: image-convert: reconfigure IC per tile") Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/ipu-v3/ipu-image-convert.c b/drivers/gpu/ipu-v3/ipu-image-convert.c index 42d9cd856ed3..9d3b965b128e 100644 diff --git a/queue/i2c-rcar-slave-only-send-STOP-event-when-we-have-bee.patch b/queue/i2c-rcar-slave-only-send-STOP-event-when-we-have-bee.patch index 2508c03b..562b0353 100644 --- a/queue/i2c-rcar-slave-only-send-STOP-event-when-we-have-bee.patch +++ b/queue/i2c-rcar-slave-only-send-STOP-event-when-we-have-bee.patch @@ -1,4 +1,4 @@ -From 314139f9f0abdba61ed9a8463bbcb0bf900ac5a2 Mon Sep 17 00:00:00 2001 +From a6dcc37b027f3f1e1e0837b145156fd87570f38d Mon Sep 17 00:00:00 2001 From: Wolfram Sang <wsa+renesas@sang-engineering.com> Date: Mon, 29 Jun 2020 17:38:07 +0200 Subject: [PATCH] i2c: rcar: slave: only send STOP event when we have been @@ -14,12 +14,13 @@ otherwise. Fixes: de20d1857dd6 ("i2c: rcar: add slave support") Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Wolfram Sang <wsa@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c -index a45c4bf1ec01..c2921e1d8c4c 100644 +index 468f94319d51..0b90aa0318df 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c -@@ -583,13 +583,14 @@ static bool rcar_i2c_slave_irq(struct rcar_i2c_priv *priv) +@@ -580,13 +580,14 @@ static bool rcar_i2c_slave_irq(struct rcar_i2c_priv *priv) rcar_i2c_write(priv, ICSIER, SDR | SSR | SAR); } @@ -36,7 +37,7 @@ index a45c4bf1ec01..c2921e1d8c4c 100644 rcar_i2c_write(priv, ICSSR, ~SSR & 0xff); } -@@ -853,7 +854,7 @@ static int rcar_reg_slave(struct i2c_client *slave) +@@ -850,7 +851,7 @@ static int rcar_reg_slave(struct i2c_client *slave) priv->slave = slave; rcar_i2c_write(priv, ICSAR, slave->addr); rcar_i2c_write(priv, ICSSR, 0); diff --git a/queue/iio-dac-ad5592r-fix-unbalanced-mutex-unlocks-in-ad55.patch b/queue/iio-dac-ad5592r-fix-unbalanced-mutex-unlocks-in-ad55.patch index c0377ee4..70e91e6e 100644 --- a/queue/iio-dac-ad5592r-fix-unbalanced-mutex-unlocks-in-ad55.patch +++ b/queue/iio-dac-ad5592r-fix-unbalanced-mutex-unlocks-in-ad55.patch @@ -1,4 +1,4 @@ -From 65afb0932a81c1de719ceee0db0b276094b10ac8 Mon Sep 17 00:00:00 2001 +From 9bbcacda31c32bf97d158884138f791d23e8a3dc Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean <alexandru.ardelean@analog.com> Date: Mon, 6 Jul 2020 14:02:57 +0300 Subject: [PATCH] iio: dac: ad5592r: fix unbalanced mutex unlocks in @@ -18,12 +18,13 @@ Reported-by: Charles Stanhope <charles.stanhope@gmail.com> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/iio/dac/ad5592r-base.c b/drivers/iio/dac/ad5592r-base.c -index 5c4e5ff70380..cc4875660a69 100644 +index 2d897e64c6a9..424922cad1e3 100644 --- a/drivers/iio/dac/ad5592r-base.c +++ b/drivers/iio/dac/ad5592r-base.c -@@ -413,7 +413,7 @@ static int ad5592r_read_raw(struct iio_dev *iio_dev, +@@ -416,7 +416,7 @@ static int ad5592r_read_raw(struct iio_dev *iio_dev, s64 tmp = *val * (3767897513LL / 25LL); *val = div_s64_rem(tmp, 1000000000LL, val2); @@ -32,7 +33,7 @@ index 5c4e5ff70380..cc4875660a69 100644 } else { int mult; -@@ -444,7 +444,7 @@ static int ad5592r_read_raw(struct iio_dev *iio_dev, +@@ -447,7 +447,7 @@ static int ad5592r_read_raw(struct iio_dev *iio_dev, ret = IIO_VAL_INT; break; default: diff --git a/queue/iommu-omap-Check-for-failure-of-a-call-to-omap_iommu.patch b/queue/iommu-omap-Check-for-failure-of-a-call-to-omap_iommu.patch index 3191b393..8c530e92 100644 --- a/queue/iommu-omap-Check-for-failure-of-a-call-to-omap_iommu.patch +++ b/queue/iommu-omap-Check-for-failure-of-a-call-to-omap_iommu.patch @@ -1,4 +1,4 @@ -From dee9d154f40c58d02f69acdaa5cfd1eae6ebc28b Mon Sep 17 00:00:00 2001 +From 4c48d80f4571a9cf805b6d23c31320da120d4e5f Mon Sep 17 00:00:00 2001 From: Colin Ian King <colin.king@canonical.com> Date: Tue, 14 Jul 2020 20:22:11 +0100 Subject: [PATCH] iommu/omap: Check for failure of a call to @@ -16,9 +16,10 @@ Signed-off-by: Colin Ian King <colin.king@canonical.com> Link: https://lore.kernel.org/r/20200714192211.744776-1-colin.king@canonical.com Addresses-Coverity: ("Improper use of negative value") Signed-off-by: Joerg Roedel <jroedel@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c -index 8e19bfa94121..a99afb5d9011 100644 +index ff31bddba60a..02e8156b6a75 100644 --- a/drivers/iommu/omap-iommu-debug.c +++ b/drivers/iommu/omap-iommu-debug.c @@ -98,8 +98,11 @@ static ssize_t debug_read_regs(struct file *file, char __user *userbuf, diff --git a/queue/iommu-vt-d-Enforce-PASID-devTLB-field-mask.patch b/queue/iommu-vt-d-Enforce-PASID-devTLB-field-mask.patch index 133ceba5..0ed2d97e 100644 --- a/queue/iommu-vt-d-Enforce-PASID-devTLB-field-mask.patch +++ b/queue/iommu-vt-d-Enforce-PASID-devTLB-field-mask.patch @@ -1,4 +1,4 @@ -From 5f77d6ca5ca74e4b4a5e2e010f7ff50c45dea326 Mon Sep 17 00:00:00 2001 +From 5e1c63624da7ba4efc16e08df62a6e59a6c30f61 Mon Sep 17 00:00:00 2001 From: Liu Yi L <yi.l.liu@intel.com> Date: Fri, 24 Jul 2020 09:49:14 +0800 Subject: [PATCH] iommu/vt-d: Enforce PASID devTLB field mask @@ -13,12 +13,13 @@ Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> Link: https://lore.kernel.org/r/20200724014925.15523-2-baolu.lu@linux.intel.com Signed-off-by: Joerg Roedel <jroedel@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h -index 3e8fa1c7a1e6..311117b50e93 100644 +index 6dd07c852e6d..5f943486e405 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h -@@ -381,8 +381,8 @@ enum { +@@ -357,8 +357,8 @@ enum { #define QI_DEV_EIOTLB_ADDR(a) ((u64)(a) & VTD_PAGE_MASK) #define QI_DEV_EIOTLB_SIZE (((u64)1) << 11) diff --git a/queue/kprobes-Fix-NULL-pointer-dereference-at-kprobe_ftrac.patch b/queue/kprobes-Fix-NULL-pointer-dereference-at-kprobe_ftrac.patch index aafdb9ae..abdfcfb3 100644 --- a/queue/kprobes-Fix-NULL-pointer-dereference-at-kprobe_ftrac.patch +++ b/queue/kprobes-Fix-NULL-pointer-dereference-at-kprobe_ftrac.patch @@ -1,4 +1,4 @@ -From 0cb2f1372baa60af8456388a574af6133edd7d80 Mon Sep 17 00:00:00 2001 +From 3a2e551ba92423a5635fc94c02e07e9ab4a1f648 Mon Sep 17 00:00:00 2001 From: Muchun Song <songmuchun@bytedance.com> Date: Tue, 28 Jul 2020 14:45:36 +0800 Subject: [PATCH] kprobes: Fix NULL pointer dereference at @@ -69,12 +69,13 @@ Signed-off-by: Muchun Song <songmuchun@bytedance.com> Co-developed-by: Chengming Zhou <zhouchengming@bytedance.com> Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/kprobes.c b/kernel/kprobes.c -index 4a904cc56d68..07bf03fcf574 100644 +index b640e0abd636..24834e22ce1a 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c -@@ -2113,6 +2113,13 @@ static void kill_kprobe(struct kprobe *p) +@@ -2080,6 +2080,13 @@ static void kill_kprobe(struct kprobe *p) * the original probed function (which will be freed soon) any more. */ arch_remove_kprobe(p); diff --git a/queue/kprobes-Fix-compiler-warning-for-CONFIG_KPROBES_ON_F.patch b/queue/kprobes-Fix-compiler-warning-for-CONFIG_KPROBES_ON_F.patch index b0696ac0..b7bb17b3 100644 --- a/queue/kprobes-Fix-compiler-warning-for-CONFIG_KPROBES_ON_F.patch +++ b/queue/kprobes-Fix-compiler-warning-for-CONFIG_KPROBES_ON_F.patch @@ -1,4 +1,4 @@ -From 5a928eb44658cc44a2f934a999f26d35f9354e72 Mon Sep 17 00:00:00 2001 +From 9af954d9ae506866d91f6d79e83153c49e96b25d Mon Sep 17 00:00:00 2001 From: Muchun Song <songmuchun@bytedance.com> Date: Thu, 6 Aug 2020 01:20:46 +0800 Subject: [PATCH] kprobes: Fix compiler warning for !CONFIG_KPROBES_ON_FTRACE @@ -25,6 +25,7 @@ Acked-by: Masami Hiramatsu <mhiramat@kernel.org> Acked-by: John Fastabend <john.fastabend@gmail.com> Signed-off-by: Muchun Song <songmuchun@bytedance.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 24834e22ce1a..a0dfc7d425f0 100644 diff --git a/queue/libnvdimm-security-ensure-sysfs-poll-thread-woke-up-.patch b/queue/libnvdimm-security-ensure-sysfs-poll-thread-woke-up-.patch index 97e42493..108d1fe8 100644 --- a/queue/libnvdimm-security-ensure-sysfs-poll-thread-woke-up-.patch +++ b/queue/libnvdimm-security-ensure-sysfs-poll-thread-woke-up-.patch @@ -1,4 +1,4 @@ -From 6d3e14de500f0e95621c5d1ced12c4a1f727d778 Mon Sep 17 00:00:00 2001 +From 4df2f3605167c3fda5cf68891195cbd95ed76b62 Mon Sep 17 00:00:00 2001 From: Jane Chu <jane.chu@oracle.com> Date: Mon, 3 Aug 2020 16:41:39 -0600 Subject: [PATCH] libnvdimm/security: ensure sysfs poll thread woke up and @@ -21,6 +21,7 @@ Cc: Dan Williams <dan.j.williams@intel.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Jane Chu <jane.chu@oracle.com> Signed-off-by: Vishal Verma <vishal.l.verma@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/nvdimm/security.c b/drivers/nvdimm/security.c index a570f2263a42..bb1851133f28 100644 diff --git a/queue/md-cluster-Fix-potential-error-pointer-dereference-i.patch b/queue/md-cluster-Fix-potential-error-pointer-dereference-i.patch index aa30ad56..3d136797 100644 --- a/queue/md-cluster-Fix-potential-error-pointer-dereference-i.patch +++ b/queue/md-cluster-Fix-potential-error-pointer-dereference-i.patch @@ -1,4 +1,4 @@ -From e8abe1de43dac658dacbd04a4543e0c988a8d386 Mon Sep 17 00:00:00 2001 +From de647a8246a3067f5b026ab1346a93d7e5bbcec4 Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter@oracle.com> Date: Tue, 4 Aug 2020 13:16:45 +0300 Subject: [PATCH] md-cluster: Fix potential error pointer dereference in @@ -14,6 +14,7 @@ Fixes: afd756286083 ("md-cluster/raid10: resize all the bitmaps before start res Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com> Signed-off-by: Song Liu <songliubraving@fb.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c index 73fd50e77975..d50737ec4039 100644 diff --git a/queue/md-raid5-Fix-Force-reconstruct-write-io-stuck-in-deg.patch b/queue/md-raid5-Fix-Force-reconstruct-write-io-stuck-in-deg.patch index 20c9ecce..8370ee15 100644 --- a/queue/md-raid5-Fix-Force-reconstruct-write-io-stuck-in-deg.patch +++ b/queue/md-raid5-Fix-Force-reconstruct-write-io-stuck-in-deg.patch @@ -1,4 +1,4 @@ -From a1c6ae3d9f3dd6aa5981a332a6f700cf1c25edef Mon Sep 17 00:00:00 2001 +From ed048a979eeca8f2b64761adbdce56062fb37bd0 Mon Sep 17 00:00:00 2001 From: ChangSyun Peng <allenpeng@synology.com> Date: Fri, 31 Jul 2020 17:50:17 +0800 Subject: [PATCH] md/raid5: Fix Force reconstruct-write io stuck in degraded @@ -27,12 +27,13 @@ Reviewed-by: BingJing Chang <bingjingc@synology.com> Reviewed-by: Danny Shih <dannyshih@synology.com> Signed-off-by: ChangSyun Peng <allenpeng@synology.com> Signed-off-by: Song Liu <songliubraving@fb.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c -index b06edfaa73b0..9aab66fd1003 100644 +index 9313dc8e3389..d0af52da65af 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c -@@ -3626,6 +3626,7 @@ static int need_this_block(struct stripe_head *sh, struct stripe_head_state *s, +@@ -3598,6 +3598,7 @@ static int need_this_block(struct stripe_head *sh, struct stripe_head_state *s, * is missing/faulty, then we need to read everything we can. */ if (sh->raid_conf->level != 6 && @@ -40,7 +41,7 @@ index b06edfaa73b0..9aab66fd1003 100644 sh->sector < sh->raid_conf->mddev->recovery_cp) /* reconstruct-write isn't being forced */ return 0; -@@ -4862,7 +4863,7 @@ static void handle_stripe(struct stripe_head *sh) +@@ -4834,7 +4835,7 @@ static void handle_stripe(struct stripe_head *sh) * or to load a block that is being partially written. */ if (s.to_read || s.non_overwrite diff --git a/queue/media-rockchip-rga-Introduce-color-fmt-macros-and-re.patch b/queue/media-rockchip-rga-Introduce-color-fmt-macros-and-re.patch index 45667214..a888659a 100644 --- a/queue/media-rockchip-rga-Introduce-color-fmt-macros-and-re.patch +++ b/queue/media-rockchip-rga-Introduce-color-fmt-macros-and-re.patch @@ -1,4 +1,4 @@ -From ded874ece29d3fe2abd3775810a06056067eb68c Mon Sep 17 00:00:00 2001 +From d0711f316139678c16c00eb15882f96b718eb4f5 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Date: Thu, 30 Apr 2020 18:42:44 +0200 Subject: [PATCH] media: rockchip: rga: Introduce color fmt macros and refactor @@ -17,6 +17,7 @@ Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/media/platform/rockchip/rga/rga-hw.c b/drivers/media/platform/rockchip/rga/rga-hw.c index 4be6dcf292ff..5607ee8d1917 100644 diff --git a/queue/media-rockchip-rga-Only-set-output-CSC-mode-for-RGB-.patch b/queue/media-rockchip-rga-Only-set-output-CSC-mode-for-RGB-.patch index 55ebe038..108a8c06 100644 --- a/queue/media-rockchip-rga-Only-set-output-CSC-mode-for-RGB-.patch +++ b/queue/media-rockchip-rga-Only-set-output-CSC-mode-for-RGB-.patch @@ -1,4 +1,4 @@ -From 0f879bab72f47e8ba2421a984e7acfa763d3e84e Mon Sep 17 00:00:00 2001 +From 7c4203dba71132f947e1c4204f2f322c402db135 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Date: Thu, 30 Apr 2020 18:42:45 +0200 Subject: [PATCH] media: rockchip: rga: Only set output CSC mode for RGB input @@ -17,6 +17,7 @@ Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/media/platform/rockchip/rga/rga-hw.c b/drivers/media/platform/rockchip/rga/rga-hw.c index 5607ee8d1917..aaa96f256356 100644 diff --git a/queue/media-vsp1-dl-Fix-NULL-pointer-dereference-on-unbind.patch b/queue/media-vsp1-dl-Fix-NULL-pointer-dereference-on-unbind.patch index 60bb0c79..f9f72057 100644 --- a/queue/media-vsp1-dl-Fix-NULL-pointer-dereference-on-unbind.patch +++ b/queue/media-vsp1-dl-Fix-NULL-pointer-dereference-on-unbind.patch @@ -1,4 +1,4 @@ -From c92d30e4b78dc331909f8c6056c2792aa14e2166 Mon Sep 17 00:00:00 2001 +From 3dc8ec1c569e5b33e3295ebbb6f28c0796731e56 Mon Sep 17 00:00:00 2001 From: Eugeniu Rosca <erosca@de.adit-jv.com> Date: Tue, 2 Jun 2020 21:50:16 +0200 Subject: [PATCH] media: vsp1: dl: Fix NULL pointer dereference on unbind @@ -81,6 +81,7 @@ Tested-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/media/platform/vsp1/vsp1_dl.c b/drivers/media/platform/vsp1/vsp1_dl.c index d7b43037e500..e07b135613eb 100644 diff --git a/queue/mfd-arizona-Ensure-32k-clock-is-put-on-driver-unbind.patch b/queue/mfd-arizona-Ensure-32k-clock-is-put-on-driver-unbind.patch index 0fe70bd3..4573b3f8 100644 --- a/queue/mfd-arizona-Ensure-32k-clock-is-put-on-driver-unbind.patch +++ b/queue/mfd-arizona-Ensure-32k-clock-is-put-on-driver-unbind.patch @@ -1,4 +1,4 @@ -From ddff6c45b21d0437ce0c85f8ac35d7b5480513d7 Mon Sep 17 00:00:00 2001 +From abe1590a28516204472e0402954049005499fed7 Mon Sep 17 00:00:00 2001 From: Charles Keepax <ckeepax@opensource.cirrus.com> Date: Mon, 15 Jun 2020 14:53:21 +0100 Subject: [PATCH] mfd: arizona: Ensure 32k clock is put on driver unbind and @@ -18,12 +18,13 @@ clock. Fixes: cdd8da8cc66b ("mfd: arizona: Add gating of external MCLKn clocks") Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c -index 19e0bc3c0683..000cb82023e3 100644 +index 4a31907a4525..3ff872c205ee 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c -@@ -1426,6 +1426,15 @@ err_irq: +@@ -1430,6 +1430,15 @@ int arizona_dev_init(struct arizona *arizona) arizona_irq_exit(arizona); err_pm: pm_runtime_disable(arizona->dev); @@ -39,7 +40,7 @@ index 19e0bc3c0683..000cb82023e3 100644 err_reset: arizona_enable_reset(arizona); regulator_disable(arizona->dcvdd); -@@ -1448,6 +1457,15 @@ int arizona_dev_exit(struct arizona *arizona) +@@ -1452,6 +1461,15 @@ int arizona_dev_exit(struct arizona *arizona) regulator_disable(arizona->dcvdd); regulator_put(arizona->dcvdd); diff --git a/queue/mfd-dln2-Run-event-handler-loop-under-spinlock.patch b/queue/mfd-dln2-Run-event-handler-loop-under-spinlock.patch index c9e4ced8..c9b85b24 100644 --- a/queue/mfd-dln2-Run-event-handler-loop-under-spinlock.patch +++ b/queue/mfd-dln2-Run-event-handler-loop-under-spinlock.patch @@ -1,4 +1,4 @@ -From 3d858942250820b9adc35f963a257481d6d4c81d Mon Sep 17 00:00:00 2001 +From 913fa423a0b726960d4822e5da7ed81b2af61797 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Date: Thu, 23 Jul 2020 16:02:46 +0300 Subject: [PATCH] mfd: dln2: Run event handler loop under spinlock @@ -40,9 +40,10 @@ them are using generic_handle_irq() which makes above happen. Fixes: 338a12814297 ("mfd: Add support for Diolan DLN-2 devices") Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mfd/dln2.c b/drivers/mfd/dln2.c -index 39276fa626d2..83e676a096dc 100644 +index 4faa8d2e5d04..707f4287ab4a 100644 --- a/drivers/mfd/dln2.c +++ b/drivers/mfd/dln2.c @@ -287,7 +287,11 @@ static void dln2_rx(struct urb *urb) diff --git a/queue/mm-hugetlb-fix-a-race-between-hugetlb-sysctl-handler.patch b/queue/mm-hugetlb-fix-a-race-between-hugetlb-sysctl-handler.patch index 2b2b41db..1f375adc 100644 --- a/queue/mm-hugetlb-fix-a-race-between-hugetlb-sysctl-handler.patch +++ b/queue/mm-hugetlb-fix-a-race-between-hugetlb-sysctl-handler.patch @@ -1,4 +1,4 @@ -From 82e059921afb0c654302e3789ff4af5d19f9ff58 Mon Sep 17 00:00:00 2001 +From 9cfff15c098f67211ed051e4c3c3742dedfd5ff9 Mon Sep 17 00:00:00 2001 From: Muchun Song <songmuchun@bytedance.com> Date: Fri, 4 Sep 2020 16:36:13 -0700 Subject: [PATCH] mm/hugetlb: fix a race between hugetlb sysctl handlers @@ -60,6 +60,7 @@ Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com> Cc: Andi Kleen <ak@linux.intel.com> Link: http://lkml.kernel.org/r/20200828031146.43035-1-songmuchun@bytedance.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/hugetlb.c b/mm/hugetlb.c index acabe9928049..1eedc7003380 100644 diff --git a/queue/mm-madvise-fix-vma-user-after-free.patch b/queue/mm-madvise-fix-vma-user-after-free.patch index da23be39..b39f0457 100644 --- a/queue/mm-madvise-fix-vma-user-after-free.patch +++ b/queue/mm-madvise-fix-vma-user-after-free.patch @@ -1,4 +1,4 @@ -From 4b82272a64326ce4803fcdce6965f0a6c693d841 Mon Sep 17 00:00:00 2001 +From fa81ca27ad75d71c9bb71d84598d22fc70cb478a Mon Sep 17 00:00:00 2001 From: Yang Shi <shy828301@gmail.com> Date: Fri, 4 Sep 2020 16:35:55 -0700 Subject: [PATCH] mm: madvise: fix vma user-after-free @@ -67,6 +67,7 @@ Reviewed-by: Jan Kara <jack@suse.cz> Cc: <stable@vger.kernel.org> [5.4+] Link: https://lkml.kernel.org/r/20200816141204.162624-1-shy828301@gmail.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/madvise.c b/mm/madvise.c index ae56d0ef337d..9c43c8515cef 100644 diff --git a/queue/mm-page_counter.c-fix-protection-usage-propagation.patch b/queue/mm-page_counter.c-fix-protection-usage-propagation.patch index 8e821df7..ba7cf02a 100644 --- a/queue/mm-page_counter.c-fix-protection-usage-propagation.patch +++ b/queue/mm-page_counter.c-fix-protection-usage-propagation.patch @@ -1,4 +1,4 @@ -From a6f23d14ec7d7d02220ad8bb2774be3322b9aeec Mon Sep 17 00:00:00 2001 +From e1f1ec3a873f2b426932855bab81c06942d8bc12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutn=C3=BD?= <mkoutny@suse.com> Date: Thu, 6 Aug 2020 23:22:18 -0700 Subject: [PATCH] mm/page_counter.c: fix protection usage propagation @@ -39,12 +39,13 @@ Cc: Tejun Heo <tj@kernel.org> Cc: <stable@vger.kernel.org> [4.18+] Link: http://lkml.kernel.org/r/20200803153231.15477-1-mhocko@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/page_counter.c b/mm/page_counter.c -index c56db2d5e159..b4663844c9b3 100644 +index de31470655f6..147ff99187b8 100644 --- a/mm/page_counter.c +++ b/mm/page_counter.c -@@ -72,7 +72,7 @@ void page_counter_charge(struct page_counter *counter, unsigned long nr_pages) +@@ -77,7 +77,7 @@ void page_counter_charge(struct page_counter *counter, unsigned long nr_pages) long new; new = atomic_long_add_return(nr_pages, &c->usage); @@ -53,7 +54,7 @@ index c56db2d5e159..b4663844c9b3 100644 /* * This is indeed racy, but we can live with some * inaccuracy in the watermark. -@@ -116,7 +116,7 @@ bool page_counter_try_charge(struct page_counter *counter, +@@ -121,7 +121,7 @@ bool page_counter_try_charge(struct page_counter *counter, new = atomic_long_add_return(nr_pages, &c->usage); if (new > c->max) { atomic_long_sub(nr_pages, &c->usage); @@ -62,7 +63,7 @@ index c56db2d5e159..b4663844c9b3 100644 /* * This is racy, but we can live with some * inaccuracy in the failcnt. -@@ -125,7 +125,7 @@ bool page_counter_try_charge(struct page_counter *counter, +@@ -130,7 +130,7 @@ bool page_counter_try_charge(struct page_counter *counter, *fail = c; goto failed; } diff --git a/queue/mm-slub-fix-conversion-of-freelist_corrupted.patch b/queue/mm-slub-fix-conversion-of-freelist_corrupted.patch index f649ba0c..455591dc 100644 --- a/queue/mm-slub-fix-conversion-of-freelist_corrupted.patch +++ b/queue/mm-slub-fix-conversion-of-freelist_corrupted.patch @@ -1,4 +1,4 @@ -From dc07a728d49cf025f5da2c31add438d839d076c0 Mon Sep 17 00:00:00 2001 +From c5588929a64ca65b0d596d496c04105e67dce509 Mon Sep 17 00:00:00 2001 From: Eugeniu Rosca <erosca@de.adit-jv.com> Date: Fri, 4 Sep 2020 16:35:30 -0700 Subject: [PATCH] mm: slub: fix conversion of freelist_corrupted() @@ -29,12 +29,13 @@ Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: <stable@vger.kernel.org> Link: https://lkml.kernel.org/r/20200824130643.10291-1-erosca@de.adit-jv.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/slub.c b/mm/slub.c -index 68c02b2eecd9..d4177aecedf6 100644 +index 9e7da3b8bd0a..04a46eaea862 100644 --- a/mm/slub.c +++ b/mm/slub.c -@@ -672,12 +672,12 @@ static void slab_fix(struct kmem_cache *s, char *fmt, ...) +@@ -645,12 +645,12 @@ static void slab_fix(struct kmem_cache *s, char *fmt, ...) } static bool freelist_corrupted(struct kmem_cache *s, struct page *page, @@ -51,7 +52,7 @@ index 68c02b2eecd9..d4177aecedf6 100644 slab_fix(s, "Isolate corrupted freechain"); return true; } -@@ -1494,7 +1494,7 @@ static inline void dec_slabs_node(struct kmem_cache *s, int node, +@@ -1391,7 +1391,7 @@ static inline void dec_slabs_node(struct kmem_cache *s, int node, int objects) {} static bool freelist_corrupted(struct kmem_cache *s, struct page *page, @@ -60,7 +61,7 @@ index 68c02b2eecd9..d4177aecedf6 100644 { return false; } -@@ -2184,7 +2184,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page, +@@ -2089,7 +2089,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page, * 'freelist' is already corrupted. So isolate all objects * starting at 'freelist'. */ diff --git a/queue/mmc-renesas_sdhi_internal_dmac-clean-up-the-code-for.patch b/queue/mmc-renesas_sdhi_internal_dmac-clean-up-the-code-for.patch index ce49dbc1..735fa703 100644 --- a/queue/mmc-renesas_sdhi_internal_dmac-clean-up-the-code-for.patch +++ b/queue/mmc-renesas_sdhi_internal_dmac-clean-up-the-code-for.patch @@ -1,4 +1,4 @@ -From 2b26e34e9af3fa24fa1266e9ea2d66a1f7d62dc0 Mon Sep 17 00:00:00 2001 +From 728d57216d2af907e480a03cd5afe619d528775f Mon Sep 17 00:00:00 2001 From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Date: Thu, 21 May 2020 16:01:05 +0900 Subject: [PATCH] mmc: renesas_sdhi_internal_dmac: clean up the code for dma @@ -13,9 +13,10 @@ Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Link: https://lore.kernel.org/r/1590044466-28372-3-git-send-email-yoshihiro.shimoda.uh@renesas.com Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c -index 47ac53e91241..201b8ed37f2e 100644 +index 751fe91c7571..63eb203bba61 100644 --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c @@ -229,15 +229,12 @@ static void renesas_sdhi_internal_dmac_issue_tasklet_fn(unsigned long arg) diff --git a/queue/mtd-rawnand-fsl_upm-Remove-unused-mtd-var.patch b/queue/mtd-rawnand-fsl_upm-Remove-unused-mtd-var.patch index 99e9e995..822aeee8 100644 --- a/queue/mtd-rawnand-fsl_upm-Remove-unused-mtd-var.patch +++ b/queue/mtd-rawnand-fsl_upm-Remove-unused-mtd-var.patch @@ -1,4 +1,4 @@ -From ccc49eff77bee2885447a032948959a134029fe3 Mon Sep 17 00:00:00 2001 +From 76b48ead91ee939249234f2cdf8487397bfa23c8 Mon Sep 17 00:00:00 2001 From: Boris Brezillon <boris.brezillon@collabora.com> Date: Wed, 3 Jun 2020 15:49:13 +0200 Subject: [PATCH] mtd: rawnand: fsl_upm: Remove unused mtd var @@ -13,9 +13,10 @@ Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20200603134922.1352340-2-boris.brezillon@collabora.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mtd/nand/raw/fsl_upm.c b/drivers/mtd/nand/raw/fsl_upm.c -index 627deb26db51..76d1032cd35e 100644 +index 1054cc070747..20b0ee174dc6 100644 --- a/drivers/mtd/nand/raw/fsl_upm.c +++ b/drivers/mtd/nand/raw/fsl_upm.c @@ -62,7 +62,6 @@ static int fun_chip_ready(struct nand_chip *chip) diff --git a/queue/net-compat-Add-missing-sock-updates-for-SCM_RIGHTS.patch b/queue/net-compat-Add-missing-sock-updates-for-SCM_RIGHTS.patch index d24262d4..762e51f2 100644 --- a/queue/net-compat-Add-missing-sock-updates-for-SCM_RIGHTS.patch +++ b/queue/net-compat-Add-missing-sock-updates-for-SCM_RIGHTS.patch @@ -1,4 +1,4 @@ -From d9539752d23283db4692384a634034f451261e29 Mon Sep 17 00:00:00 2001 +From a28e840a6dd4ff5d65e8395fc5642ca661090535 Mon Sep 17 00:00:00 2001 From: Kees Cook <keescook@chromium.org> Date: Tue, 9 Jun 2020 16:11:29 -0700 Subject: [PATCH] net/compat: Add missing sock updates for SCM_RIGHTS @@ -17,12 +17,13 @@ Fixes: 48a87cc26c13 ("net: netprio: fd passed in SCM_RIGHTS datagram not set cor Fixes: d84295067fc7 ("net: net_cls: fd passed in SCM_RIGHTS datagram not set correctly") Acked-by: Christian Brauner <christian.brauner@ubuntu.com> Signed-off-by: Kees Cook <keescook@chromium.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/net/sock.h b/include/net/sock.h -index c53cc42b5ab9..2be67f1ee8b1 100644 +index d17d6086a39d..86ec9c407746 100644 --- a/include/net/sock.h +++ b/include/net/sock.h -@@ -890,6 +890,8 @@ static inline int sk_memalloc_socks(void) +@@ -849,6 +849,8 @@ static inline int sk_memalloc_socks(void) { return static_branch_unlikely(&memalloc_socks_key); } @@ -31,7 +32,7 @@ index c53cc42b5ab9..2be67f1ee8b1 100644 #else static inline int sk_memalloc_socks(void) -@@ -897,6 +899,8 @@ static inline int sk_memalloc_socks(void) +@@ -856,6 +858,8 @@ static inline int sk_memalloc_socks(void) return 0; } @@ -41,10 +42,10 @@ index c53cc42b5ab9..2be67f1ee8b1 100644 static inline gfp_t sk_gfp_mask(const struct sock *sk, gfp_t gfp_mask) diff --git a/net/compat.c b/net/compat.c -index 5e3041a2c37d..2937b816107d 100644 +index 3f9ce609397f..24906536870f 100644 --- a/net/compat.c +++ b/net/compat.c -@@ -309,6 +309,7 @@ void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm) +@@ -290,6 +290,7 @@ void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm) break; } /* Bump the usage count and install the file. */ @@ -53,10 +54,10 @@ index 5e3041a2c37d..2937b816107d 100644 } diff --git a/net/core/sock.c b/net/core/sock.c -index 6c4acf1f0220..bde394979041 100644 +index 65c529c1d55f..fb83335a5abb 100644 --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -2840,6 +2840,27 @@ int sock_no_mmap(struct file *file, struct socket *sock, struct vm_area_struct * +@@ -2729,6 +2729,27 @@ int sock_no_mmap(struct file *file, struct socket *sock, struct vm_area_struct * } EXPORT_SYMBOL(sock_no_mmap); diff --git a/queue/net-ethernet-stmmac-Disable-hardware-multicast-filte.patch b/queue/net-ethernet-stmmac-Disable-hardware-multicast-filte.patch index c2344ff0..7dd141d2 100644 --- a/queue/net-ethernet-stmmac-Disable-hardware-multicast-filte.patch +++ b/queue/net-ethernet-stmmac-Disable-hardware-multicast-filte.patch @@ -1,4 +1,4 @@ -From df43dd526e6609769ae513a81443c7aa727c8ca3 Mon Sep 17 00:00:00 2001 +From 9d4d3dae549a8a529640e695afe2037ab67517b1 Mon Sep 17 00:00:00 2001 From: Jonathan McDowell <noodles@earth.li> Date: Wed, 12 Aug 2020 20:37:23 +0100 Subject: [PATCH] net: ethernet: stmmac: Disable hardware multicast filter @@ -19,12 +19,13 @@ functionality on an RB3011 router. Cc: stable@vger.kernel.org Signed-off-by: Jonathan McDowell <noodles@earth.li> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c -index 02102c781a8c..bf3250e0e59c 100644 +index bc0e2fe71682..db3264d374f9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c -@@ -351,6 +351,7 @@ static int ipq806x_gmac_probe(struct platform_device *pdev) +@@ -350,6 +350,7 @@ static int ipq806x_gmac_probe(struct platform_device *pdev) plat_dat->has_gmac = true; plat_dat->bsp_priv = gmac; plat_dat->fix_mac_speed = ipq806x_gmac_fix_mac_speed; diff --git a/queue/net-packet-constify-__packet_get_status-argument.patch b/queue/net-packet-constify-__packet_get_status-argument.patch index 0bef5ee1..2442c446 100644 --- a/queue/net-packet-constify-__packet_get_status-argument.patch +++ b/queue/net-packet-constify-__packet_get_status-argument.patch @@ -1,4 +1,4 @@ -From 96f657e6cfc25b27d8189cb6b9eac66e1b1ff4f3 Mon Sep 17 00:00:00 2001 +From 091d0b2c89eb7cce9a1062ed6e7724160530a4dd Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Wed, 12 Jun 2019 09:52:26 -0700 Subject: [PATCH] net/packet: constify __packet_get_status() argument @@ -9,9 +9,10 @@ struct packet_sock is only read. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index 7fa847dcea30..66fcfd5b51f8 100644 +index 3fc423b63d9b..c7f7e3a70eef 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -384,7 +384,7 @@ static void __packet_set_status(struct packet_sock *po, void *frame, int status) @@ -24,5 +25,5 @@ index 7fa847dcea30..66fcfd5b51f8 100644 union tpacket_uhdr h; -- -1.9.1 +2.27.0 diff --git a/queue/net-packet-constify-__packet_rcv_has_room.patch b/queue/net-packet-constify-__packet_rcv_has_room.patch index 7cebf0e5..e68a5468 100644 --- a/queue/net-packet-constify-__packet_rcv_has_room.patch +++ b/queue/net-packet-constify-__packet_rcv_has_room.patch @@ -1,4 +1,4 @@ -From 0338a14523e3864524dafb6a66c7b82e94201317 Mon Sep 17 00:00:00 2001 +From c392e9c02c14428d2754b23d753b16bf61b2a9f4 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Wed, 12 Jun 2019 09:52:29 -0700 Subject: [PATCH] net/packet: constify __packet_rcv_has_room() @@ -9,12 +9,13 @@ Goal is use the helper without lock being held. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index 5ef63d0c3ad0..a0564855ed9d 100644 +index 8185514e0b58..ce2c11834fa9 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -1224,15 +1224,18 @@ static bool __tpacket_v3_has_room(const struct packet_sock *po, int pow_off) +@@ -1226,15 +1226,18 @@ static bool __tpacket_v3_has_room(const struct packet_sock *po, int pow_off) return prb_lookup_block(po, &po->rx_ring, idx, TP_STATUS_KERNEL); } @@ -39,5 +40,5 @@ index 5ef63d0c3ad0..a0564855ed9d 100644 else if (avail > 0) return ROOM_LOW; -- -1.9.1 +2.27.0 diff --git a/queue/net-packet-constify-packet_lookup_frame-and-__tpacke.patch b/queue/net-packet-constify-packet_lookup_frame-and-__tpacke.patch index 73731e8e..db2e6686 100644 --- a/queue/net-packet-constify-packet_lookup_frame-and-__tpacke.patch +++ b/queue/net-packet-constify-packet_lookup_frame-and-__tpacke.patch @@ -1,4 +1,4 @@ -From d4b5bd98faec345933d6080989e035a833b1077a Mon Sep 17 00:00:00 2001 +From 8bff501b174ef6144d514097565bae3f754dd4ed Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Wed, 12 Jun 2019 09:52:27 -0700 Subject: [PATCH] net/packet: constify packet_lookup_frame() and @@ -10,9 +10,10 @@ Goal is to be able to use __tpacket_has_room() without holding a lock. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index 66fcfd5b51f8..273bffd2130d 100644 +index c7f7e3a70eef..a5736ff350d4 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -460,10 +460,10 @@ static __u32 __packet_set_timestamp(struct packet_sock *po, void *frame, @@ -30,7 +31,7 @@ index 66fcfd5b51f8..273bffd2130d 100644 { unsigned int pg_vec_pos, frame_offset; union tpacket_uhdr h; -@@ -1198,12 +1198,12 @@ static void packet_free_pending(struct packet_sock *po) +@@ -1200,12 +1200,12 @@ static void packet_free_pending(struct packet_sock *po) #define ROOM_LOW 0x1 #define ROOM_NORMAL 0x2 @@ -47,5 +48,5 @@ index 66fcfd5b51f8..273bffd2130d 100644 idx += len >> pow_off; if (idx >= len) -- -1.9.1 +2.27.0 diff --git a/queue/net-packet-constify-prb_lookup_block-and-__tpacket_v.patch b/queue/net-packet-constify-prb_lookup_block-and-__tpacket_v.patch index efd8e84e..a740d2d0 100644 --- a/queue/net-packet-constify-prb_lookup_block-and-__tpacket_v.patch +++ b/queue/net-packet-constify-prb_lookup_block-and-__tpacket_v.patch @@ -1,4 +1,4 @@ -From dcf70cefaf99a40cfa25face160f29c1cf3bf84d Mon Sep 17 00:00:00 2001 +From 61849a6baaaeba776d5f03b8dfb521a8ad9046b4 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Wed, 12 Jun 2019 09:52:28 -0700 Subject: [PATCH] net/packet: constify prb_lookup_block() and @@ -11,12 +11,13 @@ a lock. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index 273bffd2130d..5ef63d0c3ad0 100644 +index a5736ff350d4..8185514e0b58 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -1082,10 +1082,10 @@ static void *packet_current_rx_frame(struct packet_sock *po, +@@ -1084,10 +1084,10 @@ static void *packet_current_rx_frame(struct packet_sock *po, } } @@ -31,7 +32,7 @@ index 273bffd2130d..5ef63d0c3ad0 100644 { struct tpacket_kbdq_core *pkc = GET_PBDQC_FROM_RB(rb); struct tpacket_block_desc *pbd = GET_PBLOCK_DESC(pkc, idx); -@@ -1211,12 +1211,12 @@ static bool __tpacket_has_room(const struct packet_sock *po, int pow_off) +@@ -1213,12 +1213,12 @@ static bool __tpacket_has_room(const struct packet_sock *po, int pow_off) return packet_lookup_frame(po, &po->rx_ring, idx, TP_STATUS_KERNEL); } @@ -48,5 +49,5 @@ index 273bffd2130d..5ef63d0c3ad0 100644 idx += len >> pow_off; if (idx >= len) -- -1.9.1 +2.27.0 diff --git a/queue/net-packet-fix-overflow-in-tpacket_rcv.patch b/queue/net-packet-fix-overflow-in-tpacket_rcv.patch index d12c6cc6..85573c6b 100644 --- a/queue/net-packet-fix-overflow-in-tpacket_rcv.patch +++ b/queue/net-packet-fix-overflow-in-tpacket_rcv.patch @@ -1,4 +1,4 @@ -From 0b965bd2244b7ff08c7cdb0c131e17f4da5bae6e Mon Sep 17 00:00:00 2001 +From ccb4556bd073e575abe23041b1c3f4f71009f677 Mon Sep 17 00:00:00 2001 From: Or Cohen <orcohen@paloaltonetworks.com> Date: Thu, 3 Sep 2020 21:05:28 -0700 Subject: [PATCH] net/packet: fix overflow in tpacket_rcv @@ -22,12 +22,13 @@ Fixes: 8913336a7e8d ("packet: add PACKET_RESERVE sockopt") Signed-off-by: Or Cohen <orcohen@paloaltonetworks.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index 3fc423b63d9b..eb4f086f3163 100644 +index bba78d238631..b2e4c4b192e6 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -2162,7 +2162,8 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, +@@ -2168,7 +2168,8 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, int skb_len = skb->len; unsigned int snaplen, res; unsigned long status = TP_STATUS_USER; @@ -37,7 +38,7 @@ index 3fc423b63d9b..eb4f086f3163 100644 struct sk_buff *copy_skb = NULL; struct timespec ts; __u32 ts_status; -@@ -2225,6 +2226,10 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, +@@ -2237,6 +2238,10 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, } macoff = netoff - maclen; } diff --git a/queue/net-packet-implement-shortcut-in-tpacket_rcv.patch b/queue/net-packet-implement-shortcut-in-tpacket_rcv.patch index 95e4b95f..55870561 100644 --- a/queue/net-packet-implement-shortcut-in-tpacket_rcv.patch +++ b/queue/net-packet-implement-shortcut-in-tpacket_rcv.patch @@ -1,4 +1,4 @@ -From 2c51c6273c73ff04099f48fb42dfdd2acc7a1b70 Mon Sep 17 00:00:00 2001 +From 58b5fda5d311d84e1123c25c22430960eb4a2506 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Wed, 12 Jun 2019 09:52:31 -0700 Subject: [PATCH] net/packet: implement shortcut in tpacket_rcv() @@ -20,12 +20,13 @@ Receive queue is never drained and immediately full. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index 2d499679811a..860ca3e6abf5 100644 +index 1b42badb40f1..beb6770c1bec 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -2193,6 +2193,12 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, +@@ -2202,6 +2202,12 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, if (!res) goto drop_n_restore; @@ -39,5 +40,5 @@ index 2d499679811a..860ca3e6abf5 100644 status |= TP_STATUS_CSUMNOTREADY; else if (skb->pkt_type != PACKET_OUTGOING && -- -1.9.1 +2.27.0 diff --git a/queue/net-packet-introduce-packet_rcv_try_clear_pressure-h.patch b/queue/net-packet-introduce-packet_rcv_try_clear_pressure-h.patch index ed950083..a0084839 100644 --- a/queue/net-packet-introduce-packet_rcv_try_clear_pressure-h.patch +++ b/queue/net-packet-introduce-packet_rcv_try_clear_pressure-h.patch @@ -1,4 +1,4 @@ -From 9bb6cd652454969fa0ae6c52c8ebd31472d0171c Mon Sep 17 00:00:00 2001 +From 050cb475e19ff391832766814501862e46088481 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Wed, 12 Jun 2019 09:52:33 -0700 Subject: [PATCH] net/packet: introduce packet_rcv_try_clear_pressure() helper @@ -12,12 +12,13 @@ Signed-off-by: Eric Dumazet <edumazet@google.com> Suggested-by: Willem de Bruijn <willemb@google.com> Acked-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index d409e2fdaa7e..8c27e198268a 100644 +index d0ab6bbbb75c..bba78d238631 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -1271,6 +1271,13 @@ static int packet_rcv_has_room(struct packet_sock *po, struct sk_buff *skb) +@@ -1273,6 +1273,13 @@ static int packet_rcv_has_room(struct packet_sock *po, struct sk_buff *skb) return ret; } @@ -31,7 +32,7 @@ index d409e2fdaa7e..8c27e198268a 100644 static void packet_sock_destruct(struct sock *sk) { skb_queue_purge(&sk->sk_error_queue); -@@ -3308,8 +3315,7 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, +@@ -3349,8 +3356,7 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, if (skb == NULL) goto out; @@ -41,7 +42,7 @@ index d409e2fdaa7e..8c27e198268a 100644 if (pkt_sk(sk)->has_vnet_hdr) { err = packet_rcv_vnet(msg, skb, &len); -@@ -4127,8 +4133,7 @@ static __poll_t packet_poll(struct file *file, struct socket *sock, +@@ -4168,8 +4174,7 @@ static __poll_t packet_poll(struct file *file, struct socket *sock, TP_STATUS_KERNEL)) mask |= EPOLLIN | EPOLLRDNORM; } @@ -52,5 +53,5 @@ index d409e2fdaa7e..8c27e198268a 100644 spin_lock_bh(&sk->sk_write_queue.lock); if (po->tx_ring.pg_vec) { -- -1.9.1 +2.27.0 diff --git a/queue/net-packet-make-tp_drops-atomic.patch b/queue/net-packet-make-tp_drops-atomic.patch index f8a217d1..9c44c4e9 100644 --- a/queue/net-packet-make-tp_drops-atomic.patch +++ b/queue/net-packet-make-tp_drops-atomic.patch @@ -1,4 +1,4 @@ -From 8e8e2951e3095732d7e780c241f61ea130955a57 Mon Sep 17 00:00:00 2001 +From 313c7e169977077914f2763250911f20d030a2e1 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Wed, 12 Jun 2019 09:52:30 -0700 Subject: [PATCH] net/packet: make tp_drops atomic @@ -11,12 +11,13 @@ the receive queue slightly faster :/ Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index a0564855ed9d..2d499679811a 100644 +index ce2c11834fa9..1b42badb40f1 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -758,7 +758,7 @@ static void prb_close_block(struct tpacket_kbdq_core *pkc1, +@@ -759,7 +759,7 @@ static void prb_close_block(struct tpacket_kbdq_core *pkc1, struct tpacket_hdr_v1 *h1 = &pbd1->hdr.bh1; struct sock *sk = &po->sk; @@ -25,7 +26,7 @@ index a0564855ed9d..2d499679811a 100644 status |= TP_STATUS_LOSING; last_pkt = (struct tpacket3_hdr *)pkc1->prev; -@@ -2128,10 +2128,8 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, +@@ -2136,10 +2136,8 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, drop_n_acct: is_drop_n_account = true; @@ -37,7 +38,7 @@ index a0564855ed9d..2d499679811a 100644 drop_n_restore: if (skb_head != skb->data && skb_shared(skb)) { -@@ -2265,7 +2263,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, +@@ -2288,7 +2286,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, * Anyways, moving it for V1/V2 only as V3 doesn't need this * at packet level. */ @@ -46,7 +47,7 @@ index a0564855ed9d..2d499679811a 100644 status |= TP_STATUS_LOSING; } -@@ -2381,9 +2379,9 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, +@@ -2401,9 +2399,9 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, return 0; drop_n_account: @@ -58,7 +59,7 @@ index a0564855ed9d..2d499679811a 100644 sk->sk_data_ready(sk); kfree_skb(copy_skb); -@@ -3879,6 +3877,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, +@@ -3920,6 +3918,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, void *data = &val; union tpacket_stats_u st; struct tpacket_rollover_stats rstats; @@ -66,7 +67,7 @@ index a0564855ed9d..2d499679811a 100644 if (level != SOL_PACKET) return -ENOPROTOOPT; -@@ -3895,14 +3894,17 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, +@@ -3936,14 +3935,17 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, memcpy(&st, &po->stats, sizeof(st)); memset(&po->stats, 0, sizeof(po->stats)); spin_unlock_bh(&sk->sk_receive_queue.lock); @@ -87,10 +88,10 @@ index a0564855ed9d..2d499679811a 100644 } diff --git a/net/packet/internal.h b/net/packet/internal.h -index 3bb7c5fb3bff..b5bcff2b7a43 100644 +index f10294800aaf..907f4cd2a718 100644 --- a/net/packet/internal.h +++ b/net/packet/internal.h -@@ -131,6 +131,7 @@ struct packet_sock { +@@ -135,6 +135,7 @@ struct packet_sock { struct net_device __rcu *cached_dev; int (*xmit)(struct sk_buff *skb); struct packet_type prot_hook ____cacheline_aligned_in_smp; @@ -99,5 +100,5 @@ index 3bb7c5fb3bff..b5bcff2b7a43 100644 static struct packet_sock *pkt_sk(struct sock *sk) -- -1.9.1 +2.27.0 diff --git a/queue/net-packet-remove-locking-from-packet_rcv_has_room.patch b/queue/net-packet-remove-locking-from-packet_rcv_has_room.patch index f0849bd4..24286124 100644 --- a/queue/net-packet-remove-locking-from-packet_rcv_has_room.patch +++ b/queue/net-packet-remove-locking-from-packet_rcv_has_room.patch @@ -1,4 +1,4 @@ -From 3a2bb84e4aeab5c90d16e1cd17dbaa17631af529 Mon Sep 17 00:00:00 2001 +From d5818b4d2a150f5e1715c568651dda195322d27d Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Wed, 12 Jun 2019 09:52:32 -0700 Subject: [PATCH] net/packet: remove locking from packet_rcv_has_room() @@ -14,12 +14,13 @@ without any synchronization. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index 860ca3e6abf5..d409e2fdaa7e 100644 +index beb6770c1bec..d0ab6bbbb75c 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -1260,15 +1260,13 @@ static int __packet_rcv_has_room(const struct packet_sock *po, +@@ -1262,15 +1262,13 @@ static int __packet_rcv_has_room(const struct packet_sock *po, static int packet_rcv_has_room(struct packet_sock *po, struct sk_buff *skb) { @@ -40,7 +41,7 @@ index 860ca3e6abf5..d409e2fdaa7e 100644 return ret; } -@@ -1353,7 +1351,7 @@ static unsigned int fanout_demux_rollover(struct packet_fanout *f, +@@ -1361,7 +1359,7 @@ static unsigned int fanout_demux_rollover(struct packet_fanout *f, i = j = min_t(int, po->rollover->sock, num - 1); do { po_next = pkt_sk(f->arr[i]); @@ -49,7 +50,7 @@ index 860ca3e6abf5..d409e2fdaa7e 100644 packet_rcv_has_room(po_next, skb) == ROOM_NORMAL) { if (i != j) po->rollover->sock = i; -@@ -3310,7 +3308,7 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, +@@ -3351,7 +3349,7 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, if (skb == NULL) goto out; @@ -58,7 +59,7 @@ index 860ca3e6abf5..d409e2fdaa7e 100644 packet_rcv_has_room(pkt_sk(sk), NULL); if (pkt_sk(sk)->has_vnet_hdr) { -@@ -4129,8 +4127,8 @@ static __poll_t packet_poll(struct file *file, struct socket *sock, +@@ -4170,8 +4168,8 @@ static __poll_t packet_poll(struct file *file, struct socket *sock, TP_STATUS_KERNEL)) mask |= EPOLLIN | EPOLLRDNORM; } @@ -70,5 +71,5 @@ index 860ca3e6abf5..d409e2fdaa7e 100644 spin_lock_bh(&sk->sk_write_queue.lock); if (po->tx_ring.pg_vec) { -- -1.9.1 +2.27.0 diff --git a/queue/net-qcom-emac-add-missed-clk_disable_unprepare-in-er.patch b/queue/net-qcom-emac-add-missed-clk_disable_unprepare-in-er.patch index 8cdd0421..3c4dfeb5 100644 --- a/queue/net-qcom-emac-add-missed-clk_disable_unprepare-in-er.patch +++ b/queue/net-qcom-emac-add-missed-clk_disable_unprepare-in-er.patch @@ -1,4 +1,4 @@ -From 50caa777a3a24d7027748e96265728ce748b41ef Mon Sep 17 00:00:00 2001 +From 6688b4682131ac0a166adb014a18c0c3d83e6b25 Mon Sep 17 00:00:00 2001 From: Wang Hai <wanghai38@huawei.com> Date: Mon, 10 Aug 2020 10:57:05 +0800 Subject: [PATCH] net: qcom/emac: add missed clk_disable_unprepare in error @@ -14,12 +14,13 @@ Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wang Hai <wanghai38@huawei.com> Acked-by: Timur Tabi <timur@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/qualcomm/emac/emac.c b/drivers/net/ethernet/qualcomm/emac/emac.c -index 20b1b43a0e39..1166b98d8bb2 100644 +index 59c2349b59df..b02536fb21fb 100644 --- a/drivers/net/ethernet/qualcomm/emac/emac.c +++ b/drivers/net/ethernet/qualcomm/emac/emac.c -@@ -474,13 +474,24 @@ static int emac_clks_phase1_init(struct platform_device *pdev, +@@ -485,13 +485,24 @@ static int emac_clks_phase1_init(struct platform_device *pdev, ret = clk_prepare_enable(adpt->clk[EMAC_CLK_CFG_AHB]); if (ret) diff --git a/queue/net-stmmac-dwmac1000-provide-multicast-filter-fallba.patch b/queue/net-stmmac-dwmac1000-provide-multicast-filter-fallba.patch index 94f34c05..c2db9217 100644 --- a/queue/net-stmmac-dwmac1000-provide-multicast-filter-fallba.patch +++ b/queue/net-stmmac-dwmac1000-provide-multicast-filter-fallba.patch @@ -1,4 +1,4 @@ -From 29225bac60e5cab9f78b04793b706f0777cdf2cb Mon Sep 17 00:00:00 2001 +From 5de27bcb3a5938a7673615ff784b2c7d634e52ef Mon Sep 17 00:00:00 2001 From: Jonathan McDowell <noodles@earth.li> Date: Wed, 12 Aug 2020 20:37:01 +0100 Subject: [PATCH] net: stmmac: dwmac1000: provide multicast filter fallback @@ -13,6 +13,7 @@ fashion to other drivers with no multicast filter. Cc: stable@vger.kernel.org Signed-off-by: Jonathan McDowell <noodles@earth.li> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c index 81af0f3f5cf9..054e79a36b5a 100644 diff --git a/queue/nfs-Fix-getxattr-kernel-panic-and-memory-overflow.patch b/queue/nfs-Fix-getxattr-kernel-panic-and-memory-overflow.patch index 18cc45ca..b876a295 100644 --- a/queue/nfs-Fix-getxattr-kernel-panic-and-memory-overflow.patch +++ b/queue/nfs-Fix-getxattr-kernel-panic-and-memory-overflow.patch @@ -1,4 +1,4 @@ -From b4487b93545214a9db8cbf32e86411677b0cca21 Mon Sep 17 00:00:00 2001 +From 46eaeb66ceec2c54898915c8717c0a28a5de3bd7 Mon Sep 17 00:00:00 2001 From: Jeffrey Mitchell <jeffrey.mitchell@starlab.io> Date: Wed, 5 Aug 2020 12:23:19 -0500 Subject: [PATCH] nfs: Fix getxattr kernel panic and memory overflow @@ -12,12 +12,13 @@ Fixes: aa9c2669626c ("NFS: Client implementation of Labeled-NFS") Signed-off-by: Jeffrey Mitchell <jeffrey.mitchell@starlab.io> [Trond: clean up duplicate test of label->len != 0] Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c -index 113e0d6dd3d3..5db240688d4e 100644 +index 8db0b66086bd..f3c17c8fb022 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c -@@ -5856,8 +5856,6 @@ static int _nfs4_get_security_label(struct inode *inode, void *buf, +@@ -5729,8 +5729,6 @@ static int _nfs4_get_security_label(struct inode *inode, void *buf, return ret; if (!(fattr.valid & NFS_ATTR_FATTR_V4_SECURITY_LABEL)) return -ENOENT; @@ -27,10 +28,10 @@ index 113e0d6dd3d3..5db240688d4e 100644 } diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c -index 388ac520b104..79018938d6b3 100644 +index 6a92a6eac911..d554baabef3e 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c -@@ -4166,7 +4166,11 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap, +@@ -4163,7 +4163,11 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap, return -EIO; if (len < NFS4_MAXLABELLEN) { if (label) { diff --git a/queue/nfs-ensure-correct-writeback-errors-are-returned-on-.patch b/queue/nfs-ensure-correct-writeback-errors-are-returned-on-.patch index a436b9df..d0d7721a 100644 --- a/queue/nfs-ensure-correct-writeback-errors-are-returned-on-.patch +++ b/queue/nfs-ensure-correct-writeback-errors-are-returned-on-.patch @@ -1,4 +1,4 @@ -From 67dd23f9e6fbaf163431912ef5599c5e0693476c Mon Sep 17 00:00:00 2001 +From a36a0f439231161eca75bc8d3dd8056ca7fe8559 Mon Sep 17 00:00:00 2001 From: Scott Mayhew <smayhew@redhat.com> Date: Sat, 1 Aug 2020 07:10:38 -0400 Subject: [PATCH] nfs: ensure correct writeback errors are returned on close() @@ -17,12 +17,13 @@ Fixes: 6fbda89b257f ("NFS: Replace custom error reporting mechanism with generic one") Signed-off-by: Scott Mayhew <smayhew@redhat.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/nfs/file.c b/fs/nfs/file.c -index ccd6c1637b27..bb244fc39d4b 100644 +index 95dc90570786..348f67c8f322 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c -@@ -141,6 +141,7 @@ static int +@@ -140,6 +140,7 @@ static int nfs_file_flush(struct file *file, fl_owner_t id) { struct inode *inode = file_inode(file); @@ -30,7 +31,7 @@ index ccd6c1637b27..bb244fc39d4b 100644 dprintk("NFS: flush(%pD2)\n", file); -@@ -149,7 +150,9 @@ nfs_file_flush(struct file *file, fl_owner_t id) +@@ -148,7 +149,9 @@ nfs_file_flush(struct file *file, fl_owner_t id) return 0; /* Flush writes to the server and return any errors */ @@ -42,10 +43,10 @@ index ccd6c1637b27..bb244fc39d4b 100644 ssize_t diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c -index 8e5d6223ddd3..a33970765467 100644 +index cec32338562a..f39651196a7e 100644 --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c -@@ -110,6 +110,7 @@ static int +@@ -109,6 +109,7 @@ static int nfs4_file_flush(struct file *file, fl_owner_t id) { struct inode *inode = file_inode(file); @@ -53,7 +54,7 @@ index 8e5d6223ddd3..a33970765467 100644 dprintk("NFS: flush(%pD2)\n", file); -@@ -125,7 +126,9 @@ nfs4_file_flush(struct file *file, fl_owner_t id) +@@ -124,7 +125,9 @@ nfs4_file_flush(struct file *file, fl_owner_t id) return filemap_fdatawrite(file->f_mapping); /* Flush writes to the server and return any errors */ diff --git a/queue/nfs-nfs_file_write-should-check-for-writeback-errors.patch b/queue/nfs-nfs_file_write-should-check-for-writeback-errors.patch index 084fbc99..dd3614d3 100644 --- a/queue/nfs-nfs_file_write-should-check-for-writeback-errors.patch +++ b/queue/nfs-nfs_file_write-should-check-for-writeback-errors.patch @@ -1,4 +1,4 @@ -From ce368536dd614452407dc31e2449eb84681a06af Mon Sep 17 00:00:00 2001 +From d26be718ee5f18739c98b8ffa4c932b943a916a9 Mon Sep 17 00:00:00 2001 From: Scott Mayhew <smayhew@redhat.com> Date: Sat, 1 Aug 2020 07:10:39 -0400 Subject: [PATCH] nfs: nfs_file_write() should check for writeback errors @@ -14,12 +14,13 @@ error reporting functions. Fixes: 6fbda89b257f ("NFS: Replace custom error reporting mechanism with generic one") Signed-off-by: Scott Mayhew <smayhew@redhat.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/nfs/file.c b/fs/nfs/file.c -index bb244fc39d4b..d42657b86d9b 100644 +index 348f67c8f322..387a2cfa7e17 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c -@@ -591,12 +591,14 @@ static const struct vm_operations_struct nfs_file_vm_ops = { +@@ -583,12 +583,14 @@ static const struct vm_operations_struct nfs_file_vm_ops = { .page_mkwrite = nfs_vm_page_mkwrite, }; @@ -36,7 +37,7 @@ index bb244fc39d4b..d42657b86d9b 100644 return 1; return 0; } -@@ -607,6 +609,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) +@@ -599,6 +601,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) struct inode *inode = file_inode(file); unsigned long written = 0; ssize_t result; @@ -45,7 +46,7 @@ index bb244fc39d4b..d42657b86d9b 100644 result = nfs_key_timeout_notify(file, inode); if (result) -@@ -631,6 +635,7 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) +@@ -623,6 +627,7 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) if (iocb->ki_pos > i_size_read(inode)) nfs_revalidate_mapping(inode, file->f_mapping); @@ -53,7 +54,7 @@ index bb244fc39d4b..d42657b86d9b 100644 nfs_start_io_write(inode); result = generic_write_checks(iocb, from); if (result > 0) { -@@ -649,7 +654,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) +@@ -641,7 +646,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) goto out; /* Return error values */ diff --git a/queue/octeontx2-af-change-struct-qmem-entry_sz-from-u8-to-.patch b/queue/octeontx2-af-change-struct-qmem-entry_sz-from-u8-to-.patch index bcf8964d..95af0201 100644 --- a/queue/octeontx2-af-change-struct-qmem-entry_sz-from-u8-to-.patch +++ b/queue/octeontx2-af-change-struct-qmem-entry_sz-from-u8-to-.patch @@ -1,4 +1,4 @@ -From 393415203f5c916b5907e0a7c89f4c2c5a9c5505 Mon Sep 17 00:00:00 2001 +From 0380d8753206f8f7d770b272ba5ce8ca3215ab55 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Wed, 17 Jun 2020 20:53:21 -0700 Subject: [PATCH] octeontx2-af: change (struct qmem)->entry_sz from u8 to u16 @@ -14,9 +14,10 @@ Fixes: 7a37245ef23f ("octeontx2-af: NPA block admin queue init") Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Sunil Goutham <sgoutham@marvell.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/marvell/octeontx2/af/common.h b/drivers/net/ethernet/marvell/octeontx2/af/common.h -index cd33c2e6ca5f..f48eb66ed021 100644 +index e332e82fc066..d82aa27e947d 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/common.h +++ b/drivers/net/ethernet/marvell/octeontx2/af/common.h @@ -43,7 +43,7 @@ struct qmem { diff --git a/queue/openrisc-Fix-oops-caused-when-dumping-stack.patch b/queue/openrisc-Fix-oops-caused-when-dumping-stack.patch index f15b0217..7ae88eea 100644 --- a/queue/openrisc-Fix-oops-caused-when-dumping-stack.patch +++ b/queue/openrisc-Fix-oops-caused-when-dumping-stack.patch @@ -1,4 +1,4 @@ -From 57b8e277c33620e115633cdf700a260b55095460 Mon Sep 17 00:00:00 2001 +From 78dacb356e40e4905cc31d5c5ef3ee16d0c37b59 Mon Sep 17 00:00:00 2001 From: Stafford Horne <shorne@gmail.com> Date: Tue, 16 Jun 2020 06:19:46 +0900 Subject: [PATCH] openrisc: Fix oops caused when dumping stack @@ -45,6 +45,7 @@ the task is not lost while we are walking it's stack. Fixes: eecac38b0423a ("openrisc: support framepointers and STACKTRACE_SUPPORT") Signed-off-by: Stafford Horne <shorne@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/openrisc/kernel/stacktrace.c b/arch/openrisc/kernel/stacktrace.c index 43f140a28bc7..54d38809e22c 100644 diff --git a/queue/orangefs-get-rid-of-knob-code.patch b/queue/orangefs-get-rid-of-knob-code.patch index 74c4c477..b115bc1d 100644 --- a/queue/orangefs-get-rid-of-knob-code.patch +++ b/queue/orangefs-get-rid-of-knob-code.patch @@ -1,4 +1,4 @@ -From ec95f1dedc9c64ac5a8b0bdb7c276936c70fdedd Mon Sep 17 00:00:00 2001 +From f9153e342e7b04acc8c76ff7d086124d9909aef3 Mon Sep 17 00:00:00 2001 From: Mike Marshall <hubcap@omnibond.com> Date: Wed, 8 Apr 2020 08:52:40 -0400 Subject: [PATCH] orangefs: get rid of knob code... @@ -50,12 +50,13 @@ that was in my patch: Signed-off-by: Mike Marshall <hubcap@omnibond.com> Reported-by: kbuild test robot <lkp@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c -index c740159d9ad1..173e6ea57a47 100644 +index a35c17017210..59ec1cb0e158 100644 --- a/fs/orangefs/file.c +++ b/fs/orangefs/file.c -@@ -346,23 +346,8 @@ static ssize_t orangefs_file_read_iter(struct kiocb *iocb, +@@ -313,23 +313,8 @@ static ssize_t orangefs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) { int ret; @@ -79,7 +80,7 @@ index c740159d9ad1..173e6ea57a47 100644 down_read(&file_inode(iocb->ki_filp)->i_rwsem); ret = orangefs_revalidate_mapping(file_inode(iocb->ki_filp)); if (ret) -@@ -650,12 +635,6 @@ static int orangefs_lock(struct file *filp, int cmd, struct file_lock *fl) +@@ -598,12 +583,6 @@ static int orangefs_lock(struct file *filp, int cmd, struct file_lock *fl) return rc; } @@ -92,7 +93,7 @@ index c740159d9ad1..173e6ea57a47 100644 static int orangefs_flush(struct file *file, fl_owner_t id) { /* -@@ -669,9 +648,6 @@ static int orangefs_flush(struct file *file, fl_owner_t id) +@@ -617,9 +596,6 @@ static int orangefs_flush(struct file *file, fl_owner_t id) struct inode *inode = file->f_mapping->host; int r; @@ -102,7 +103,7 @@ index c740159d9ad1..173e6ea57a47 100644 if (inode->i_state & I_DIRTY_TIME) { spin_lock(&inode->i_lock); inode->i_state &= ~I_DIRTY_TIME; -@@ -694,7 +670,7 @@ const struct file_operations orangefs_file_operations = { +@@ -642,7 +618,7 @@ const struct file_operations orangefs_file_operations = { .lock = orangefs_lock, .unlocked_ioctl = orangefs_ioctl, .mmap = orangefs_file_mmap, @@ -112,7 +113,7 @@ index c740159d9ad1..173e6ea57a47 100644 .release = orangefs_file_release, .fsync = orangefs_fsync, diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c -index 961c0fd8675a..12ae630fbed7 100644 +index 0c337d8bdaab..c9b3e5ec8221 100644 --- a/fs/orangefs/inode.c +++ b/fs/orangefs/inode.c @@ -259,46 +259,19 @@ static int orangefs_readpage(struct file *file, struct page *page) @@ -169,7 +170,7 @@ index 961c0fd8675a..12ae630fbed7 100644 if (PageDirty(page)) orangefs_launder_page(page); diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h -index ed67f39fa7ce..e12aeb9623d6 100644 +index 572dd29fbd54..884cdf134f3e 100644 --- a/fs/orangefs/orangefs-kernel.h +++ b/fs/orangefs/orangefs-kernel.h @@ -239,10 +239,6 @@ struct orangefs_write_range { diff --git a/queue/perf-bench-mem-Always-memset-source-before-memcpy.patch b/queue/perf-bench-mem-Always-memset-source-before-memcpy.patch index 5388f575..2d887639 100644 --- a/queue/perf-bench-mem-Always-memset-source-before-memcpy.patch +++ b/queue/perf-bench-mem-Always-memset-source-before-memcpy.patch @@ -1,4 +1,4 @@ -From 1beaef29c34154ccdcb3f1ae557f6883eda18840 Mon Sep 17 00:00:00 2001 +From c5e5c20e9088a442630a2ced4c183a879a4cdf2a Mon Sep 17 00:00:00 2001 From: Vincent Whitchurch <vincent.whitchurch@axis.com> Date: Mon, 10 Aug 2020 15:34:04 +0200 Subject: [PATCH] perf bench mem: Always memset source before memcpy @@ -46,12 +46,13 @@ Cc: Peter Zijlstra <peterz@infradead.org> Cc: kernel@axis.com Link: http://lore.kernel.org/lkml/20200810133404.30829-1-vincent.whitchurch@axis.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/tools/perf/bench/mem-functions.c b/tools/perf/bench/mem-functions.c -index 9235b76501be..19d45c377ac1 100644 +index 0251dd348124..4864fc67d01b 100644 --- a/tools/perf/bench/mem-functions.c +++ b/tools/perf/bench/mem-functions.c -@@ -223,12 +223,8 @@ static int bench_mem_common(int argc, const char **argv, struct bench_mem_info * +@@ -222,12 +222,8 @@ static int bench_mem_common(int argc, const char **argv, struct bench_mem_info * return 0; } @@ -65,7 +66,7 @@ index 9235b76501be..19d45c377ac1 100644 /* Make sure to always prefault zero pages even if MMAP_THRESH is crossed: */ memset(src, 0, size); -@@ -237,6 +233,15 @@ static u64 do_memcpy_cycles(const struct function *r, size_t size, void *src, vo +@@ -236,6 +232,15 @@ static u64 do_memcpy_cycles(const struct function *r, size_t size, void *src, vo * to not measure page fault overhead: */ fn(dst, src, size); @@ -81,7 +82,7 @@ index 9235b76501be..19d45c377ac1 100644 cycle_start = get_cycles(); for (i = 0; i < nr_loops; ++i) -@@ -252,11 +257,7 @@ static double do_memcpy_gettimeofday(const struct function *r, size_t size, void +@@ -251,11 +256,7 @@ static double do_memcpy_gettimeofday(const struct function *r, size_t size, void memcpy_t fn = r->fn.memcpy; int i; diff --git a/queue/perf-intel-pt-Fix-FUP-packet-state.patch b/queue/perf-intel-pt-Fix-FUP-packet-state.patch index fd1a110f..9466bc98 100644 --- a/queue/perf-intel-pt-Fix-FUP-packet-state.patch +++ b/queue/perf-intel-pt-Fix-FUP-packet-state.patch @@ -1,4 +1,4 @@ -From 401136bb084fd021acd9f8c51b52fe0a25e326b2 Mon Sep 17 00:00:00 2001 +From d4b81362e4cad523670accc02a2cee55b9f9f4b2 Mon Sep 17 00:00:00 2001 From: Adrian Hunter <adrian.hunter@intel.com> Date: Fri, 10 Jul 2020 18:10:53 +0300 Subject: [PATCH] perf intel-pt: Fix FUP packet state @@ -16,12 +16,13 @@ Cc: Jiri Olsa <jolsa@redhat.com> Cc: stable@vger.kernel.org Link: http://lore.kernel.org/lkml/20200710151104.15137-2-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c -index f8ccfd6be0ee..75c4bd74d521 100644 +index 9d189e90fbdc..b030de6eb546 100644 --- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c -@@ -1164,6 +1164,7 @@ static int intel_pt_walk_fup(struct intel_pt_decoder *decoder) +@@ -1120,6 +1120,7 @@ static int intel_pt_walk_fup(struct intel_pt_decoder *decoder) return 0; if (err == -EAGAIN || intel_pt_fup_with_nlip(decoder, &intel_pt_insn, ip, err)) { @@ -29,7 +30,7 @@ index f8ccfd6be0ee..75c4bd74d521 100644 if (intel_pt_fup_event(decoder)) return 0; return -EAGAIN; -@@ -1942,17 +1943,13 @@ next: +@@ -1783,17 +1784,13 @@ static int intel_pt_walk_trace(struct intel_pt_decoder *decoder) } if (decoder->set_fup_mwait) no_tip = true; @@ -53,7 +54,7 @@ index f8ccfd6be0ee..75c4bd74d521 100644 if (no_tip) { no_tip = false; break; -@@ -2599,15 +2596,11 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder) +@@ -2382,15 +2379,11 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder) err = intel_pt_walk_tip(decoder); break; case INTEL_PT_STATE_FUP: diff --git a/queue/pinctrl-ingenic-Enhance-support-for-IRQ_TYPE_EDGE_BO.patch b/queue/pinctrl-ingenic-Enhance-support-for-IRQ_TYPE_EDGE_BO.patch index a1da43e1..bdb38c77 100644 --- a/queue/pinctrl-ingenic-Enhance-support-for-IRQ_TYPE_EDGE_BO.patch +++ b/queue/pinctrl-ingenic-Enhance-support-for-IRQ_TYPE_EDGE_BO.patch @@ -1,4 +1,4 @@ -From c5bccccf0ed9c3f515416f49500a215a93a38ef3 Mon Sep 17 00:00:00 2001 +From 6f4b8b3b817e2c93a6e934a31564ee75ad905449 Mon Sep 17 00:00:00 2001 From: Paul Cercueil <paul@crapouillou.net> Date: Mon, 22 Jun 2020 23:45:47 +0200 Subject: [PATCH] pinctrl: ingenic: Enhance support for IRQ_TYPE_EDGE_BOTH @@ -35,6 +35,7 @@ Tested-by: João Henrique <johnnyonflame@hotmail.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20200622214548.265417-1-paul@crapouillou.net Signed-off-by: Linus Walleij <linus.walleij@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c index c8ef3b91a730..0e95c247def6 100644 diff --git a/queue/powerpc-Allow-4224-bytes-of-stack-expansion-for-the-.patch b/queue/powerpc-Allow-4224-bytes-of-stack-expansion-for-the-.patch index b34a8f6c..0832eca8 100644 --- a/queue/powerpc-Allow-4224-bytes-of-stack-expansion-for-the-.patch +++ b/queue/powerpc-Allow-4224-bytes-of-stack-expansion-for-the-.patch @@ -1,4 +1,4 @@ -From 63dee5df43a31f3844efabc58972f0a206ca4534 Mon Sep 17 00:00:00 2001 +From 488dbfede34f9427649990dcc3e5429c5f90b7f4 Mon Sep 17 00:00:00 2001 From: Michael Ellerman <mpe@ellerman.id.au> Date: Fri, 24 Jul 2020 19:25:25 +1000 Subject: [PATCH] powerpc: Allow 4224 bytes of stack expansion for the signal @@ -145,12 +145,13 @@ Reported-by: Tom Lane <tgl@sss.pgh.pa.us> Tested-by: Daniel Axtens <dja@axtens.net> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200724092528.1578671-2-mpe@ellerman.id.au +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c -index 641fc5f3d7dd..3ebb1792e636 100644 +index f71c0987eaa9..74b3a03a578e 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c -@@ -267,6 +267,9 @@ static bool bad_kernel_fault(struct pt_regs *regs, unsigned long error_code, +@@ -262,6 +262,9 @@ static bool bad_kernel_fault(struct pt_regs *regs, unsigned long error_code, return false; } @@ -160,7 +161,7 @@ index 641fc5f3d7dd..3ebb1792e636 100644 static bool bad_stack_expansion(struct pt_regs *regs, unsigned long address, struct vm_area_struct *vma, unsigned int flags, bool *must_retry) -@@ -274,7 +277,7 @@ static bool bad_stack_expansion(struct pt_regs *regs, unsigned long address, +@@ -269,7 +272,7 @@ static bool bad_stack_expansion(struct pt_regs *regs, unsigned long address, /* * N.B. The POWER/Open ABI allows programs to access up to * 288 bytes below the stack pointer. @@ -169,7 +170,7 @@ index 641fc5f3d7dd..3ebb1792e636 100644 * below the stack pointer (r1) before decrementing it. * The exec code can write slightly over 640kB to the stack * before setting the user r1. Thus we allow the stack to -@@ -299,7 +302,7 @@ static bool bad_stack_expansion(struct pt_regs *regs, unsigned long address, +@@ -294,7 +297,7 @@ static bool bad_stack_expansion(struct pt_regs *regs, unsigned long address, * between the last mapped region and the stack will * expand the stack rather than segfaulting. */ diff --git a/queue/pseries-Fix-64-bit-logical-memory-block-panic.patch b/queue/pseries-Fix-64-bit-logical-memory-block-panic.patch index f38ea77f..92721dea 100644 --- a/queue/pseries-Fix-64-bit-logical-memory-block-panic.patch +++ b/queue/pseries-Fix-64-bit-logical-memory-block-panic.patch @@ -1,4 +1,4 @@ -From 89c140bbaeee7a55ed0360a88f294ead2b95201b Mon Sep 17 00:00:00 2001 +From 94c10f7eabca1f595ff3ee038b411498f5733359 Mon Sep 17 00:00:00 2001 From: Anton Blanchard <anton@ozlabs.org> Date: Wed, 15 Jul 2020 10:08:20 +1000 Subject: [PATCH] pseries: Fix 64 bit logical memory block panic @@ -16,12 +16,13 @@ Cc: stable@vger.kernel.org Signed-off-by: Anton Blanchard <anton@ozlabs.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200715000820.1255764-1-anton@ozlabs.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c -index 73a5dcd977e1..5d545b78111f 100644 +index 65aaa971dc99..c5de633e8436 100644 --- a/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c -@@ -25,7 +25,7 @@ +@@ -27,7 +27,7 @@ static bool rtas_hp_event; unsigned long pseries_memory_block_size(void) { struct device_node *np; diff --git a/queue/pwm-bcm-iproc-handle-clk_get_rate-return.patch b/queue/pwm-bcm-iproc-handle-clk_get_rate-return.patch index b80ed36b..0e61aeca 100644 --- a/queue/pwm-bcm-iproc-handle-clk_get_rate-return.patch +++ b/queue/pwm-bcm-iproc-handle-clk_get_rate-return.patch @@ -1,4 +1,4 @@ -From 6ced5ff0be8e94871ba846dfbddf69d21363f3d7 Mon Sep 17 00:00:00 2001 +From 3d5364660df376deae43e92dff7b96c574a3b5dd Mon Sep 17 00:00:00 2001 From: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com> Date: Fri, 17 Jul 2020 21:46:06 -0700 Subject: [PATCH] pwm: bcm-iproc: handle clk_get_rate() return @@ -16,9 +16,10 @@ Signed-off-by: Scott Branden <scott.branden@broadcom.com> Reviewed-by: Ray Jui <ray.jui@broadcom.com> Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Thierry Reding <thierry.reding@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pwm/pwm-bcm-iproc.c b/drivers/pwm/pwm-bcm-iproc.c -index 46f0a45e9049..79b1e58e946d 100644 +index 31b01035d0ab..8cfba3614e60 100644 --- a/drivers/pwm/pwm-bcm-iproc.c +++ b/drivers/pwm/pwm-bcm-iproc.c @@ -85,8 +85,6 @@ static void iproc_pwmc_get_state(struct pwm_chip *chip, struct pwm_device *pwm, diff --git a/queue/rbd-require-global-CAP_SYS_ADMIN-for-mapping-and-unm.patch b/queue/rbd-require-global-CAP_SYS_ADMIN-for-mapping-and-unm.patch index 9fc4910b..b0a425e1 100644 --- a/queue/rbd-require-global-CAP_SYS_ADMIN-for-mapping-and-unm.patch +++ b/queue/rbd-require-global-CAP_SYS_ADMIN-for-mapping-and-unm.patch @@ -1,4 +1,4 @@ -From f44d04e696feaf13d192d942c4f14ad2e117065a Mon Sep 17 00:00:00 2001 +From 43100ba9c0079834c3c5894eff547212c6ed3bd1 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov <idryomov@gmail.com> Date: Thu, 3 Sep 2020 13:24:11 +0200 Subject: [PATCH] rbd: require global CAP_SYS_ADMIN for mapping and unmapping @@ -27,12 +27,13 @@ the image header. Cc: stable@vger.kernel.org Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Reviewed-by: Jeff Layton <jlayton@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c -index 011539039693..e77eaab5cf23 100644 +index 8c79e65267a3..fa49b2a0dba2 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c -@@ -5120,6 +5120,9 @@ static ssize_t rbd_config_info_show(struct device *dev, +@@ -4305,6 +4305,9 @@ static ssize_t rbd_config_info_show(struct device *dev, { struct rbd_device *rbd_dev = dev_to_rbd_dev(dev); @@ -42,7 +43,7 @@ index 011539039693..e77eaab5cf23 100644 return sprintf(buf, "%s\n", rbd_dev->config_info); } -@@ -5231,6 +5234,9 @@ static ssize_t rbd_image_refresh(struct device *dev, +@@ -4416,6 +4419,9 @@ static ssize_t rbd_image_refresh(struct device *dev, struct rbd_device *rbd_dev = dev_to_rbd_dev(dev); int ret; @@ -52,7 +53,7 @@ index 011539039693..e77eaab5cf23 100644 ret = rbd_dev_refresh(rbd_dev); if (ret) return ret; -@@ -7059,6 +7065,9 @@ static ssize_t do_rbd_add(struct bus_type *bus, +@@ -6012,6 +6018,9 @@ static ssize_t do_rbd_add(struct bus_type *bus, struct rbd_client *rbdc; int rc; @@ -62,7 +63,7 @@ index 011539039693..e77eaab5cf23 100644 if (!try_module_get(THIS_MODULE)) return -ENODEV; -@@ -7209,6 +7218,9 @@ static ssize_t do_rbd_remove(struct bus_type *bus, +@@ -6167,6 +6176,9 @@ static ssize_t do_rbd_remove(struct bus_type *bus, bool force = false; int ret; diff --git a/queue/regulator-core-make-regulator_register-EPROBE_DEFER-.patch b/queue/regulator-core-make-regulator_register-EPROBE_DEFER-.patch index 7b4e2b3b..0b365c26 100644 --- a/queue/regulator-core-make-regulator_register-EPROBE_DEFER-.patch +++ b/queue/regulator-core-make-regulator_register-EPROBE_DEFER-.patch @@ -1,4 +1,4 @@ -From f8970d341eec73c976a3462b9ecdb02b60b84dd6 Mon Sep 17 00:00:00 2001 +From 2a32999e444a243f7c4fdbe30e7f054861bcabeb Mon Sep 17 00:00:00 2001 From: Marco Felsch <m.felsch@pengutronix.de> Date: Tue, 17 Sep 2019 17:40:21 +0200 Subject: [PATCH] regulator: core: make regulator_register() EPROBE_DEFER aware @@ -13,12 +13,13 @@ EPROBE_DEFER in such cases. Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> Link: https://lore.kernel.org/r/20190917154021.14693-4-m.felsch@pengutronix.de Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c -index afe94470b67f..a46be221dbdc 100644 +index 997e25a315f7..8f321d22916d 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c -@@ -5053,6 +5053,19 @@ regulator_register(const struct regulator_desc *regulator_desc, +@@ -4989,6 +4989,19 @@ regulator_register(const struct regulator_desc *regulator_desc, init_data = regulator_of_get_init_data(dev, regulator_desc, config, &rdev->dev.of_node); @@ -39,10 +40,10 @@ index afe94470b67f..a46be221dbdc 100644 * We need to keep track of any GPIO descriptor coming from the * device tree until we have handled it over to the core. If the diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c -index 38dd06fbab38..ef7198b76e50 100644 +index 921afd116f43..d0c2aecd2734 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c -@@ -445,11 +445,20 @@ struct regulator_init_data *regulator_of_get_init_data(struct device *dev, +@@ -443,11 +443,20 @@ struct regulator_init_data *regulator_of_get_init_data(struct device *dev, goto error; } diff --git a/queue/regulator-plug-of_node-leak-in-regulator_register-s-.patch b/queue/regulator-plug-of_node-leak-in-regulator_register-s-.patch index 3c0abad8..2d756eb5 100644 --- a/queue/regulator-plug-of_node-leak-in-regulator_register-s-.patch +++ b/queue/regulator-plug-of_node-leak-in-regulator_register-s-.patch @@ -1,4 +1,4 @@ -From d3c731564e09b6c2ebefcd1344743a91a237d6dc Mon Sep 17 00:00:00 2001 +From ecb3696b0f5563e6533bb9d3559c1dc54c7a425b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <mirq-linux@rere.qmqm.pl> Date: Wed, 12 Aug 2020 03:31:36 +0200 Subject: [PATCH] regulator: plug of_node leak in regulator_register()'s error @@ -20,12 +20,13 @@ Acked-by: Vladimir Zapolskiy <vz@mleia.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/f5035b1b4d40745e66bacd571bbbb5e4644d21a1.1597195321.git.mirq-linux@rere.qmqm.pl Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c -index 9f4944dad3a1..1561f7555fc6 100644 +index 8f321d22916d..dbc4a90c6c4b 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c -@@ -5167,6 +5167,7 @@ regulator_register(const struct regulator_desc *regulator_desc, +@@ -4975,6 +4975,7 @@ regulator_register(const struct regulator_desc *regulator_desc, ret = -ENOMEM; goto rinse; } @@ -33,7 +34,7 @@ index 9f4944dad3a1..1561f7555fc6 100644 /* * Duplicate the config so the driver could override it after -@@ -5174,9 +5175,8 @@ regulator_register(const struct regulator_desc *regulator_desc, +@@ -4982,9 +4983,8 @@ regulator_register(const struct regulator_desc *regulator_desc, */ config = kmemdup(cfg, sizeof(*cfg), GFP_KERNEL); if (config == NULL) { @@ -44,7 +45,7 @@ index 9f4944dad3a1..1561f7555fc6 100644 } init_data = regulator_of_get_init_data(dev, regulator_desc, config, -@@ -5188,10 +5188,8 @@ regulator_register(const struct regulator_desc *regulator_desc, +@@ -4996,10 +4996,8 @@ regulator_register(const struct regulator_desc *regulator_desc, * from a gpio extender or something else. */ if (PTR_ERR(init_data) == -EPROBE_DEFER) { @@ -56,7 +57,7 @@ index 9f4944dad3a1..1561f7555fc6 100644 } /* -@@ -5244,7 +5242,6 @@ regulator_register(const struct regulator_desc *regulator_desc, +@@ -5054,7 +5052,6 @@ regulator_register(const struct regulator_desc *regulator_desc, } /* register with sysfs */ @@ -64,7 +65,7 @@ index 9f4944dad3a1..1561f7555fc6 100644 rdev->dev.class = ®ulator_class; rdev->dev.parent = dev; dev_set_name(&rdev->dev, "regulator.%lu", -@@ -5322,13 +5319,11 @@ regulator_register(const struct regulator_desc *regulator_desc, +@@ -5137,13 +5134,11 @@ regulator_register(const struct regulator_desc *regulator_desc, mutex_lock(®ulator_list_mutex); regulator_ena_gpio_free(rdev); mutex_unlock(®ulator_list_mutex); diff --git a/queue/regulator-push-allocation-in-regulator_init_coupling.patch b/queue/regulator-push-allocation-in-regulator_init_coupling.patch index 00537ae7..3268726b 100644 --- a/queue/regulator-push-allocation-in-regulator_init_coupling.patch +++ b/queue/regulator-push-allocation-in-regulator_init_coupling.patch @@ -1,4 +1,4 @@ -From 73a32129f8ccb556704a26b422f54e048bf14bd0 Mon Sep 17 00:00:00 2001 +From 5a684f1a47bd64cc5bd9918c1e2db253b6bb26d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <mirq-linux@rere.qmqm.pl> Date: Wed, 12 Aug 2020 03:31:34 +0200 Subject: [PATCH] regulator: push allocation in regulator_init_coupling() @@ -56,12 +56,13 @@ Reviewed-by: Dmitry Osipenko <digetx@gmail.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/1a889cf7f61c6429c9e6b34ddcdde99be77a26b6.1597195321.git.mirq-linux@rere.qmqm.pl Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c -index 75ff7c563c5d..513f95c6f837 100644 +index dbc4a90c6c4b..cb5f33b97082 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c -@@ -5040,7 +5040,10 @@ static int regulator_init_coupling(struct regulator_dev *rdev) +@@ -4880,7 +4880,10 @@ static int regulator_init_coupling(struct regulator_dev *rdev) if (!of_check_coupling_data(rdev)) return -EPERM; @@ -72,7 +73,7 @@ index 75ff7c563c5d..513f95c6f837 100644 if (IS_ERR(rdev->coupling_desc.coupler)) { err = PTR_ERR(rdev->coupling_desc.coupler); rdev_err(rdev, "failed to get coupler: %d\n", err); -@@ -5248,9 +5251,7 @@ regulator_register(const struct regulator_desc *regulator_desc, +@@ -5079,9 +5082,7 @@ regulator_register(const struct regulator_desc *regulator_desc, if (ret < 0) goto wash; diff --git a/queue/remoteproc-qcom-q6v5-Update-running-state-before-req.patch b/queue/remoteproc-qcom-q6v5-Update-running-state-before-req.patch index 1934e962..b1900487 100644 --- a/queue/remoteproc-qcom-q6v5-Update-running-state-before-req.patch +++ b/queue/remoteproc-qcom-q6v5-Update-running-state-before-req.patch @@ -1,4 +1,4 @@ -From 5b7be880074c73540948f8fc597e0407b98fabfa Mon Sep 17 00:00:00 2001 +From 98a70b0520ec9e85a1874515d1ae310e0b3b00b9 Mon Sep 17 00:00:00 2001 From: Sibi Sankar <sibis@codeaurora.org> Date: Tue, 2 Jun 2020 22:02:56 +0530 Subject: [PATCH] remoteproc: qcom: q6v5: Update running state before @@ -24,12 +24,13 @@ Cc: stable@vger.kernel.org Signed-off-by: Sibi Sankar <sibis@codeaurora.org> Link: https://lore.kernel.org/r/20200602163257.26978-1-sibis@codeaurora.org Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/remoteproc/qcom_q6v5.c b/drivers/remoteproc/qcom_q6v5.c -index 111a442c993c..fd6fd36268d9 100644 +index 0d33e3079f0d..ef61cb709acd 100644 --- a/drivers/remoteproc/qcom_q6v5.c +++ b/drivers/remoteproc/qcom_q6v5.c -@@ -153,6 +153,8 @@ int qcom_q6v5_request_stop(struct qcom_q6v5 *q6v5) +@@ -151,6 +151,8 @@ int qcom_q6v5_request_stop(struct qcom_q6v5 *q6v5) { int ret; diff --git a/queue/remoteproc-qcom_q6v5_mss-Validate-MBA-firmware-size-.patch b/queue/remoteproc-qcom_q6v5_mss-Validate-MBA-firmware-size-.patch index f738d4d3..c9f1495c 100644 --- a/queue/remoteproc-qcom_q6v5_mss-Validate-MBA-firmware-size-.patch +++ b/queue/remoteproc-qcom_q6v5_mss-Validate-MBA-firmware-size-.patch @@ -1,4 +1,4 @@ -From e013f455d95add874f310dc47c608e8c70692ae5 Mon Sep 17 00:00:00 2001 +From e1c4d253497a7622f9528580b460fab3228044d9 Mon Sep 17 00:00:00 2001 From: Sibi Sankar <sibis@codeaurora.org> Date: Thu, 23 Jul 2020 01:40:45 +0530 Subject: [PATCH] remoteproc: qcom_q6v5_mss: Validate MBA firmware size before @@ -36,12 +36,13 @@ Cc: stable@vger.kernel.org Signed-off-by: Sibi Sankar <sibis@codeaurora.org> Link: https://lore.kernel.org/r/20200722201047.12975-2-sibis@codeaurora.org Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c -index 03d7f3d702b3..7826f229957d 100644 +index 99c7efb1f398..8f98534404de 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c -@@ -411,6 +411,12 @@ static int q6v5_load(struct rproc *rproc, const struct firmware *fw) +@@ -381,6 +381,12 @@ static int q6v5_load(struct rproc *rproc, const struct firmware *fw) { struct q6v5 *qproc = rproc->priv; diff --git a/queue/remoteproc-qcom_q6v5_mss-Validate-modem-blob-firmwar.patch b/queue/remoteproc-qcom_q6v5_mss-Validate-modem-blob-firmwar.patch index 4024d722..4e78a9e2 100644 --- a/queue/remoteproc-qcom_q6v5_mss-Validate-modem-blob-firmwar.patch +++ b/queue/remoteproc-qcom_q6v5_mss-Validate-modem-blob-firmwar.patch @@ -1,4 +1,4 @@ -From 135b9e8d1cd8ba5ac9ad9bcf24b464b7b052e5b8 Mon Sep 17 00:00:00 2001 +From a6616db4967f75e3dbe22ab656fc96ca2c893fe7 Mon Sep 17 00:00:00 2001 From: Sibi Sankar <sibis@codeaurora.org> Date: Thu, 23 Jul 2020 01:40:46 +0530 Subject: [PATCH] remoteproc: qcom_q6v5_mss: Validate modem blob firmware size @@ -32,12 +32,13 @@ Cc: stable@vger.kernel.org Signed-off-by: Sibi Sankar <sibis@codeaurora.org> Link: https://lore.kernel.org/r/20200722201047.12975-3-sibis@codeaurora.org Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c -index 7826f229957d..8199d9f59209 100644 +index 8f98534404de..abdef10eadec 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c -@@ -1173,15 +1173,14 @@ static int q6v5_mpss_load(struct q6v5 *qproc) +@@ -1034,15 +1034,14 @@ static int q6v5_mpss_load(struct q6v5 *qproc) } else if (phdr->p_filesz) { /* Replace "xxx.xxx" with "xxx.bxx" */ sprintf(fw_name + fw_name_len - 3, "b%02d", i); diff --git a/queue/rxrpc-Make-rxrpc_kernel_get_srtt-indicate-validity.patch b/queue/rxrpc-Make-rxrpc_kernel_get_srtt-indicate-validity.patch index a0b99d01..002a0b3b 100644 --- a/queue/rxrpc-Make-rxrpc_kernel_get_srtt-indicate-validity.patch +++ b/queue/rxrpc-Make-rxrpc_kernel_get_srtt-indicate-validity.patch @@ -1,4 +1,4 @@ -From 73bfb5deec10215370e33d6b459f0ce0a76055e8 Mon Sep 17 00:00:00 2001 +From 7952ab380f296e782076410965a976479f252737 Mon Sep 17 00:00:00 2001 From: David Howells <dhowells@redhat.com> Date: Thu, 20 Aug 2020 15:13:00 +0100 Subject: [PATCH] rxrpc: Make rxrpc_kernel_get_srtt() indicate validity @@ -11,6 +11,7 @@ useful. Fixes: c410bf01933e ("rxrpc: Fix the excessive initial retransmission timeout") Signed-off-by: David Howells <dhowells@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/afs/fs_probe.c b/fs/afs/fs_probe.c index 02e976ca5732..51ee3dd79700 100644 diff --git a/queue/scsi-lpfc-nvmet-Avoid-hang-use-after-free-again-when.patch b/queue/scsi-lpfc-nvmet-Avoid-hang-use-after-free-again-when.patch index 355f7321..080a9e92 100644 --- a/queue/scsi-lpfc-nvmet-Avoid-hang-use-after-free-again-when.patch +++ b/queue/scsi-lpfc-nvmet-Avoid-hang-use-after-free-again-when.patch @@ -1,4 +1,4 @@ -From b81306bd347f0a9ed2442277386b9c729623395e Mon Sep 17 00:00:00 2001 +From b62d98c290d56278cde6c8e1eb0993889f0e5c30 Mon Sep 17 00:00:00 2001 From: "Ewan D. Milne" <emilne@redhat.com> Date: Wed, 29 Jul 2020 19:10:11 -0400 Subject: [PATCH] scsi: lpfc: nvmet: Avoid hang / use-after-free again when @@ -23,6 +23,7 @@ Fixes: 2a0fb340fcc8 ("scsi: lpfc: Correct localport timeout duration error") Reviewed-by: James Smart <james.smart@broadcom.com> Signed-off-by: Ewan D. Milne <emilne@redhat.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c index d74bfd264495..8a93dfa79297 100644 diff --git a/queue/selftests-powerpc-ptrace-pkey-Don-t-update-expected-.patch b/queue/selftests-powerpc-ptrace-pkey-Don-t-update-expected-.patch index 924f3cd9..6a3c4d62 100644 --- a/queue/selftests-powerpc-ptrace-pkey-Don-t-update-expected-.patch +++ b/queue/selftests-powerpc-ptrace-pkey-Don-t-update-expected-.patch @@ -1,4 +1,4 @@ -From 3563b9bea0ca7f53e4218b5e268550341a49f333 Mon Sep 17 00:00:00 2001 +From 4f66ed3762232ce7b54a9fe449d1f7fe0969d411 Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> Date: Thu, 9 Jul 2020 08:59:45 +0530 Subject: [PATCH] selftests/powerpc: ptrace-pkey: Don't update expected UAMOR @@ -14,9 +14,10 @@ Fixes: 4a4a5e5d2aad ("powerpc/pkeys: key allocation/deallocation must not change Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200709032946.881753-23-aneesh.kumar@linux.ibm.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c b/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c -index 80dc5085a412..bc454f899124 100644 +index bc33d748d95b..3694613f418f 100644 --- a/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c +++ b/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c @@ -101,15 +101,20 @@ static int child(struct shared_info *info) diff --git a/queue/selftests-powerpc-ptrace-pkey-Rename-variables-to-ma.patch b/queue/selftests-powerpc-ptrace-pkey-Rename-variables-to-ma.patch index 95a936ff..1f45d9e1 100644 --- a/queue/selftests-powerpc-ptrace-pkey-Rename-variables-to-ma.patch +++ b/queue/selftests-powerpc-ptrace-pkey-Rename-variables-to-ma.patch @@ -1,4 +1,4 @@ -From 9a11f12e0a6c374b3ef1ce81e32ce477d28eb1b8 Mon Sep 17 00:00:00 2001 +From b1f13f063b78041acd0978e41a76714524f6062c Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> Date: Thu, 9 Jul 2020 08:59:43 +0530 Subject: [PATCH] selftests/powerpc: ptrace-pkey: Rename variables to make it @@ -12,9 +12,10 @@ use to test ptrace update of pkeys. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200709032946.881753-21-aneesh.kumar@linux.ibm.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c b/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c -index 904c04f8c919..a32a8034f956 100644 +index bdbbbe8431e0..f9216c7a1829 100644 --- a/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c +++ b/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c @@ -44,7 +44,7 @@ struct shared_info { diff --git a/queue/selftests-powerpc-ptrace-pkey-Update-the-test-to-mar.patch b/queue/selftests-powerpc-ptrace-pkey-Update-the-test-to-mar.patch index 9e3717d7..e1ca6fe8 100644 --- a/queue/selftests-powerpc-ptrace-pkey-Update-the-test-to-mar.patch +++ b/queue/selftests-powerpc-ptrace-pkey-Update-the-test-to-mar.patch @@ -1,4 +1,4 @@ -From 0eaa3b5ca7b5a76e3783639c828498343be66a01 Mon Sep 17 00:00:00 2001 +From cf53a7e7c34c226db5d789ddea7ade2018bab9f0 Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> Date: Thu, 9 Jul 2020 08:59:44 +0530 Subject: [PATCH] selftests/powerpc: ptrace-pkey: Update the test to mark an @@ -9,9 +9,10 @@ commit 0eaa3b5ca7b5a76e3783639c828498343be66a01 upstream. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200709032946.881753-22-aneesh.kumar@linux.ibm.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c b/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c -index a32a8034f956..80dc5085a412 100644 +index f9216c7a1829..bc33d748d95b 100644 --- a/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c +++ b/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c @@ -66,11 +66,6 @@ static int sys_pkey_alloc(unsigned long flags, unsigned long init_access_rights) diff --git a/queue/selftests-timers-Turn-off-timeout-setting.patch b/queue/selftests-timers-Turn-off-timeout-setting.patch index 69e64f87..7bda317c 100644 --- a/queue/selftests-timers-Turn-off-timeout-setting.patch +++ b/queue/selftests-timers-Turn-off-timeout-setting.patch @@ -1,4 +1,4 @@ -From 5c1e4f7e9e49b6925b1fb5c507d2c614f3edb292 Mon Sep 17 00:00:00 2001 +From 498a33a4d867d958a535f3499d20d8ce41fb7a2f Mon Sep 17 00:00:00 2001 From: Po-Hsu Lin <po-hsu.lin@canonical.com> Date: Wed, 18 Mar 2020 10:42:15 +0800 Subject: [PATCH] selftests/timers: Turn off timeout setting @@ -31,6 +31,7 @@ Fixes: 852c8cbf34d3 ("selftests/kselftest/runner.sh: Add 45 second timeout per t Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com> Acked-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/tools/testing/selftests/timers/Makefile b/tools/testing/selftests/timers/Makefile index 7656c7ce79d9..0e73a16874c4 100644 diff --git a/queue/sh-landisk-Add-missing-initialization-of-sh_io_port_.patch b/queue/sh-landisk-Add-missing-initialization-of-sh_io_port_.patch index eb96ec3d..e25f0bb5 100644 --- a/queue/sh-landisk-Add-missing-initialization-of-sh_io_port_.patch +++ b/queue/sh-landisk-Add-missing-initialization-of-sh_io_port_.patch @@ -1,4 +1,4 @@ -From 0c64a0dce51faa9c706fdf1f957d6f19878f4b81 Mon Sep 17 00:00:00 2001 +From 8be5ca5f27348d089c4c5b333f201769ae432d80 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven <geert+renesas@glider.be> Date: Fri, 14 Aug 2020 14:42:45 +0200 Subject: [PATCH] sh: landisk: Add missing initialization of sh_io_port_base @@ -19,6 +19,7 @@ Fix this by setting sh_io_port_base to zero. Fixes: 37b7a97884ba64bf ("sh: machvec IO death.") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Rich Felker <dalias@libc.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/sh/boards/mach-landisk/setup.c b/arch/sh/boards/mach-landisk/setup.c index 16b4d8b0bb85..2c44b94f82fb 100644 diff --git a/queue/smb3-warn-on-confusing-error-scenario-with-sec-krb5.patch b/queue/smb3-warn-on-confusing-error-scenario-with-sec-krb5.patch index 44891c9f..346b5667 100644 --- a/queue/smb3-warn-on-confusing-error-scenario-with-sec-krb5.patch +++ b/queue/smb3-warn-on-confusing-error-scenario-with-sec-krb5.patch @@ -1,4 +1,4 @@ -From 0a018944eee913962bce8ffebbb121960d5125d9 Mon Sep 17 00:00:00 2001 +From 9d4105aeba2fc0e33099668334589dd997cc89aa Mon Sep 17 00:00:00 2001 From: Steve French <stfrench@microsoft.com> Date: Thu, 16 Jul 2020 00:34:21 -0500 Subject: [PATCH] smb3: warn on confusing error scenario with sec=krb5 @@ -14,12 +14,13 @@ why mount failed in those two cases. CC: Stable <stable@vger.kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c -index 2f4cdd290c46..492688764004 100644 +index bfc8a7d38a8b..78f4cd690dc2 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c -@@ -1387,6 +1387,8 @@ SMB2_auth_kerberos(struct SMB2_sess_data *sess_data) +@@ -1298,6 +1298,8 @@ SMB2_auth_kerberos(struct SMB2_sess_data *sess_data) spnego_key = cifs_get_spnego_key(ses); if (IS_ERR(spnego_key)) { rc = PTR_ERR(spnego_key); diff --git a/queue/staging-wlan-ng-fix-out-of-bounds-read-in-prism2sta_.patch b/queue/staging-wlan-ng-fix-out-of-bounds-read-in-prism2sta_.patch index 982f4f86..3ae706bd 100644 --- a/queue/staging-wlan-ng-fix-out-of-bounds-read-in-prism2sta_.patch +++ b/queue/staging-wlan-ng-fix-out-of-bounds-read-in-prism2sta_.patch @@ -1,4 +1,4 @@ -From fea22e159d51c766ba70473f473a0ec914cc7e92 Mon Sep 17 00:00:00 2001 +From db159e417e19ccdc7c5ee9b3e5f3b021e0ac191d Mon Sep 17 00:00:00 2001 From: Rustam Kovhaev <rkovhaev@gmail.com> Date: Tue, 4 Aug 2020 07:56:14 -0700 Subject: [PATCH] staging: wlan-ng: fix out of bounds read in @@ -20,12 +20,13 @@ Signed-off-by: Rustam Kovhaev <rkovhaev@gmail.com> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200804145614.104320-1-rkovhaev@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c -index fa1bf8b069fd..2720f7319a3d 100644 +index 91aaff02a59e..a93370af5426 100644 --- a/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/drivers/staging/wlan-ng/hfa384x_usb.c -@@ -524,13 +524,8 @@ static void hfa384x_usb_defer(struct work_struct *data) +@@ -532,13 +532,8 @@ static void hfa384x_usb_defer(struct work_struct *data) */ void hfa384x_create(struct hfa384x *hw, struct usb_device *usb) { @@ -40,7 +41,7 @@ index fa1bf8b069fd..2720f7319a3d 100644 init_waitqueue_head(&hw->cmdq); diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c -index 456603fd26c0..4b08dc1da4f9 100644 +index 8d32b1603d10..9eee72aff723 100644 --- a/drivers/staging/wlan-ng/prism2usb.c +++ b/drivers/staging/wlan-ng/prism2usb.c @@ -61,23 +61,14 @@ static int prism2sta_probe_usb(struct usb_interface *interface, diff --git a/queue/test_kmod-avoid-potential-double-free-in-trigger_con.patch b/queue/test_kmod-avoid-potential-double-free-in-trigger_con.patch index a9f49db8..af0efb20 100644 --- a/queue/test_kmod-avoid-potential-double-free-in-trigger_con.patch +++ b/queue/test_kmod-avoid-potential-double-free-in-trigger_con.patch @@ -1,4 +1,4 @@ -From 0776d1231bec0c7ab43baf440a3f5ef5f49dd795 Mon Sep 17 00:00:00 2001 +From bbd1ee08fa97022f31ee83f8af495b71c0ba4f62 Mon Sep 17 00:00:00 2001 From: Tiezhu Yang <yangtiezhu@loongson.cn> Date: Tue, 11 Aug 2020 18:36:16 -0700 Subject: [PATCH] test_kmod: avoid potential double free in @@ -41,9 +41,10 @@ Cc: Tony Vroon <chainsaw@gentoo.org> Cc: Christoph Hellwig <hch@infradead.org> Link: http://lkml.kernel.org/r/20200610154923.27510-4-mcgrof@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/lib/test_kmod.c b/lib/test_kmod.c -index e651c37d56db..eab52770070d 100644 +index 9cf77628fc91..87a0cc750ea2 100644 --- a/lib/test_kmod.c +++ b/lib/test_kmod.c @@ -745,7 +745,7 @@ static int trigger_config_run_type(struct kmod_test_device *test_dev, diff --git a/queue/tools-build-feature-Quote-CC-and-CXX-for-their-argum.patch b/queue/tools-build-feature-Quote-CC-and-CXX-for-their-argum.patch index 60d29713..f9c7928d 100644 --- a/queue/tools-build-feature-Quote-CC-and-CXX-for-their-argum.patch +++ b/queue/tools-build-feature-Quote-CC-and-CXX-for-their-argum.patch @@ -1,4 +1,4 @@ -From fa5c893181ed2ca2f96552f50073786d2cfce6c0 Mon Sep 17 00:00:00 2001 +From 1623dc13ad8025f95bca1d671c3aaa32c2c5f655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org> Date: Wed, 12 Aug 2020 17:15:17 -0500 Subject: [PATCH] tools build feature: Quote CC and CXX for their arguments @@ -68,9 +68,10 @@ Cc: Stephane Eranian <eranian@google.com> Cc: Yonghong Song <yhs@fb.com> Link: http://lore.kernel.org/lkml/20200812221518.2869003-1-daniel.diaz@linaro.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature -index 774f0b0ca28a..e7818b44b48e 100644 +index 2c900252ab65..5cc7a3131e20 100644 --- a/tools/build/Makefile.feature +++ b/tools/build/Makefile.feature @@ -8,7 +8,7 @@ endif diff --git a/queue/tools-build-feature-Use-CC-and-CXX-from-parent.patch b/queue/tools-build-feature-Use-CC-and-CXX-from-parent.patch index f4891f88..179b34cb 100644 --- a/queue/tools-build-feature-Use-CC-and-CXX-from-parent.patch +++ b/queue/tools-build-feature-Use-CC-and-CXX-from-parent.patch @@ -1,4 +1,4 @@ -From 2bb246350290c646b2e8a406034cb32588cd41a3 Mon Sep 17 00:00:00 2001 +From 02f16a087ffd0db2379b376f907c2e0a357180de Mon Sep 17 00:00:00 2001 From: Thomas Hebb <tommyhebb@gmail.com> Date: Sun, 26 Jul 2020 21:08:14 -0700 Subject: [PATCH] tools build feature: Use CC and CXX from parent @@ -52,6 +52,7 @@ Cc: Stephane Eranian <eranian@google.com> Cc: thomas hebb <tommyhebb@gmail.com> Link: http://lore.kernel.org/lkml/0a6e69d1736b0fa231a648f50b0cce5d8a6734ef.1595822871.git.tommyhebb@gmail.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature index 3b24231c58a2..2c900252ab65 100644 diff --git a/queue/tracing-Use-trace_sched_process_free-instead-of-exit.patch b/queue/tracing-Use-trace_sched_process_free-instead-of-exit.patch index 8d6418b7..c27b80f0 100644 --- a/queue/tracing-Use-trace_sched_process_free-instead-of-exit.patch +++ b/queue/tracing-Use-trace_sched_process_free-instead-of-exit.patch @@ -1,4 +1,4 @@ -From afcab636657421f7ebfa0783a91f90256bba0091 Mon Sep 17 00:00:00 2001 +From f4ff5459eecf3a87bd981e42a5d3d9d100934e60 Mon Sep 17 00:00:00 2001 From: "Steven Rostedt (VMware)" <rostedt@goodmis.org> Date: Tue, 4 Aug 2020 20:00:02 -0400 Subject: [PATCH] tracing: Use trace_sched_process_free() instead of exit() for @@ -28,12 +28,13 @@ Cc: Namhyung Kim <namhyung@kernel.org> Fixes: 1e10486ffee0a ("ftrace: Add 'function-fork' trace option") Fixes: c37775d57830a ("tracing: Add infrastructure to allow set_event_pid to follow children" Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c -index 4e3a5d79c078..76f2dd6fd414 100644 +index 9a2c0ce707f6..98751023c05a 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c -@@ -6985,12 +6985,12 @@ void ftrace_pid_follow_fork(struct trace_array *tr, bool enable) +@@ -6445,12 +6445,12 @@ void ftrace_pid_follow_fork(struct trace_array *tr, bool enable) if (enable) { register_trace_sched_process_fork(ftrace_pid_follow_sched_process_fork, tr); @@ -49,10 +50,10 @@ index 4e3a5d79c078..76f2dd6fd414 100644 } } diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c -index f6f55682d3e2..a85effb2373b 100644 +index 08d4e9a04f82..42d4afd2fc4f 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c -@@ -538,12 +538,12 @@ void trace_event_follow_fork(struct trace_array *tr, bool enable) +@@ -534,12 +534,12 @@ void trace_event_follow_fork(struct trace_array *tr, bool enable) if (enable) { register_trace_prio_sched_process_fork(event_filter_pid_sched_process_fork, tr, INT_MIN); diff --git a/queue/tracing-hwlat-Honor-the-tracing_cpumask.patch b/queue/tracing-hwlat-Honor-the-tracing_cpumask.patch index 894fbc1d..fd608fd4 100644 --- a/queue/tracing-hwlat-Honor-the-tracing_cpumask.patch +++ b/queue/tracing-hwlat-Honor-the-tracing_cpumask.patch @@ -1,4 +1,4 @@ -From 6624391e9d93fff7ffa0405b3da26424b31fe341 Mon Sep 17 00:00:00 2001 +From b3cf2bc16ae851f51ec4bd3856ad53f372c84f08 Mon Sep 17 00:00:00 2001 From: Kevin Hao <haokexin@gmail.com> Date: Thu, 30 Jul 2020 16:23:18 +0800 Subject: [PATCH] tracing/hwlat: Honor the tracing_cpumask @@ -16,6 +16,7 @@ Cc: stable@vger.kernel.org Fixes: 0330f7aa8ee6 ("tracing: Have hwlat trace migrate across tracing_cpumask CPUs") Signed-off-by: Kevin Hao <haokexin@gmail.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_hwlat.c b/kernel/trace/trace_hwlat.c index 8030e24dbf14..568918fae8d4 100644 diff --git a/queue/ubifs-Fix-wrong-orphan-node-deletion-in-ubifs_jnl_up.patch b/queue/ubifs-Fix-wrong-orphan-node-deletion-in-ubifs_jnl_up.patch index c8c206e2..b0bb6661 100644 --- a/queue/ubifs-Fix-wrong-orphan-node-deletion-in-ubifs_jnl_up.patch +++ b/queue/ubifs-Fix-wrong-orphan-node-deletion-in-ubifs_jnl_up.patch @@ -1,4 +1,4 @@ -From 094b6d1295474f338201b846a1f15e72eb0b12cf Mon Sep 17 00:00:00 2001 +From 92a8aec1258caacf4dbb222020649affae3e5e55 Mon Sep 17 00:00:00 2001 From: Zhihao Cheng <chengzhihao1@huawei.com> Date: Tue, 7 Jul 2020 20:51:40 +0800 Subject: [PATCH] ubifs: Fix wrong orphan node deletion in @@ -19,9 +19,10 @@ adding to orphan list before being deleted, Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com> Fixes: 823838a486888cf484e ("ubifs: Add hashes to the tree node cache") Signed-off-by: Richard Weinberger <richard@nod.at> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c -index e5ec1afe1c66..2cf05f87565c 100644 +index 826dad0243dc..a6ae2428e4c9 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -539,7 +539,7 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, @@ -41,7 +42,7 @@ index e5ec1afe1c66..2cf05f87565c 100644 } err = write_head(c, BASEHD, dent, len, &lnum, &dent_offs, sync); -@@ -702,7 +703,7 @@ out_release: +@@ -702,7 +703,7 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, kfree(dent); out_ro: ubifs_ro_mode(c, err); @@ -50,7 +51,7 @@ index e5ec1afe1c66..2cf05f87565c 100644 ubifs_delete_orphan(c, inode->i_ino); finish_reservation(c); return err; -@@ -1218,7 +1219,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, +@@ -1217,7 +1218,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, void *p; union ubifs_key key; struct ubifs_dent_node *dent, *dent2; @@ -59,7 +60,7 @@ index e5ec1afe1c66..2cf05f87565c 100644 int aligned_dlen1, aligned_dlen2, plen = UBIFS_INO_NODE_SZ; int last_reference = !!(new_inode && new_inode->i_nlink == 0); int move = (old_dir != new_dir); -@@ -1334,6 +1335,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, +@@ -1333,6 +1334,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, goto out_finish; } new_ui->del_cmtno = c->cmt_no; @@ -67,7 +68,7 @@ index e5ec1afe1c66..2cf05f87565c 100644 } err = write_head(c, BASEHD, dent, len, &lnum, &offs, sync); -@@ -1415,7 +1417,7 @@ out_release: +@@ -1414,7 +1416,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, release_head(c, BASEHD); out_ro: ubifs_ro_mode(c, err); diff --git a/queue/watchdog-f71808e_wdt-clear-watchdog-timeout-occurred.patch b/queue/watchdog-f71808e_wdt-clear-watchdog-timeout-occurred.patch index b2293104..49dec4bf 100644 --- a/queue/watchdog-f71808e_wdt-clear-watchdog-timeout-occurred.patch +++ b/queue/watchdog-f71808e_wdt-clear-watchdog-timeout-occurred.patch @@ -1,4 +1,4 @@ -From 4f39d575844148fbf3081571a1f3b4ae04150958 Mon Sep 17 00:00:00 2001 +From 748177579c5e566ddb4a3e9d9c9c3e243c6a5e68 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum <a.fatoum@pengutronix.de> Date: Thu, 11 Jun 2020 21:17:45 +0200 Subject: [PATCH] watchdog: f71808e_wdt: clear watchdog timeout occurred flag @@ -25,12 +25,13 @@ Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20200611191750.28096-5-a.fatoum@pengutronix.de Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c -index 8e5584c54423..26bf366aebc2 100644 +index 9f7a8f0e54d6..491ba2d973ac 100644 --- a/drivers/watchdog/f71808e_wdt.c +++ b/drivers/watchdog/f71808e_wdt.c -@@ -706,6 +706,13 @@ static int __init watchdog_init(int sioaddr) +@@ -693,6 +693,13 @@ static int __init watchdog_init(int sioaddr) wdt_conf = superio_inb(sioaddr, F71808FG_REG_WDT_CONF); watchdog.caused_reboot = wdt_conf & BIT(F71808FG_FLAG_WDTMOUT_STS); diff --git a/queue/watchdog-f71808e_wdt-indicate-WDIOF_CARDRESET-suppor.patch b/queue/watchdog-f71808e_wdt-indicate-WDIOF_CARDRESET-suppor.patch index 51c13ec1..05f29786 100644 --- a/queue/watchdog-f71808e_wdt-indicate-WDIOF_CARDRESET-suppor.patch +++ b/queue/watchdog-f71808e_wdt-indicate-WDIOF_CARDRESET-suppor.patch @@ -1,4 +1,4 @@ -From e871e93fb08a619dfc015974a05768ed6880fd82 Mon Sep 17 00:00:00 2001 +From 96a88d18fbd3801a6dab2854e0c4521506e16838 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum <a.fatoum@pengutronix.de> Date: Thu, 11 Jun 2020 21:17:43 +0200 Subject: [PATCH] watchdog: f71808e_wdt: indicate WDIOF_CARDRESET support in @@ -17,12 +17,13 @@ Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20200611191750.28096-3-a.fatoum@pengutronix.de Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c -index a3c44d75d80e..c8ce80c13403 100644 +index ff5cf1b48a4d..7488d8ab21c8 100644 --- a/drivers/watchdog/f71808e_wdt.c +++ b/drivers/watchdog/f71808e_wdt.c -@@ -692,7 +692,8 @@ static int __init watchdog_init(int sioaddr) +@@ -679,7 +679,8 @@ static int __init watchdog_init(int sioaddr) watchdog.sioaddr = sioaddr; watchdog.ident.options = WDIOC_SETTIMEOUT | WDIOF_MAGICCLOSE diff --git a/queue/watchdog-f71808e_wdt-remove-use-of-wrong-watchdog_in.patch b/queue/watchdog-f71808e_wdt-remove-use-of-wrong-watchdog_in.patch index 46594fa0..0d29a745 100644 --- a/queue/watchdog-f71808e_wdt-remove-use-of-wrong-watchdog_in.patch +++ b/queue/watchdog-f71808e_wdt-remove-use-of-wrong-watchdog_in.patch @@ -1,4 +1,4 @@ -From 802141462d844f2e6a4d63a12260d79b7afc4c34 Mon Sep 17 00:00:00 2001 +From 060ae21d73a9df900cda32556ea827809665d994 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum <a.fatoum@pengutronix.de> Date: Thu, 11 Jun 2020 21:17:44 +0200 Subject: [PATCH] watchdog: f71808e_wdt: remove use of wrong watchdog_info @@ -27,12 +27,13 @@ Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20200611191750.28096-4-a.fatoum@pengutronix.de Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c -index c8ce80c13403..8e5584c54423 100644 +index 7488d8ab21c8..9f7a8f0e54d6 100644 --- a/drivers/watchdog/f71808e_wdt.c +++ b/drivers/watchdog/f71808e_wdt.c -@@ -690,8 +690,7 @@ static int __init watchdog_init(int sioaddr) +@@ -677,8 +677,7 @@ static int __init watchdog_init(int sioaddr) * into the module have been registered yet. */ watchdog.sioaddr = sioaddr; diff --git a/queue/xtensa-add-missing-exclusive-access-state-management.patch b/queue/xtensa-add-missing-exclusive-access-state-management.patch index 93cee9a3..8a217580 100644 --- a/queue/xtensa-add-missing-exclusive-access-state-management.patch +++ b/queue/xtensa-add-missing-exclusive-access-state-management.patch @@ -1,4 +1,4 @@ -From a0fc1436f1f4f84e93144480bf30e0c958d135b6 Mon Sep 17 00:00:00 2001 +From fec599500ee2a8eb2cc3c0e05a8017addc62e472 Mon Sep 17 00:00:00 2001 From: Max Filippov <jcmvbkbc@gmail.com> Date: Fri, 31 Jul 2020 12:38:05 -0700 Subject: [PATCH] xtensa: add missing exclusive access state management @@ -16,9 +16,10 @@ Clear exclusive access monitor on kernel entry. Cc: stable@vger.kernel.org Fixes: f7c34874f04a ("xtensa: add exclusive atomics support") Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/xtensa/include/asm/thread_info.h b/arch/xtensa/include/asm/thread_info.h -index 8918f0f20c53..6acbbe0d87d3 100644 +index f092cc3f4e66..956d4d47c6cd 100644 --- a/arch/xtensa/include/asm/thread_info.h +++ b/arch/xtensa/include/asm/thread_info.h @@ -55,6 +55,10 @@ struct thread_info { @@ -47,7 +48,7 @@ index 33a257b33723..dc5c83cad9be 100644 DEFINE(THREAD_XTREGS_CP0, offsetof(struct thread_info, xtregs_cp.cp0)); DEFINE(THREAD_XTREGS_CP1, offsetof(struct thread_info, xtregs_cp.cp1)); diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S -index 98515c24d9b2..703cf6205efe 100644 +index e54af8b7e0f8..f9c7a02acc29 100644 --- a/arch/xtensa/kernel/entry.S +++ b/arch/xtensa/kernel/entry.S @@ -374,6 +374,11 @@ common_exception: @@ -62,7 +63,7 @@ index 98515c24d9b2..703cf6205efe 100644 /* It is now save to restore the EXC_TABLE_FIXUP variable. */ rsr a2, exccause -@@ -2020,6 +2025,12 @@ ENTRY(_switch_to) +@@ -1989,6 +1994,12 @@ ENTRY(_switch_to) s32i a3, a4, THREAD_CPENABLE #endif diff --git a/queue/xtensa-fix-xtensa_pmu_setup-prototype.patch b/queue/xtensa-fix-xtensa_pmu_setup-prototype.patch index 7318dbde..17dc8ef0 100644 --- a/queue/xtensa-fix-xtensa_pmu_setup-prototype.patch +++ b/queue/xtensa-fix-xtensa_pmu_setup-prototype.patch @@ -1,4 +1,4 @@ -From 6d65d3769d1910379e1cfa61ebf387efc6bfb22c Mon Sep 17 00:00:00 2001 +From dddc0627c7f6c03f4f7ea2c7fd10e158cd49c560 Mon Sep 17 00:00:00 2001 From: Max Filippov <jcmvbkbc@gmail.com> Date: Fri, 31 Jul 2020 12:37:32 -0700 Subject: [PATCH] xtensa: fix xtensa_pmu_setup prototype @@ -17,12 +17,13 @@ CONFIG_XTENSA_VARIANT_HAVE_PERF_EVENTS=y: Cc: stable@vger.kernel.org Fixes: 25a77b55e74c ("xtensa/perf: Convert the hotplug notifier to state machine callbacks") Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/xtensa/kernel/perf_event.c b/arch/xtensa/kernel/perf_event.c -index 99fcd63ce597..a0d05c8598d0 100644 +index 9bae79f70301..86c9ba963155 100644 --- a/arch/xtensa/kernel/perf_event.c +++ b/arch/xtensa/kernel/perf_event.c -@@ -399,7 +399,7 @@ static struct pmu xtensa_pmu = { +@@ -401,7 +401,7 @@ static struct pmu xtensa_pmu = { .read = xtensa_pmu_read, }; |