diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-18 15:42:38 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-18 15:42:38 -0400 |
| commit | 1ae3166f125f37a1dc68074a0954f68941980090 (patch) | |
| tree | 095f8b582fd919a58b3c643ad4b27e4adb32e343 | |
| parent | 37d21a3048159843fe00078f9e93499c4a672079 (diff) | |
| download | longterm-queue-5.2-1ae3166f125f37a1dc68074a0954f68941980090.tar.gz | |
re-export commits w/ SOB lines added
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
107 files changed, 384 insertions, 278 deletions
diff --git a/queue/ALSA-hda-hdmi-fix-failures-at-PCM-open-on-Intel-ICL-.patch b/queue/ALSA-hda-hdmi-fix-failures-at-PCM-open-on-Intel-ICL-.patch index 2ee8300b..5e5829f0 100644 --- a/queue/ALSA-hda-hdmi-fix-failures-at-PCM-open-on-Intel-ICL-.patch +++ b/queue/ALSA-hda-hdmi-fix-failures-at-PCM-open-on-Intel-ICL-.patch @@ -1,4 +1,4 @@ -From 56275036d8185f92eceac7479d48b858ee3dab84 Mon Sep 17 00:00:00 2001 +From c1e28d4a3ec725ad18494ac6d51277440b2308ea Mon Sep 17 00:00:00 2001 From: Kai Vehmanen <kai.vehmanen@linux.intel.com> Date: Fri, 3 Jul 2020 18:38:17 +0300 Subject: [PATCH] ALSA: hda/hdmi: fix failures at PCM open on Intel ICL and @@ -33,12 +33,13 @@ Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Link: https://lore.kernel.org/r/20200703153818.2808592-1-kai.vehmanen@linux.intel.com Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c -index e2b21ef5d7d1..295cc5a989d5 100644 +index dd770e968548..499e671bc2cc 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c -@@ -1804,33 +1804,43 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid) +@@ -1801,33 +1801,43 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid) static int hdmi_parse_codec(struct hda_codec *codec) { diff --git a/queue/ALSA-hda-realtek-Fixed-ALC298-sound-bug-by-adding-qu.patch b/queue/ALSA-hda-realtek-Fixed-ALC298-sound-bug-by-adding-qu.patch index c83c362f..c3018ed5 100644 --- a/queue/ALSA-hda-realtek-Fixed-ALC298-sound-bug-by-adding-qu.patch +++ b/queue/ALSA-hda-realtek-Fixed-ALC298-sound-bug-by-adding-qu.patch @@ -1,4 +1,4 @@ -From 568e4e82128aac2c62c2c359ebebb6007fd794f9 Mon Sep 17 00:00:00 2001 +From 8a0357ba4d5ee90d22a88874f5d40330fe8926d3 Mon Sep 17 00:00:00 2001 From: Joonho Wohn <doomsheart@gmail.com> Date: Sat, 18 Jul 2020 17:23:15 +0900 Subject: [PATCH] ALSA: hda/realtek: Fixed ALC298 sound bug by adding quirk for @@ -16,12 +16,13 @@ Signed-off-by: Joonho Wohn <doomsheart@gmail.com> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/CAHcbMh291aWDKiWSZoxXB4-Eru6OYRwGA4AVEdCZeYmVLo5ZxQ@mail.gmail.com Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index 1b06c4261248..1b2d8e56390a 100644 +index fd92d00aa3b9..577b43335652 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c -@@ -7587,6 +7587,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -7541,6 +7541,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET), SND_PCI_QUIRK(0x144d, 0xc176, "Samsung Notebook 9 Pro (NP930MBE-K04US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET), SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8), diff --git a/queue/ALSA-hda-realtek-fixup-for-yet-another-Intel-referen.patch b/queue/ALSA-hda-realtek-fixup-for-yet-another-Intel-referen.patch index 6d41c71f..f5dc8dcd 100644 --- a/queue/ALSA-hda-realtek-fixup-for-yet-another-Intel-referen.patch +++ b/queue/ALSA-hda-realtek-fixup-for-yet-another-Intel-referen.patch @@ -1,4 +1,4 @@ -From 5734e509d5d515c187f642937ef2de1e58d7715d Mon Sep 17 00:00:00 2001 +From 3d65f54322f549cc120d173a280f4737cf54a116 Mon Sep 17 00:00:00 2001 From: PeiSen Hou <pshou@realtek.com.tw> Date: Thu, 16 Jul 2020 11:01:34 +0200 Subject: [PATCH] ALSA: hda/realtek - fixup for yet another Intel reference @@ -12,12 +12,13 @@ Add headset_jack for the intel reference board support with Signed-off-by: PeiSen Hou <pshou@realtek.com.tw> Link: https://lore.kernel.org/r/20200716090134.9811-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 45df33d1bd1a..1b06c4261248 100644 +index 577b43335652..8cb5672134e3 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c -@@ -7581,6 +7581,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -7536,6 +7536,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x10cf, 0x1629, "Lifebook U7x7", ALC255_FIXUP_LIFEBOOK_U7x7_HEADSET_MIC), SND_PCI_QUIRK(0x10cf, 0x1845, "Lifebook U904", ALC269_FIXUP_LIFEBOOK_EXTMIC), SND_PCI_QUIRK(0x10ec, 0x10f2, "Intel Reference board", ALC700_FIXUP_INTEL_REFERENCE), diff --git a/queue/ALSA-info-Drop-WARN_ON-from-buffer-NULL-sanity-check.patch b/queue/ALSA-info-Drop-WARN_ON-from-buffer-NULL-sanity-check.patch index b5a7aba5..050bba06 100644 --- a/queue/ALSA-info-Drop-WARN_ON-from-buffer-NULL-sanity-check.patch +++ b/queue/ALSA-info-Drop-WARN_ON-from-buffer-NULL-sanity-check.patch @@ -1,4 +1,4 @@ -From f1f1678a10cf47a9c99db79aea7cf334936659a3 Mon Sep 17 00:00:00 2001 +From 0231c8b9a5757e44b16a32389d192d17ed3f4e0a Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai@suse.de> Date: Fri, 17 Jul 2020 10:40:23 +0200 Subject: [PATCH] ALSA: info: Drop WARN_ON() from buffer NULL sanity check @@ -20,6 +20,7 @@ Reported-by: syzbot+e42d0746c3c3699b6061@syzkaller.appspotmail.com Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200717084023.5928-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/core/info.c b/sound/core/info.c index e051a029ccfb..f18f4ef6661e 100644 diff --git a/queue/ALSA-usb-audio-fix-overeager-device-match-for-MacroS.patch b/queue/ALSA-usb-audio-fix-overeager-device-match-for-MacroS.patch index 04e0be9a..bda67908 100644 --- a/queue/ALSA-usb-audio-fix-overeager-device-match-for-MacroS.patch +++ b/queue/ALSA-usb-audio-fix-overeager-device-match-for-MacroS.patch @@ -1,4 +1,4 @@ -From 14a720dc1f5332f3bdf30a23a3bc549e81be974c Mon Sep 17 00:00:00 2001 +From 354c491d489b592c7829c9b2a4f9927864866eae Mon Sep 17 00:00:00 2001 From: Hector Martin <marcan@marcan.st> Date: Mon, 10 Aug 2020 13:53:19 +0900 Subject: [PATCH] ALSA: usb-audio: fix overeager device match for MacroSilicon @@ -14,12 +14,13 @@ Cc: stable@vger.kernel.org Signed-off-by: Hector Martin <marcan@marcan.st> Link: https://lore.kernel.org/r/20200810045319.128745-1-marcan@marcan.st Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h -index adb3b62afed4..9c3c03dc96d3 100644 +index b7b3eabed366..4c3129c57777 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h -@@ -3662,7 +3662,13 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* Asrock TRX40 Creator */ +@@ -3566,7 +3566,13 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* Asrock TRX40 Creator */ * with. */ { diff --git a/queue/ARM-dts-imx6qdl-gw551x-Do-not-use-simple-audio-card-.patch b/queue/ARM-dts-imx6qdl-gw551x-Do-not-use-simple-audio-card-.patch index 8f86e8c8..a76b36f9 100644 --- a/queue/ARM-dts-imx6qdl-gw551x-Do-not-use-simple-audio-card-.patch +++ b/queue/ARM-dts-imx6qdl-gw551x-Do-not-use-simple-audio-card-.patch @@ -1,4 +1,4 @@ -From e52928e8d5c1c4837a0c6ec2068beea99defde8b Mon Sep 17 00:00:00 2001 +From 3a3d5e4a7d35ebb9903ab591de624339e3b7e6a3 Mon Sep 17 00:00:00 2001 From: Fabio Estevam <festevam@gmail.com> Date: Wed, 11 Sep 2019 15:34:21 -0300 Subject: [PATCH] ARM: dts: imx6qdl-gw551x: Do not use @@ -18,12 +18,13 @@ arch/arm/boot/dts/imx6qdl-gw551x.dtsi:109.32-121.5: Warning (unit_address_vs_reg Cc: Tim Harvey <tharvey@gateworks.com> Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi index c23ba229fd05..c38e86eedcc0 100644 --- a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi -@@ -105,19 +105,16 @@ reg_usb_otg_vbus: regulator-usb-otg-vbus { +@@ -105,19 +105,16 @@ sound-digital { compatible = "simple-audio-card"; simple-audio-card,name = "tda1997x-audio"; diff --git a/queue/ARM-dts-imx6qdl-gw551x-fix-audio-SSI.patch b/queue/ARM-dts-imx6qdl-gw551x-fix-audio-SSI.patch index 95c9b6e4..c6a68252 100644 --- a/queue/ARM-dts-imx6qdl-gw551x-fix-audio-SSI.patch +++ b/queue/ARM-dts-imx6qdl-gw551x-fix-audio-SSI.patch @@ -1,4 +1,4 @@ -From 4237c625304b212a3f30adf787901082082511ec Mon Sep 17 00:00:00 2001 +From b4688e5fb02680eae4301f5abc7809a97692bb4e Mon Sep 17 00:00:00 2001 From: Tim Harvey <tharvey@gateworks.com> Date: Tue, 23 Jun 2020 12:06:54 -0700 Subject: [PATCH] ARM: dts: imx6qdl-gw551x: fix audio SSI @@ -12,12 +12,13 @@ Cc: stable@vger.kernel.org Fixes: 3117e851cef1 ("ARM: dts: imx: Add TDA19971 HDMI Receiver to GW551x") Signed-off-by: Tim Harvey <tharvey@gateworks.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi index c38e86eedcc0..8c33510c9519 100644 --- a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi -@@ -110,7 +110,7 @@ sound-digital { +@@ -110,7 +110,7 @@ simple-audio-card,frame-master = <&sound_codec>; sound_cpu: simple-audio-card,cpu { diff --git a/queue/ARM-dts-n900-remove-mmc1-card-detect-gpio.patch b/queue/ARM-dts-n900-remove-mmc1-card-detect-gpio.patch index e9cd636b..592a5963 100644 --- a/queue/ARM-dts-n900-remove-mmc1-card-detect-gpio.patch +++ b/queue/ARM-dts-n900-remove-mmc1-card-detect-gpio.patch @@ -1,4 +1,4 @@ -From ed3e98e919aaaa47e9d9f8a40c3f6f4a22577842 Mon Sep 17 00:00:00 2001 +From fbba72747eaeb16230c84d2935c140a969b97cdb Mon Sep 17 00:00:00 2001 From: Merlijn Wajer <merlijn@wizzup.org> Date: Tue, 30 Jun 2020 11:47:40 -0700 Subject: [PATCH] ARM: dts: n900: remove mmc1 card detect gpio @@ -22,12 +22,13 @@ Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Merlijn Wajer <merlijn@wizzup.org> Link: https://lore.kernel.org/r/20200612125402.18393-3-merlijn@wizzup.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts -index 4089d97405c9..3dbcae3d60d2 100644 +index 7f2ddb78da5f..4227da71cc62 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts -@@ -105,6 +105,14 @@ proximity_sensor { +@@ -105,6 +105,14 @@ linux,code = <SW_FRONT_PROXIMITY>; linux,can-disable; }; @@ -42,7 +43,7 @@ index 4089d97405c9..3dbcae3d60d2 100644 }; isp1707: isp1707 { -@@ -819,10 +827,6 @@ &mmc1 { +@@ -814,10 +822,6 @@ pinctrl-0 = <&mmc1_pins>; vmmc-supply = <&vmmc1>; bus-width = <4>; diff --git a/queue/ASoC-Intel-bytcht_es8316-Add-missed-put_device.patch b/queue/ASoC-Intel-bytcht_es8316-Add-missed-put_device.patch index ac64dd3b..54627a9a 100644 --- a/queue/ASoC-Intel-bytcht_es8316-Add-missed-put_device.patch +++ b/queue/ASoC-Intel-bytcht_es8316-Add-missed-put_device.patch @@ -1,4 +1,4 @@ -From b3df80ab6d147d4738be242e1c91e5fdbb6b03ef Mon Sep 17 00:00:00 2001 +From 36b10ca4f94224b53897ca8311685278991aa0ea Mon Sep 17 00:00:00 2001 From: Jing Xiangfeng <jingxiangfeng@huawei.com> Date: Tue, 14 Jul 2020 16:09:18 +0800 Subject: [PATCH] ASoC: Intel: bytcht_es8316: Add missed put_device() @@ -14,12 +14,13 @@ Reviewed-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20200714080918.148196-1-jingxiangfeng@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c -index 9e5fc9430628..ecbc58e8a37f 100644 +index 4602c4f41c16..1d2fe84bd3d7 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c -@@ -543,8 +543,10 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) +@@ -547,8 +547,10 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) if (cnt) { ret = device_add_properties(codec_dev, props); diff --git a/queue/ASoC-rt5670-Add-new-gpio1_is_ext_spk_en-quirk-and-en.patch b/queue/ASoC-rt5670-Add-new-gpio1_is_ext_spk_en-quirk-and-en.patch index ccd4b80b..00e77a80 100644 --- a/queue/ASoC-rt5670-Add-new-gpio1_is_ext_spk_en-quirk-and-en.patch +++ b/queue/ASoC-rt5670-Add-new-gpio1_is_ext_spk_en-quirk-and-en.patch @@ -1,4 +1,4 @@ -From 85ca6b17e2bb96b19caac3b02c003d670b66de96 Mon Sep 17 00:00:00 2001 +From 128a2968fc1308acf4b3b46038eb92841bb6e79e Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede@redhat.com> Date: Sun, 28 Jun 2020 17:52:28 +0200 Subject: [PATCH] ASoC: rt5670: Add new gpio1_is_ext_spk_en quirk and enable it @@ -25,6 +25,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1786723 Link: https://lore.kernel.org/r/20200628155231.71089-4-hdegoede@redhat.com Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/sound/rt5670.h b/include/sound/rt5670.h index f9024c7a1600..02e1d7778354 100644 diff --git a/queue/ASoC-rt5670-Correct-RT5670_LDO_SEL_MASK.patch b/queue/ASoC-rt5670-Correct-RT5670_LDO_SEL_MASK.patch index d11de09b..2c364b31 100644 --- a/queue/ASoC-rt5670-Correct-RT5670_LDO_SEL_MASK.patch +++ b/queue/ASoC-rt5670-Correct-RT5670_LDO_SEL_MASK.patch @@ -1,4 +1,4 @@ -From 5cacc6f5764e94fa753b2c1f5f7f1f3f74286e82 Mon Sep 17 00:00:00 2001 +From 4a91216952eecb5b8d47e9edbff39834a331aa65 Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede@redhat.com> Date: Sun, 28 Jun 2020 17:52:27 +0200 Subject: [PATCH] ASoC: rt5670: Correct RT5670_LDO_SEL_MASK @@ -21,6 +21,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20200628155231.71089-3-hdegoede@redhat.com Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/codecs/rt5670.h b/sound/soc/codecs/rt5670.h index a8c3e44770b8..de0203369b7c 100644 diff --git a/queue/ASoC-topology-fix-kernel-oops-on-route-addition-erro.patch b/queue/ASoC-topology-fix-kernel-oops-on-route-addition-erro.patch index d6b6f593..d4eb73fc 100644 --- a/queue/ASoC-topology-fix-kernel-oops-on-route-addition-erro.patch +++ b/queue/ASoC-topology-fix-kernel-oops-on-route-addition-erro.patch @@ -1,4 +1,4 @@ -From 6f0307df83f2aa6bdf656c2219c89ce96502d20e Mon Sep 17 00:00:00 2001 +From e07293ae13895d76d19a63a5d2ace6160818deb6 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Date: Tue, 7 Jul 2020 15:37:45 -0500 Subject: [PATCH] ASoC: topology: fix kernel oops on route addition error @@ -22,12 +22,13 @@ Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Link: https://lore.kernel.org/r/20200707203749.113883-2-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c -index 43e5745b06aa..f336a9cfc16f 100644 +index 3570d714ee88..b14bea746875 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c -@@ -1261,17 +1261,29 @@ static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg, +@@ -1281,17 +1281,29 @@ static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg, list_add(&routes[i]->dobj.list, &tplg->comp->dobj_list); ret = soc_tplg_add_route(tplg, routes[i]); diff --git a/queue/HID-alps-support-devices-with-report-id-2.patch b/queue/HID-alps-support-devices-with-report-id-2.patch index c74e5d39..91ffb869 100644 --- a/queue/HID-alps-support-devices-with-report-id-2.patch +++ b/queue/HID-alps-support-devices-with-report-id-2.patch @@ -1,4 +1,4 @@ -From aa3c439c144f0a465ed1f28f11c772886fb02b35 Mon Sep 17 00:00:00 2001 +From c122d2a0fd61b7ce6d9254359ecade46b78f203e Mon Sep 17 00:00:00 2001 From: Caiyuan Xie <caiyuan.xie@cn.alps.com> Date: Fri, 22 May 2020 05:06:10 -0400 Subject: [PATCH] HID: alps: support devices with report id 2 @@ -9,6 +9,7 @@ Add support for devices which that have reports with id == 2 Signed-off-by: Caiyuan Xie <caiyuan.xie@cn.alps.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c index b2ad319a74b9..d33f5abc8f64 100644 diff --git a/queue/HID-apple-Disable-Fn-key-key-re-mapping-on-clone-key.patch b/queue/HID-apple-Disable-Fn-key-key-re-mapping-on-clone-key.patch index 4d92a9bc..9ae4867a 100644 --- a/queue/HID-apple-Disable-Fn-key-key-re-mapping-on-clone-key.patch +++ b/queue/HID-apple-Disable-Fn-key-key-re-mapping-on-clone-key.patch @@ -1,4 +1,4 @@ -From a5d81646fa294eed57786a9310b06ca48902adf8 Mon Sep 17 00:00:00 2001 +From 180ca4a1a1f322ea899e7fee62c9b636b390cf93 Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede@redhat.com> Date: Sat, 20 Jun 2020 14:32:29 +0200 Subject: [PATCH] HID: apple: Disable Fn-key key-re-mapping on clone keyboards @@ -32,12 +32,13 @@ similar clones. Cc: Joao Moreno <mail@joaomoreno.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c -index 359bdfbe3701..e82f604d33e9 100644 +index d732d1d10caf..6909c045fece 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c -@@ -60,6 +60,7 @@ MODULE_PARM_DESC(swap_fn_leftctrl, "Swap the Fn and left Control keys. " +@@ -54,6 +54,7 @@ MODULE_PARM_DESC(swap_opt_cmd, "Swap the Option (\"Alt\") and Command (\"Flag\") struct apple_sc { unsigned long quirks; unsigned int fn_on; @@ -45,7 +46,7 @@ index 359bdfbe3701..e82f604d33e9 100644 DECLARE_BITMAP(pressed_numlock, KEY_CNT); }; -@@ -365,12 +366,15 @@ static int apple_input_mapping(struct hid_device *hdev, struct hid_input *hi, +@@ -339,12 +340,15 @@ static int apple_input_mapping(struct hid_device *hdev, struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, unsigned long **bit, int *max) { @@ -61,7 +62,7 @@ index 359bdfbe3701..e82f604d33e9 100644 apple_setup_input(hi->input); return 1; } -@@ -397,6 +401,19 @@ static int apple_input_mapped(struct hid_device *hdev, struct hid_input *hi, +@@ -371,6 +375,19 @@ static int apple_input_mapped(struct hid_device *hdev, struct hid_input *hi, return 0; } @@ -81,7 +82,7 @@ index 359bdfbe3701..e82f604d33e9 100644 static int apple_probe(struct hid_device *hdev, const struct hid_device_id *id) { -@@ -611,6 +628,7 @@ static struct hid_driver apple_driver = { +@@ -585,6 +602,7 @@ static struct hid_driver apple_driver = { .event = apple_event, .input_mapping = apple_input_mapping, .input_mapped = apple_input_mapped, diff --git a/queue/HID-i2c-hid-add-Mediacom-FlexBook-edge13-to-descript.patch b/queue/HID-i2c-hid-add-Mediacom-FlexBook-edge13-to-descript.patch index 3e49dae6..38b6d5c5 100644 --- a/queue/HID-i2c-hid-add-Mediacom-FlexBook-edge13-to-descript.patch +++ b/queue/HID-i2c-hid-add-Mediacom-FlexBook-edge13-to-descript.patch @@ -1,4 +1,4 @@ -From 43e666acb79f3d355dd89bf20f4d25d3b15da13e Mon Sep 17 00:00:00 2001 +From ffc86c078a5815412ce720812a66469c302c7694 Mon Sep 17 00:00:00 2001 From: Federico Ricchiuto <fed.ricchiuto@gmail.com> Date: Mon, 15 Jun 2020 22:49:11 +0200 Subject: [PATCH] HID: i2c-hid: add Mediacom FlexBook edge13 to descriptor @@ -11,6 +11,7 @@ supply descriptors, so it has to be added to the override list. Signed-off-by: Federico Ricchiuto <fed.ricchiuto@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c index ec142bc8c1da..35f3bfc3e6f5 100644 diff --git a/queue/HID-steam-fixes-race-in-handling-device-list.patch b/queue/HID-steam-fixes-race-in-handling-device-list.patch index 08984586..d1aed463 100644 --- a/queue/HID-steam-fixes-race-in-handling-device-list.patch +++ b/queue/HID-steam-fixes-race-in-handling-device-list.patch @@ -1,4 +1,4 @@ -From 2d3f53a80e4eed078669853a178ed96d88f74143 Mon Sep 17 00:00:00 2001 +From 40d512d949f1f1e1c40cfedadd81d55df5cdfbd4 Mon Sep 17 00:00:00 2001 From: Rodrigo Rivas Costa <rodrigorivascosta@gmail.com> Date: Tue, 16 Jun 2020 18:44:18 +0200 Subject: [PATCH] HID: steam: fixes race in handling device list. @@ -16,6 +16,7 @@ it. Signed-off-by: Rodrigo Rivas Costa <rodrigorivascosta@gmail.com> Tested-by: Siarhei Vishniakou <svv@google.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-steam.c b/drivers/hid/hid-steam.c index 6286204d4c56..a3b151b29bd7 100644 diff --git a/queue/Input-add-SW_MACHINE_COVER.patch b/queue/Input-add-SW_MACHINE_COVER.patch index 4627959e..b800d62a 100644 --- a/queue/Input-add-SW_MACHINE_COVER.patch +++ b/queue/Input-add-SW_MACHINE_COVER.patch @@ -1,4 +1,4 @@ -From c463bb2a8f8d7d97aa414bf7714fc77e9d3b10df Mon Sep 17 00:00:00 2001 +From cf45a7225aa3d9d380117cac5a06623b43d5d9f2 Mon Sep 17 00:00:00 2001 From: Merlijn Wajer <merlijn@wizzup.org> Date: Tue, 30 Jun 2020 11:47:04 -0700 Subject: [PATCH] Input: add `SW_MACHINE_COVER` @@ -14,12 +14,13 @@ Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Merlijn Wajer <merlijn@wizzup.org> Link: https://lore.kernel.org/r/20200612125402.18393-2-merlijn@wizzup.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h -index e3596db077dc..04a19e30b168 100644 +index 9673b1d060d7..5f6eb23644b3 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h -@@ -318,7 +318,7 @@ struct pcmcia_device_id { +@@ -299,7 +299,7 @@ struct pcmcia_device_id { #define INPUT_DEVICE_ID_LED_MAX 0x0f #define INPUT_DEVICE_ID_SND_MAX 0x07 #define INPUT_DEVICE_ID_FF_MAX 0x7f @@ -29,10 +30,10 @@ index e3596db077dc..04a19e30b168 100644 #define INPUT_DEVICE_ID_MATCH_BUS 1 diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h -index b6a835d37826..0c2e27d28e0a 100644 +index 85387c76c24f..472cd5bc5567 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h -@@ -888,7 +888,8 @@ +@@ -808,7 +808,8 @@ #define SW_LINEIN_INSERT 0x0d /* set = inserted */ #define SW_MUTE_DEVICE 0x0e /* set = device disabled */ #define SW_PEN_INSERTED 0x0f /* set = pen inserted */ diff --git a/queue/Input-elan_i2c-only-increment-wakeup-count-on-touch.patch b/queue/Input-elan_i2c-only-increment-wakeup-count-on-touch.patch index 1058fe52..55289b00 100644 --- a/queue/Input-elan_i2c-only-increment-wakeup-count-on-touch.patch +++ b/queue/Input-elan_i2c-only-increment-wakeup-count-on-touch.patch @@ -1,4 +1,4 @@ -From 966334dfc472bdfa67bed864842943b19755d192 Mon Sep 17 00:00:00 2001 +From 9ea3ce44d3239bc53edd22d673784c390a139b55 Mon Sep 17 00:00:00 2001 From: Derek Basehore <dbasehore@chromium.org> Date: Mon, 6 Jul 2020 17:39:41 -0700 Subject: [PATCH] Input: elan_i2c - only increment wakeup count on touch @@ -13,12 +13,13 @@ occur. Signed-off-by: Derek Basehore <dbasehore@chromium.org> Link: https://lore.kernel.org/r/20200706235046.1984283-1-dbasehore@chromium.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c -index 3f9354baac4b..6291fb5fa015 100644 +index 0fb6a369c9c7..6b3b5d5ad721 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c -@@ -951,6 +951,8 @@ static void elan_report_absolute(struct elan_tp_data *data, u8 *packet) +@@ -914,6 +914,8 @@ static void elan_report_absolute(struct elan_tp_data *data, u8 *packet) u8 hover_info = packet[ETP_HOVER_INFO_OFFSET]; bool contact_valid, hover_event; @@ -27,7 +28,7 @@ index 3f9354baac4b..6291fb5fa015 100644 hover_event = hover_info & 0x40; for (i = 0; i < ETP_MAX_FINGERS; i++) { contact_valid = tp_info & (1U << (3 + i)); -@@ -974,6 +976,8 @@ static void elan_report_trackpoint(struct elan_tp_data *data, u8 *report) +@@ -936,6 +938,8 @@ static void elan_report_trackpoint(struct elan_tp_data *data, u8 *report) u8 *packet = &report[ETP_REPORT_ID_OFFSET + 1]; int x, y; @@ -36,7 +37,7 @@ index 3f9354baac4b..6291fb5fa015 100644 if (!data->tp_input) { dev_warn_once(&data->client->dev, "received a trackpoint report while no trackpoint device has been created. Please report upstream.\n"); -@@ -998,7 +1002,6 @@ static void elan_report_trackpoint(struct elan_tp_data *data, u8 *report) +@@ -960,7 +964,6 @@ static void elan_report_trackpoint(struct elan_tp_data *data, u8 *report) static irqreturn_t elan_isr(int irq, void *dev_id) { struct elan_tp_data *data = dev_id; @@ -44,7 +45,7 @@ index 3f9354baac4b..6291fb5fa015 100644 int error; u8 report[ETP_MAX_REPORT_LEN]; -@@ -1016,8 +1019,6 @@ static irqreturn_t elan_isr(int irq, void *dev_id) +@@ -978,8 +981,6 @@ static irqreturn_t elan_isr(int irq, void *dev_id) if (error) goto out; @@ -53,7 +54,7 @@ index 3f9354baac4b..6291fb5fa015 100644 switch (report[ETP_REPORT_ID_OFFSET]) { case ETP_REPORT_ID: elan_report_absolute(data, report); -@@ -1026,7 +1027,7 @@ static irqreturn_t elan_isr(int irq, void *dev_id) +@@ -988,7 +989,7 @@ static irqreturn_t elan_isr(int irq, void *dev_id) elan_report_trackpoint(data, report); break; default: diff --git a/queue/Input-synaptics-enable-InterTouch-for-ThinkPad-X1E-1.patch b/queue/Input-synaptics-enable-InterTouch-for-ThinkPad-X1E-1.patch index aec8babe..c0637f51 100644 --- a/queue/Input-synaptics-enable-InterTouch-for-ThinkPad-X1E-1.patch +++ b/queue/Input-synaptics-enable-InterTouch-for-ThinkPad-X1E-1.patch @@ -1,4 +1,4 @@ -From dcb00fc799dc03fd320e123e4c81b3278c763ea5 Mon Sep 17 00:00:00 2001 +From 124b8b00cb64790b0a76c6e6c08b9f038ec9731a Mon Sep 17 00:00:00 2001 From: Ilya Katsnelson <me@0upti.me> Date: Mon, 6 Jul 2020 15:27:43 -0700 Subject: [PATCH] Input: synaptics - enable InterTouch for ThinkPad X1E 1st gen @@ -12,9 +12,10 @@ Signed-off-by: Ilya Katsnelson <me@0upti.me> Reviewed-by: Lyude Paul <lyude@redhat.com> Link: https://lore.kernel.org/r/20200703143457.132373-1-me@0upti.me Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c -index 758dae8d6500..4b81b2d0fe06 100644 +index 944564137a36..9e7ff6fdad78 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -179,6 +179,7 @@ static const char * const smbus_pnp_ids[] = { diff --git a/queue/Linux-5.2.54.patch b/queue/Linux-5.2.54.patch index 1ba44cd8..e227ac86 100644 --- a/queue/Linux-5.2.54.patch +++ b/queue/Linux-5.2.54.patch @@ -1,4 +1,4 @@ -From c95d9db91a24f889019af6f6c2aded7fb91dad9c Mon Sep 17 00:00:00 2001 +From 175f6f5ba2b7e8f5d984fd678e2005d5ce3a15d3 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Tue, 18 Aug 2020 01:15:57 -0400 Subject: [PATCH] Linux 5.2.54 diff --git a/queue/Makefile-Fix-GCC_TOOLCHAIN_DIR-prefix-for-Clang-cros.patch b/queue/Makefile-Fix-GCC_TOOLCHAIN_DIR-prefix-for-Clang-cros.patch index b97f0c13..4b06ce15 100644 --- a/queue/Makefile-Fix-GCC_TOOLCHAIN_DIR-prefix-for-Clang-cros.patch +++ b/queue/Makefile-Fix-GCC_TOOLCHAIN_DIR-prefix-for-Clang-cros.patch @@ -1,4 +1,4 @@ -From ca9b31f6bb9c6aa9b4e5f0792f39a97bbffb8c51 Mon Sep 17 00:00:00 2001 +From b986839aadff438ff69c69cc3e9555c7848c2210 Mon Sep 17 00:00:00 2001 From: Fangrui Song <maskray@google.com> Date: Tue, 21 Jul 2020 10:31:23 -0700 Subject: [PATCH] Makefile: Fix GCC_TOOLCHAIN_DIR prefix for Clang cross @@ -36,12 +36,13 @@ Tested-by: Nick Desaulniers <ndesaulniers@google.com> Link: https://github.com/ClangBuiltLinux/linux/issues/1099 Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/Makefile b/Makefile -index 676f1cfb1d56..9d9d4166c0be 100644 +index 592a098aba4e..890df5865761 100644 --- a/Makefile +++ b/Makefile -@@ -567,7 +567,7 @@ ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),) +@@ -522,7 +522,7 @@ ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),) ifneq ($(CROSS_COMPILE),) CLANG_FLAGS += --target=$(notdir $(CROSS_COMPILE:%-=%)) GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit)) diff --git a/queue/RDMA-mlx5-Use-xa_lock_irq-when-access-to-SRQ-table.patch b/queue/RDMA-mlx5-Use-xa_lock_irq-when-access-to-SRQ-table.patch index 9aa36aaf..91393fdf 100644 --- a/queue/RDMA-mlx5-Use-xa_lock_irq-when-access-to-SRQ-table.patch +++ b/queue/RDMA-mlx5-Use-xa_lock_irq-when-access-to-SRQ-table.patch @@ -1,4 +1,4 @@ -From 89a8c2a53a8ba191a3dc09ab6a7a9dfacfd4cb1c Mon Sep 17 00:00:00 2001 +From ce32dd0747c43aeeaaec2a3a3dbf1329f2017cf0 Mon Sep 17 00:00:00 2001 From: Maor Gottlieb <maorg@mellanox.com> Date: Sun, 12 Jul 2020 13:26:41 +0300 Subject: [PATCH] RDMA/mlx5: Use xa_lock_irq when access to SRQ table @@ -85,6 +85,7 @@ Link: https://lore.kernel.org/r/20200712102641.15210-1-leon@kernel.org Signed-off-by: Maor Gottlieb <maorg@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/hw/mlx5/srq_cmd.c b/drivers/infiniband/hw/mlx5/srq_cmd.c index b0d0687c7a68..2e8fa8767fd7 100644 diff --git a/queue/RISC-V-Upgrade-smp_mb__after_spinlock-to-iorw-iorw.patch b/queue/RISC-V-Upgrade-smp_mb__after_spinlock-to-iorw-iorw.patch index 17375c5a..3d27281f 100644 --- a/queue/RISC-V-Upgrade-smp_mb__after_spinlock-to-iorw-iorw.patch +++ b/queue/RISC-V-Upgrade-smp_mb__after_spinlock-to-iorw-iorw.patch @@ -1,4 +1,4 @@ -From 38b7c2a3ffb1fce8358ddc6006cfe5c038ff9963 Mon Sep 17 00:00:00 2001 +From f96f4adf0990d5993c0de97e22ce9e0bf6bd533e Mon Sep 17 00:00:00 2001 From: Palmer Dabbelt <palmerdabbelt@google.com> Date: Thu, 16 Jul 2020 11:57:26 -0700 Subject: [PATCH] RISC-V: Upgrade smp_mb__after_spinlock() to iorw,iorw @@ -11,6 +11,7 @@ While it's a bit ugly to overload smp_mb__after_spinlock() with this behavior, it's what PowerPC is doing so there's some precedent. Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/riscv/include/asm/barrier.h b/arch/riscv/include/asm/barrier.h index 3f1737f301cc..d0e24aaa2aa0 100644 diff --git a/queue/SUNRPC-reverting-d03727b248d0-NFSv4-fix-CLOSE-not-wa.patch b/queue/SUNRPC-reverting-d03727b248d0-NFSv4-fix-CLOSE-not-wa.patch index 6579e298..5f23aaf4 100644 --- a/queue/SUNRPC-reverting-d03727b248d0-NFSv4-fix-CLOSE-not-wa.patch +++ b/queue/SUNRPC-reverting-d03727b248d0-NFSv4-fix-CLOSE-not-wa.patch @@ -1,4 +1,4 @@ -From 65caafd0d2145d1dd02072c4ced540624daeab40 Mon Sep 17 00:00:00 2001 +From 76127baab927d2b66ceb7c96123e9e3ba5895be6 Mon Sep 17 00:00:00 2001 From: Olga Kornievskaia <kolga@netapp.com> Date: Wed, 15 Jul 2020 13:04:15 -0400 Subject: [PATCH] SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting @@ -18,12 +18,13 @@ by server returning ERR_FILE_OPEN and not ERR_ACCESS. Signed-off-by: Olga Kornievskaia <kolga@netapp.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c -index 3d113cf8908a..1b79dd5cf661 100644 +index eeac41249bc4..1aae0606dd87 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c -@@ -267,6 +267,8 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq) +@@ -397,6 +397,8 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq) { struct inode *inode = dreq->inode; @@ -32,7 +33,7 @@ index 3d113cf8908a..1b79dd5cf661 100644 if (dreq->iocb) { long res = (long) dreq->error; if (dreq->count != 0) { -@@ -278,10 +280,7 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq) +@@ -408,10 +410,7 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq) complete(&dreq->completion); @@ -43,7 +44,7 @@ index 3d113cf8908a..1b79dd5cf661 100644 } static void nfs_direct_read_completion(struct nfs_pgio_header *hdr) -@@ -411,10 +410,8 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq, +@@ -541,10 +540,8 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq, * generic layer handle the completion. */ if (requested_bytes == 0) { @@ -55,7 +56,7 @@ index 3d113cf8908a..1b79dd5cf661 100644 return result < 0 ? result : -EIO; } -@@ -867,10 +864,8 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, +@@ -968,10 +965,8 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, * generic layer handle the completion. */ if (requested_bytes == 0) { @@ -68,7 +69,7 @@ index 3d113cf8908a..1b79dd5cf661 100644 } diff --git a/fs/nfs/file.c b/fs/nfs/file.c -index ccd6c1637b27..f96367a2463e 100644 +index 7b3136753205..95dc90570786 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -83,7 +83,6 @@ nfs_file_release(struct inode *inode, struct file *filp) diff --git a/queue/arm64-Use-test_tsk_thread_flag-for-checking-TIF_SING.patch b/queue/arm64-Use-test_tsk_thread_flag-for-checking-TIF_SING.patch index ccfec77f..d03341d6 100644 --- a/queue/arm64-Use-test_tsk_thread_flag-for-checking-TIF_SING.patch +++ b/queue/arm64-Use-test_tsk_thread_flag-for-checking-TIF_SING.patch @@ -1,4 +1,4 @@ -From 5afc78551bf5d53279036e0bf63314e35631d79f Mon Sep 17 00:00:00 2001 +From fff5e7c5d3f76e013797cb5a26d7ec69e6467da4 Mon Sep 17 00:00:00 2001 From: Will Deacon <will@kernel.org> Date: Thu, 13 Feb 2020 12:12:26 +0000 Subject: [PATCH] arm64: Use test_tsk_thread_flag() for checking TIF_SINGLESTEP @@ -10,9 +10,10 @@ replace the couple of offenders with calls to test_tsk_thread_flag() directly. Signed-off-by: Will Deacon <will@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c -index 91146c0a3691..7310a4f7f993 100644 +index b203751bf126..1900fc59a672 100644 --- a/arch/arm64/kernel/debug-monitors.c +++ b/arch/arm64/kernel/debug-monitors.c @@ -394,14 +394,14 @@ void user_rewind_single_step(struct task_struct *task) diff --git a/queue/asm-generic-mmiowb-Allow-mmiowb_set_pending-when-pre.patch b/queue/asm-generic-mmiowb-Allow-mmiowb_set_pending-when-pre.patch index 35dde158..8cb947b9 100644 --- a/queue/asm-generic-mmiowb-Allow-mmiowb_set_pending-when-pre.patch +++ b/queue/asm-generic-mmiowb-Allow-mmiowb_set_pending-when-pre.patch @@ -1,4 +1,4 @@ -From 880bd811f0e361aa5aff5197937ab8d54a93a90d Mon Sep 17 00:00:00 2001 +From 6c0838cc8d469e164af1a3fee80a4476f70186bd Mon Sep 17 00:00:00 2001 From: Will Deacon <will@kernel.org> Date: Thu, 16 Jul 2020 12:28:16 +0100 Subject: [PATCH] asm-generic/mmiowb: Allow mmiowb_set_pending() when @@ -50,6 +50,7 @@ Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com> Acked-by: Palmer Dabbelt <palmerdabbelt@google.com> Link: https://lore.kernel.org/r/20200716112816.7356-1-will@kernel.org Signed-off-by: Will Deacon <will@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/asm-generic/mmiowb.h b/include/asm-generic/mmiowb.h index 9439ff037b2d..5698fca3bf56 100644 diff --git a/queue/binder-Don-t-use-mmput-from-shrinker-function.patch b/queue/binder-Don-t-use-mmput-from-shrinker-function.patch index b155a335..470ae337 100644 --- a/queue/binder-Don-t-use-mmput-from-shrinker-function.patch +++ b/queue/binder-Don-t-use-mmput-from-shrinker-function.patch @@ -1,4 +1,4 @@ -From 8ccee48219551f0e8c62665f864e087db874516c Mon Sep 17 00:00:00 2001 +From 9ef77ce4def3a21cc25fe647926ac917d7cf562d Mon Sep 17 00:00:00 2001 From: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> Date: Fri, 17 Jul 2020 00:12:15 +0900 Subject: [PATCH] binder: Don't use mmput() from shrinker function. @@ -26,6 +26,7 @@ Acked-by: Christian Brauner <christian.brauner@ubuntu.com> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/4ba9adb2-43f5-2de0-22de-f6075c1fab50@i-love.sakura.ne.jp Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index bb0a732cd98a..f8953fcbcc0e 100644 diff --git a/queue/block-check-queue-s-limits.discard_granularity-in-__.patch b/queue/block-check-queue-s-limits.discard_granularity-in-__.patch index 44332798..80aad6de 100644 --- a/queue/block-check-queue-s-limits.discard_granularity-in-__.patch +++ b/queue/block-check-queue-s-limits.discard_granularity-in-__.patch @@ -1,4 +1,4 @@ -From b35fd7422c2f8e04496f5a770bd4e1a205414b3f Mon Sep 17 00:00:00 2001 +From acde154092233a3edf43a68c4f948503e593f4a4 Mon Sep 17 00:00:00 2001 From: Coly Li <colyli@suse.de> Date: Thu, 6 Aug 2020 01:25:03 +0800 Subject: [PATCH] block: check queue's limits.discard_granularity in @@ -72,9 +72,10 @@ Cc: Jens Axboe <axboe@kernel.dk> Cc: Martin K. Petersen <martin.petersen@oracle.com> Cc: Xiao Ni <xni@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/block/blk-lib.c b/block/blk-lib.c -index 019e09bb9c0e..0d1811e57ac7 100644 +index 5f2c429d4378..bdcfe4fbeac7 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -47,6 +47,15 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, diff --git a/queue/bnxt_en-Fix-race-when-modifying-pause-settings.patch b/queue/bnxt_en-Fix-race-when-modifying-pause-settings.patch index f4c83847..d274670b 100644 --- a/queue/bnxt_en-Fix-race-when-modifying-pause-settings.patch +++ b/queue/bnxt_en-Fix-race-when-modifying-pause-settings.patch @@ -1,4 +1,4 @@ -From 163e9ef63641a02de4c95cd921577265c52e1ce2 Mon Sep 17 00:00:00 2001 +From 0196fab4f04ee00fd2cc8ef24d183908c94547a3 Mon Sep 17 00:00:00 2001 From: Vasundhara Volam <vasundhara-v.volam@broadcom.com> Date: Sat, 11 Jul 2020 20:48:23 -0400 Subject: [PATCH] bnxt_en: Fix race when modifying pause settings. @@ -15,12 +15,13 @@ Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com> Reviewed-by: Edwin Peer <edwin.peer@broadcom.com> Signed-off-by: Michael Chan <michael.chan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c -index 6b88143af5ea..b4aa56dc4f9f 100644 +index 214cd635bfdd..3503699ef205 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c -@@ -1765,8 +1765,11 @@ static int bnxt_set_pauseparam(struct net_device *dev, +@@ -1630,8 +1630,11 @@ static int bnxt_set_pauseparam(struct net_device *dev, if (epause->tx_pause) link_info->req_flow_ctrl |= BNXT_LINK_PAUSE_TX; diff --git a/queue/bonding-check-error-value-of-register_netdevice-imme.patch b/queue/bonding-check-error-value-of-register_netdevice-imme.patch index c99265ce..d4cef476 100644 --- a/queue/bonding-check-error-value-of-register_netdevice-imme.patch +++ b/queue/bonding-check-error-value-of-register_netdevice-imme.patch @@ -1,4 +1,4 @@ -From 544f287b84959203367cd29e16e772717612fab4 Mon Sep 17 00:00:00 2001 +From d0cfc895969809745cc7082ff0e1e3587016c769 Mon Sep 17 00:00:00 2001 From: Taehee Yoo <ap420073@gmail.com> Date: Sun, 19 Jul 2020 12:11:24 +0000 Subject: [PATCH] bonding: check error value of register_netdevice() @@ -52,12 +52,13 @@ Splat looks like: Fixes: e826eafa65c6 ("bonding: Call netif_carrier_off after register_netdevice") Signed-off-by: Taehee Yoo <ap420073@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c -index 004919aea5fb..f88cb097b022 100644 +index 23024742040a..350d960a3839 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c -@@ -5053,15 +5053,19 @@ int bond_create(struct net *net, const char *name) +@@ -4885,15 +4885,19 @@ int bond_create(struct net *net, const char *name) bond_dev->rtnl_link_ops = &bond_link_ops; res = register_netdevice(bond_dev); diff --git a/queue/bonding-check-return-value-of-register_netdevice-in-.patch b/queue/bonding-check-return-value-of-register_netdevice-in-.patch index d769b7e4..62456738 100644 --- a/queue/bonding-check-return-value-of-register_netdevice-in-.patch +++ b/queue/bonding-check-return-value-of-register_netdevice-in-.patch @@ -1,4 +1,4 @@ -From c75d1d5248c0c97996051809ad0e9f154ba5d76e Mon Sep 17 00:00:00 2001 +From ccb689590a45c6c4638a64fc86d4b958d362748b Mon Sep 17 00:00:00 2001 From: Cong Wang <xiyou.wangcong@gmail.com> Date: Wed, 22 Jul 2020 16:31:54 -0700 Subject: [PATCH] bonding: check return value of register_netdevice() in @@ -18,12 +18,13 @@ Cc: Taehee Yoo <ap420073@gmail.com> Cc: Jay Vosburgh <j.vosburgh@gmail.com> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c -index b43b51646b11..f0f9138e967f 100644 +index b24cce48ae35..c3dfbd26b62b 100644 --- a/drivers/net/bonding/bond_netlink.c +++ b/drivers/net/bonding/bond_netlink.c -@@ -456,11 +456,10 @@ static int bond_newlink(struct net *src_net, struct net_device *bond_dev, +@@ -447,11 +447,10 @@ static int bond_newlink(struct net *src_net, struct net_device *bond_dev, return err; err = register_netdevice(bond_dev); diff --git a/queue/btrfs-fix-double-free-on-ulist-after-backref-resolut.patch b/queue/btrfs-fix-double-free-on-ulist-after-backref-resolut.patch index 3ebcc88b..fe9b78ae 100644 --- a/queue/btrfs-fix-double-free-on-ulist-after-backref-resolut.patch +++ b/queue/btrfs-fix-double-free-on-ulist-after-backref-resolut.patch @@ -1,4 +1,4 @@ -From 580c079b5766ac706f56eec5c79aee4bf929fef6 Mon Sep 17 00:00:00 2001 +From 44cbc43e4b5e66b3133755e127c7f4da7d874483 Mon Sep 17 00:00:00 2001 From: Filipe Manana <fdmanana@suse.com> Date: Mon, 13 Jul 2020 15:11:56 +0100 Subject: [PATCH] btrfs: fix double free on ulist after backref resolution @@ -140,12 +140,13 @@ Reviewed-by: Josef Bacik <josef@toxicpanda.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/backref.c b/fs/btrfs/backref.c -index d888e71e66b6..ea10f7bc99ab 100644 +index 69f8ab4d91f2..110636757d95 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c -@@ -1461,6 +1461,7 @@ static int btrfs_find_all_roots_safe(struct btrfs_trans_handle *trans, +@@ -1422,6 +1422,7 @@ static int btrfs_find_all_roots_safe(struct btrfs_trans_handle *trans, if (ret < 0 && ret != -ENOENT) { ulist_free(tmp); ulist_free(*roots); diff --git a/queue/btrfs-fix-mount-failure-caused-by-race-with-umount.patch b/queue/btrfs-fix-mount-failure-caused-by-race-with-umount.patch index 726112de..3337a29b 100644 --- a/queue/btrfs-fix-mount-failure-caused-by-race-with-umount.patch +++ b/queue/btrfs-fix-mount-failure-caused-by-race-with-umount.patch @@ -1,4 +1,4 @@ -From 48cfa61b58a1fee0bc49eef04f8ccf31493b7cdd Mon Sep 17 00:00:00 2001 +From 4e16d3493bb20af33fb7c4af1a98f11fc28cc28e Mon Sep 17 00:00:00 2001 From: Boris Burkov <boris@bur.io> Date: Thu, 16 Jul 2020 13:29:46 -0700 Subject: [PATCH] btrfs: fix mount failure caused by race with umount @@ -77,12 +77,13 @@ CC: stable@vger.kernel.org # 4.4+ Signed-off-by: Boris Burkov <boris@bur.io> 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 0d6e785bcb98..f403fb1e6d37 100644 +index 7a17dd7dadde..0cfe95f5529f 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c -@@ -7051,6 +7051,14 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info) +@@ -7232,6 +7232,14 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info) mutex_lock(&uuid_mutex); mutex_lock(&fs_info->chunk_mutex); diff --git a/queue/btrfs-fix-page-leaks-after-failure-to-lock-page-for-.patch b/queue/btrfs-fix-page-leaks-after-failure-to-lock-page-for-.patch index 490b63dd..c0a6b633 100644 --- a/queue/btrfs-fix-page-leaks-after-failure-to-lock-page-for-.patch +++ b/queue/btrfs-fix-page-leaks-after-failure-to-lock-page-for-.patch @@ -1,4 +1,4 @@ -From 5909ca110b29aa16b23b52b8de8d3bb1035fd738 Mon Sep 17 00:00:00 2001 +From 3073599b1d0470ddba0df01818268ccac1d58924 Mon Sep 17 00:00:00 2001 From: Robbie Ko <robbieko@synology.com> Date: Mon, 20 Jul 2020 09:42:09 +0800 Subject: [PATCH] btrfs: fix page leaks after failure to lock page for delalloc @@ -16,12 +16,13 @@ Reviewed-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: Robbie Ko <robbieko@synology.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/extent_io.c b/fs/btrfs/extent_io.c -index 95313bb7fe40..72c836b54efc 100644 +index ff1a61e9f713..854bc56abd86 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c -@@ -1999,7 +1999,8 @@ static int __process_pages_contig(struct address_space *mapping, +@@ -1902,7 +1902,8 @@ static int __process_pages_contig(struct address_space *mapping, if (!PageDirty(pages[i]) || pages[i]->mapping != mapping) { unlock_page(pages[i]); diff --git a/queue/btrfs-reloc-clear-DEAD_RELOC_TREE-bit-for-orphan-roo.patch b/queue/btrfs-reloc-clear-DEAD_RELOC_TREE-bit-for-orphan-roo.patch index 57b867a3..9bcf46c0 100644 --- a/queue/btrfs-reloc-clear-DEAD_RELOC_TREE-bit-for-orphan-roo.patch +++ b/queue/btrfs-reloc-clear-DEAD_RELOC_TREE-bit-for-orphan-roo.patch @@ -1,9 +1,8 @@ -From 1dae7e0e58b484eaa43d530f211098fdeeb0f404 Mon Sep 17 00:00:00 2001 +From a05dadfa77223e34ebe50593a68c15eede90b091 Mon Sep 17 00:00:00 2001 From: Qu Wenruo <wqu@suse.com> Date: Wed, 20 May 2020 14:58:51 +0800 -Subject: btrfs: reloc: clear DEAD_RELOC_TREE bit for orphan roots to prevent runaway balance - -From: Qu Wenruo <wqu@suse.com> +Subject: [PATCH] btrfs: reloc: clear DEAD_RELOC_TREE bit for orphan roots to + prevent runaway balance commit 1dae7e0e58b484eaa43d530f211098fdeeb0f404 upstream. @@ -38,14 +37,13 @@ Signed-off-by: David Sterba <dsterba@suse.com> [Manually solve the conflicts due to no btrfs root refs rework] Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> ---- - fs/btrfs/relocation.c | 2 ++ - 1 file changed, 2 insertions(+) - +diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c +index 958e6ddd1943..4147b569c64c 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c -@@ -2540,6 +2540,8 @@ again: +@@ -2497,6 +2497,8 @@ void merge_reloc_roots(struct reloc_control *rc) if (!IS_ERR(root)) { if (root->reloc_root == reloc_root) root->reloc_root = NULL; @@ -54,3 +52,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> } list_del_init(&reloc_root->root_list); +-- +2.27.0 + diff --git a/queue/btrfs-reloc-fix-reloc-root-leak-and-NULL-pointer-der.patch b/queue/btrfs-reloc-fix-reloc-root-leak-and-NULL-pointer-der.patch index f0d35b35..5de93390 100644 --- a/queue/btrfs-reloc-fix-reloc-root-leak-and-NULL-pointer-der.patch +++ b/queue/btrfs-reloc-fix-reloc-root-leak-and-NULL-pointer-der.patch @@ -1,9 +1,8 @@ -From 51415b6c1b117e223bc083e30af675cb5c5498f3 Mon Sep 17 00:00:00 2001 +From d54a69a21693aa117ee14b0e16892e39996524c9 Mon Sep 17 00:00:00 2001 From: Qu Wenruo <wqu@suse.com> Date: Tue, 19 May 2020 10:13:20 +0800 -Subject: btrfs: reloc: fix reloc root leak and NULL pointer dereference - -From: Qu Wenruo <wqu@suse.com> +Subject: [PATCH] btrfs: reloc: fix reloc root leak and NULL pointer + dereference commit 51415b6c1b117e223bc083e30af675cb5c5498f3 upstream. @@ -98,14 +97,13 @@ Signed-off-by: David Sterba <dsterba@suse.com> [Manually solve the conflicts due to no btrfs root refs rework] Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> ---- - fs/btrfs/relocation.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - +diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c +index 48b17ffc9d7d..958e6ddd1943 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c -@@ -2525,12 +2525,10 @@ again: +@@ -2482,12 +2482,10 @@ void merge_reloc_roots(struct reloc_control *rc) reloc_root = list_entry(reloc_roots.next, struct btrfs_root, root_list); @@ -119,7 +117,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ret = merge_reloc_root(rc, root); if (ret) { if (list_empty(&reloc_root->root_list)) -@@ -2539,6 +2537,11 @@ again: +@@ -2496,6 +2494,11 @@ void merge_reloc_roots(struct reloc_control *rc) goto out; } } else { @@ -131,3 +129,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> list_del_init(&reloc_root->root_list); /* Don't forget to queue this reloc root for cleanup */ list_add_tail(&reloc_root->reloc_dirty_list, +-- +2.27.0 + diff --git a/queue/ceph-handle-zero-length-feature-mask-in-session-mess.patch b/queue/ceph-handle-zero-length-feature-mask-in-session-mess.patch index 4d8fdda5..59da0fd5 100644 --- a/queue/ceph-handle-zero-length-feature-mask-in-session-mess.patch +++ b/queue/ceph-handle-zero-length-feature-mask-in-session-mess.patch @@ -1,4 +1,4 @@ -From 02e37571f9e79022498fd0525c073b07e9d9ac69 Mon Sep 17 00:00:00 2001 +From 81b727ea95eb7b0c29d35a572b405207d843fd3b Mon Sep 17 00:00:00 2001 From: Jeff Layton <jlayton@kernel.org> Date: Tue, 4 Aug 2020 12:31:56 -0400 Subject: [PATCH] ceph: handle zero-length feature mask in session messages @@ -22,12 +22,13 @@ Signed-off-by: Jeff Layton <jlayton@kernel.org> Reviewed-by: Ilya Dryomov <idryomov@gmail.com> Tested-by: Patrick Donnelly <pdonnell@redhat.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c -index 1095802ad9bd..4a26862d7667 100644 +index 7d5d66116724..6eddc935d8ce 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c -@@ -3358,8 +3358,10 @@ static void handle_session(struct ceph_mds_session *session, +@@ -3053,8 +3053,10 @@ static void handle_session(struct ceph_mds_session *session, goto bad; /* version >= 3, feature bits */ ceph_decode_32_safe(&p, end, len, bad); diff --git a/queue/dm-use-bio_uninit-instead-of-bio_disassociate_blkg.patch b/queue/dm-use-bio_uninit-instead-of-bio_disassociate_blkg.patch index 68762b04..686aadef 100644 --- a/queue/dm-use-bio_uninit-instead-of-bio_disassociate_blkg.patch +++ b/queue/dm-use-bio_uninit-instead-of-bio_disassociate_blkg.patch @@ -1,4 +1,4 @@ -From c60f0217f4b366042269c9e73d2e79b6217f17c6 Mon Sep 17 00:00:00 2001 +From 2de09cf3f91e4ba9858b548a783036267146e4ac Mon Sep 17 00:00:00 2001 From: Christoph Hellwig <hch@lst.de> Date: Sat, 27 Jun 2020 09:31:46 +0200 Subject: [PATCH] dm: use bio_uninit instead of bio_disassociate_blkg @@ -15,6 +15,7 @@ the bio_init calls used to initialize them. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/md/dm.c b/drivers/md/dm.c index fecefe9a7302..9e7765ea73a9 100644 diff --git a/queue/dmaengine-fsl-edma-fix-wrong-tcd-endianness-for-big-.patch b/queue/dmaengine-fsl-edma-fix-wrong-tcd-endianness-for-big-.patch index 1e250ab6..c914b209 100644 --- a/queue/dmaengine-fsl-edma-fix-wrong-tcd-endianness-for-big-.patch +++ b/queue/dmaengine-fsl-edma-fix-wrong-tcd-endianness-for-big-.patch @@ -1,4 +1,4 @@ -From 8678c71c17721e0f771f135967ef0cce8f69ce9a Mon Sep 17 00:00:00 2001 +From b4ae43f38f96a82bb26a2f47b0c0b31d71cf2d0a Mon Sep 17 00:00:00 2001 From: Angelo Dureghello <angelo.dureghello@timesys.com> Date: Thu, 2 Jul 2020 00:52:05 +0200 Subject: [PATCH] dmaengine: fsl-edma: fix wrong tcd endianness for big-endian @@ -19,12 +19,13 @@ Signed-off-by: Angelo Dureghello <angelo.dureghello@timesys.com> Reported-by: kbuild test robot <lkp@intel.com> Link: https://lore.kernel.org/r/20200701225205.1674463-1-angelo.dureghello@timesys.com Signed-off-by: Vinod Koul <vkoul@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c -index 4550818cca4a..930ae268c497 100644 +index 680b2a00a953..c459c8eb96aa 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c -@@ -352,26 +352,28 @@ static void fsl_edma_set_tcd_regs(struct fsl_edma_chan *fsl_chan, +@@ -320,26 +320,28 @@ static void fsl_edma_set_tcd_regs(struct fsl_edma_chan *fsl_chan, /* * TCD parameters are stored in struct fsl_edma_hw_tcd in little * endian format. However, we need to load the TCD registers in diff --git a/queue/dmaengine-ioat-setting-ioat-timeout-as-module-parame.patch b/queue/dmaengine-ioat-setting-ioat-timeout-as-module-parame.patch index 9d718340..1f4b3251 100644 --- a/queue/dmaengine-ioat-setting-ioat-timeout-as-module-parame.patch +++ b/queue/dmaengine-ioat-setting-ioat-timeout-as-module-parame.patch @@ -1,4 +1,4 @@ -From 87730ccbddcb48478b1b88e88b14e73424130764 Mon Sep 17 00:00:00 2001 +From 260d3df5edc7941c13a9b4f397d2ba9963607ffc Mon Sep 17 00:00:00 2001 From: Leonid Ravich <Leonid.Ravich@emc.com> Date: Wed, 1 Jul 2020 21:48:12 +0300 Subject: [PATCH] dmaengine: ioat setting ioat timeout as module parameter @@ -13,9 +13,10 @@ Signed-off-by: Leonid Ravich <Leonid.Ravich@emc.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> Link: https://lore.kernel.org/r/20200701184816.29138-1-leonid.ravich@dell.com Signed-off-by: Vinod Koul <vkoul@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c -index 8ad0ad861c86..fd782aee02d9 100644 +index 18c011e57592..8e2a4d1f0be5 100644 --- a/drivers/dma/ioat/dma.c +++ b/drivers/dma/ioat/dma.c @@ -26,6 +26,18 @@ @@ -38,10 +39,10 @@ index 8ad0ad861c86..fd782aee02d9 100644 "DMA Transfer Source Address Error", "DMA Transfer Destination Address Error", diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h -index e6b622e1ba92..f7f31fdf14cf 100644 +index b8e8e0b9693c..4ac9134962f3 100644 --- a/drivers/dma/ioat/dma.h +++ b/drivers/dma/ioat/dma.h -@@ -104,8 +104,6 @@ struct ioatdma_chan { +@@ -99,8 +99,6 @@ struct ioatdma_chan { #define IOAT_RUN 5 #define IOAT_CHAN_ACTIVE 6 struct timer_list timer; diff --git a/queue/dmaengine-tegra210-adma-Fix-runtime-PM-imbalance-on-.patch b/queue/dmaengine-tegra210-adma-Fix-runtime-PM-imbalance-on-.patch index 6976d824..0e210683 100644 --- a/queue/dmaengine-tegra210-adma-Fix-runtime-PM-imbalance-on-.patch +++ b/queue/dmaengine-tegra210-adma-Fix-runtime-PM-imbalance-on-.patch @@ -1,4 +1,4 @@ -From 5b78fac4b1ba731cf4177fdbc1e3a4661521bcd0 Mon Sep 17 00:00:00 2001 +From 54f4e20204391ea27e162ce53b91c153eedaf96e Mon Sep 17 00:00:00 2001 From: Dinghao Liu <dinghao.liu@zju.edu.cn> Date: Wed, 24 Jun 2020 14:46:26 +0800 Subject: [PATCH] dmaengine: tegra210-adma: Fix runtime PM imbalance on error @@ -13,12 +13,13 @@ Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> Reviewed-by: Jon Hunter <jonathanh@nvidia.com> Link: https://lore.kernel.org/r/20200624064626.19855-1-dinghao.liu@zju.edu.cn Signed-off-by: Vinod Koul <vkoul@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c -index db58d7e4f9fe..c5fa2ef74abc 100644 +index 5f30a22c8723..4373116b579c 100644 --- a/drivers/dma/tegra210-adma.c +++ b/drivers/dma/tegra210-adma.c -@@ -658,6 +658,7 @@ static int tegra_adma_alloc_chan_resources(struct dma_chan *dc) +@@ -666,6 +666,7 @@ static int tegra_adma_alloc_chan_resources(struct dma_chan *dc) ret = pm_runtime_get_sync(tdc2dev(tdc)); if (ret < 0) { @@ -26,7 +27,7 @@ index db58d7e4f9fe..c5fa2ef74abc 100644 free_irq(tdc->irq, tdc); return ret; } -@@ -869,8 +870,10 @@ static int tegra_adma_probe(struct platform_device *pdev) +@@ -877,8 +878,10 @@ static int tegra_adma_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); ret = pm_runtime_get_sync(&pdev->dev); diff --git a/queue/drivers-firmware-psci-Fix-memory-leakage-in-alloc_in.patch b/queue/drivers-firmware-psci-Fix-memory-leakage-in-alloc_in.patch index 17028fbf..703c9a29 100644 --- a/queue/drivers-firmware-psci-Fix-memory-leakage-in-alloc_in.patch +++ b/queue/drivers-firmware-psci-Fix-memory-leakage-in-alloc_in.patch @@ -1,4 +1,4 @@ -From c377e67c6271954969384f9be1b1b71de13eba30 Mon Sep 17 00:00:00 2001 +From 3e12ca325abfb157533613ff65f04b4cd33120e2 Mon Sep 17 00:00:00 2001 From: Gavin Shan <gshan@redhat.com> Date: Tue, 30 Jun 2020 17:52:27 +1000 Subject: [PATCH] drivers/firmware/psci: Fix memory leakage in @@ -15,9 +15,10 @@ Signed-off-by: Gavin Shan <gshan@redhat.com> Reviewed-by: Sudeep Holla <sudeep.holla@arm.com> Link: https://lore.kernel.org/r/20200630075227.199624-1-gshan@redhat.com Signed-off-by: Will Deacon <will@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/firmware/psci/psci_checker.c b/drivers/firmware/psci/psci_checker.c -index 873841af8d57..d9b1a2d71223 100644 +index f3659443f8c2..d89c0dd5159a 100644 --- a/drivers/firmware/psci/psci_checker.c +++ b/drivers/firmware/psci/psci_checker.c @@ -157,8 +157,10 @@ static int alloc_init_cpu_groups(cpumask_var_t **pcpu_groups) diff --git a/queue/drivers-net-wan-lapbether-Fixed-the-value-of-hard_he.patch b/queue/drivers-net-wan-lapbether-Fixed-the-value-of-hard_he.patch index cb8c66af..3b0b5ec5 100644 --- a/queue/drivers-net-wan-lapbether-Fixed-the-value-of-hard_he.patch +++ b/queue/drivers-net-wan-lapbether-Fixed-the-value-of-hard_he.patch @@ -1,4 +1,4 @@ -From 9dc829a135fb5927f1519de11286e2bbb79f5b66 Mon Sep 17 00:00:00 2001 +From a13140dace7cd7ab6eec3203ddd0c3009d070955 Mon Sep 17 00:00:00 2001 From: Xie He <xie.he.0141@gmail.com> Date: Sun, 5 Jul 2020 17:45:21 -0700 Subject: [PATCH] drivers/net/wan/lapbether: Fixed the value of hard_header_len @@ -19,9 +19,10 @@ SOCK_DGRAM sockets. Signed-off-by: Xie He <xie.he.0141@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c -index e30d91a38cfb..284832314f31 100644 +index 0f1217b506ad..5a6f27298b90 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c @@ -303,7 +303,6 @@ static void lapbeth_setup(struct net_device *dev) diff --git a/queue/drivers-perf-Fix-kernel-panic-when-rmmod-PMU-modules.patch b/queue/drivers-perf-Fix-kernel-panic-when-rmmod-PMU-modules.patch index ab6beb41..001dcbfe 100644 --- a/queue/drivers-perf-Fix-kernel-panic-when-rmmod-PMU-modules.patch +++ b/queue/drivers-perf-Fix-kernel-panic-when-rmmod-PMU-modules.patch @@ -1,4 +1,4 @@ -From be843d6b1cc806336a24c0b9caca8a1a47a6662f Mon Sep 17 00:00:00 2001 +From 60822720f1a44b78f5f4af4b9693739128310871 Mon Sep 17 00:00:00 2001 From: Qi Liu <liuqi115@huawei.com> Date: Thu, 16 Jul 2020 17:19:25 +0800 Subject: [PATCH] drivers/perf: Fix kernel panic when rmmod PMU modules during @@ -54,6 +54,7 @@ Reviewed-by: John Garry <john.garry@huawei.com> Link: https://lore.kernel.org/r/1594891165-8228-1-git-send-email-liuqi115@huawei.com Signed-off-by: Will Deacon <will@kernel.org> [PG: drop fsl DDR portion ; not present until v5.3+ kernels.] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c index 10f335b64931..f22e223cc3b3 100644 diff --git a/queue/drivers-perf-Prevent-forced-unbinding-of-PMU-drivers.patch b/queue/drivers-perf-Prevent-forced-unbinding-of-PMU-drivers.patch index 33083462..2f9c6da0 100644 --- a/queue/drivers-perf-Prevent-forced-unbinding-of-PMU-drivers.patch +++ b/queue/drivers-perf-Prevent-forced-unbinding-of-PMU-drivers.patch @@ -1,4 +1,4 @@ -From 360c0cc064cf9dca84ac27f8d25d87f392c9743b Mon Sep 17 00:00:00 2001 +From a559dbb1d1a75a0bcda5c77af6a0f06547568027 Mon Sep 17 00:00:00 2001 From: Qi Liu <liuqi115@huawei.com> Date: Fri, 17 Jul 2020 16:49:23 +0800 Subject: [PATCH] drivers/perf: Prevent forced unbinding of PMU drivers @@ -18,6 +18,7 @@ Reviewed-by: John Garry <john.garry@huawei.com> Link: https://lore.kernel.org/r/1594975763-32966-1-git-send-email-liuqi115@huawei.com Signed-off-by: Will Deacon <will@kernel.org> [PG: drop fsl DDR portion ; not present until v5.3+ kernels.] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/perf/arm-cci.c b/drivers/perf/arm-cci.c index 8f8606b9bc9e..aca4570f78a8 100644 diff --git a/queue/drm-amd-display-Check-DMCU-Exists-Before-Loading.patch b/queue/drm-amd-display-Check-DMCU-Exists-Before-Loading.patch index 88662699..f6ffde63 100644 --- a/queue/drm-amd-display-Check-DMCU-Exists-Before-Loading.patch +++ b/queue/drm-amd-display-Check-DMCU-Exists-Before-Loading.patch @@ -1,4 +1,4 @@ -From 4e4b84ffc2e2576aa5c04ff0b43bc900fc5d52ba Mon Sep 17 00:00:00 2001 +From 0415424672af044d52461045528bc34e8e153c95 Mon Sep 17 00:00:00 2001 From: "Jerry (Fangzhi) Zuo" <Jerry.Zuo@amd.com> Date: Fri, 24 Apr 2020 14:09:23 -0400 Subject: [PATCH] drm/amd/display: Check DMCU Exists Before Loading @@ -9,6 +9,7 @@ Signed-off-by: Jerry (Fangzhi) Zuo <Jerry.Zuo@amd.com> Reviewed-by: Hersen Wu <hersenxs.wu@amd.com> Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index ab7ce802c164..1557bd9f0b80 100644 diff --git a/queue/drm-amd-powerplay-fix-a-crash-when-overclocking-Vega.patch b/queue/drm-amd-powerplay-fix-a-crash-when-overclocking-Vega.patch index 96779564..9a214905 100644 --- a/queue/drm-amd-powerplay-fix-a-crash-when-overclocking-Vega.patch +++ b/queue/drm-amd-powerplay-fix-a-crash-when-overclocking-Vega.patch @@ -1,4 +1,4 @@ -From 88bb16ad998a0395fe4b346b7d3f621aaa0a2324 Mon Sep 17 00:00:00 2001 +From ad40c58ec476e2b09daab153d4652748460ee8f7 Mon Sep 17 00:00:00 2001 From: Qiu Wenbo <qiuwenbo@phytium.com.cn> Date: Fri, 17 Jul 2020 15:09:57 +0800 Subject: [PATCH] drm/amd/powerplay: fix a crash when overclocking Vega M @@ -15,12 +15,13 @@ Reviewed-by: Evan Quan <evan.quan@amd.com> Signed-off-by: Qiu Wenbo <qiuwenbo@phytium.com.cn> 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/vegam_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c -index 3da71a088b92..0ecc18b55ffb 100644 +index 1e69300f6175..d33ae5ba8fbf 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c -@@ -644,9 +644,6 @@ static int vegam_get_dependency_volt_by_clk(struct pp_hwmgr *hwmgr, +@@ -642,9 +642,6 @@ static int vegam_get_dependency_volt_by_clk(struct pp_hwmgr *hwmgr, /* sclk is bigger than max sclk in the dependence table */ *voltage |= (dep_table->entries[i - 1].vddc * VOLTAGE_SCALE) << VDDC_SHIFT; @@ -30,7 +31,7 @@ index 3da71a088b92..0ecc18b55ffb 100644 if (SMU7_VOLTAGE_CONTROL_NONE == data->vddci_control) *voltage |= (data->vbios_boot_state.vddci_bootup_value * -@@ -654,8 +651,13 @@ static int vegam_get_dependency_volt_by_clk(struct pp_hwmgr *hwmgr, +@@ -652,8 +649,13 @@ static int vegam_get_dependency_volt_by_clk(struct pp_hwmgr *hwmgr, else if (dep_table->entries[i - 1].vddci) *voltage |= (dep_table->entries[i - 1].vddci * VOLTAGE_SCALE) << VDDC_SHIFT; diff --git a/queue/drm-amdgpu-Fix-NULL-dereference-in-dpm-sysfs-handler.patch b/queue/drm-amdgpu-Fix-NULL-dereference-in-dpm-sysfs-handler.patch index 2482b21b..6d63b1ec 100644 --- a/queue/drm-amdgpu-Fix-NULL-dereference-in-dpm-sysfs-handler.patch +++ b/queue/drm-amdgpu-Fix-NULL-dereference-in-dpm-sysfs-handler.patch @@ -1,4 +1,4 @@ -From 3d1724b5c0a1b5ea6180392d44ec6808d606e2f7 Mon Sep 17 00:00:00 2001 +From d6fe87308ef477c2dfdd4aa00b1a988b5ebf138d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= <me@woland.xyz> Date: Sun, 19 Jul 2020 17:54:53 +0200 Subject: [PATCH] drm/amdgpu: Fix NULL dereference in dpm sysfs handlers @@ -19,6 +19,7 @@ sudo sh -c 'echo -n 1 > /sys/class/drm/card0/device/pp_dpm_sclk' Signed-off-by: Paweł Gronowski <me@woland.xyz> 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/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c index 059f99534d77..557e8deadc9c 100644 diff --git a/queue/drm-nouveau-i2c-g94-increase-NV_PMGR_DP_AUXCTL_TRANS.patch b/queue/drm-nouveau-i2c-g94-increase-NV_PMGR_DP_AUXCTL_TRANS.patch index 6ebe34d3..2fbd8e23 100644 --- a/queue/drm-nouveau-i2c-g94-increase-NV_PMGR_DP_AUXCTL_TRANS.patch +++ b/queue/drm-nouveau-i2c-g94-increase-NV_PMGR_DP_AUXCTL_TRANS.patch @@ -1,4 +1,4 @@ -From 0156e76d388310a490aeb0f2fbb5b284ded3aecc Mon Sep 17 00:00:00 2001 +From 08871ab1709fdc7e2b594b460d2a142f4673c12b Mon Sep 17 00:00:00 2001 From: Ben Skeggs <bskeggs@redhat.com> Date: Tue, 23 Jun 2020 16:39:13 +1000 Subject: [PATCH] drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ @@ -10,6 +10,7 @@ Tegra TRM says worst-case reply time is 1216us, and this should fix some spurious timeouts that have been popping up. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c index c8ab1b5741a3..db7769cb33eb 100644 diff --git a/queue/enetc-Remove-the-mdio-bus-on-PF-probe-bailout.patch b/queue/enetc-Remove-the-mdio-bus-on-PF-probe-bailout.patch index 529b4912..fb568c24 100644 --- a/queue/enetc-Remove-the-mdio-bus-on-PF-probe-bailout.patch +++ b/queue/enetc-Remove-the-mdio-bus-on-PF-probe-bailout.patch @@ -1,4 +1,4 @@ -From 26cb7085c8984e5b71d65c374a135134ed8cabb3 Mon Sep 17 00:00:00 2001 +From b322dc148f6e4c2425d8cf905845853fb5d08c7c Mon Sep 17 00:00:00 2001 From: Claudiu Manoil <claudiu.manoil@nxp.com> Date: Wed, 22 Jul 2020 17:40:12 +0300 Subject: [PATCH] enetc: Remove the mdio bus on PF probe bailout @@ -50,12 +50,13 @@ Call trace: Fixes: ebfcb23d62ab ("enetc: Add ENETC PF level external MDIO support") Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c -index 4fac57dbb3c8..7a9675bd36e8 100644 +index 78287c517095..32c1e9533b14 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c -@@ -906,6 +906,7 @@ static int enetc_pf_probe(struct pci_dev *pdev, +@@ -880,6 +880,7 @@ static int enetc_pf_probe(struct pci_dev *pdev, return 0; err_reg_netdev: diff --git a/queue/fbdev-Detect-integer-underflow-at-struct-fbcon_ops-c.patch b/queue/fbdev-Detect-integer-underflow-at-struct-fbcon_ops-c.patch index 4159ea10..45d03483 100644 --- a/queue/fbdev-Detect-integer-underflow-at-struct-fbcon_ops-c.patch +++ b/queue/fbdev-Detect-integer-underflow-at-struct-fbcon_ops-c.patch @@ -1,4 +1,4 @@ -From 033724d6864245a11f8e04c066002e6ad22b3fd0 Mon Sep 17 00:00:00 2001 +From 2c98afab0105d9744a8204f4f291a9a7b85e2b4b Mon Sep 17 00:00:00 2001 From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Date: Wed, 15 Jul 2020 10:51:02 +0900 Subject: [PATCH] fbdev: Detect integer underflow at "struct @@ -55,6 +55,7 @@ Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200715015102.3814-1-penguin-kernel@I-love.SAKURA.ne.jp Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/video/fbdev/core/bitblit.c b/drivers/video/fbdev/core/bitblit.c index ca935c09a261..35ebeeccde4d 100644 diff --git a/queue/fpga-dfl-fix-bug-in-port-reset-handshake.patch b/queue/fpga-dfl-fix-bug-in-port-reset-handshake.patch index 8cc0eab1..f2fbd478 100644 --- a/queue/fpga-dfl-fix-bug-in-port-reset-handshake.patch +++ b/queue/fpga-dfl-fix-bug-in-port-reset-handshake.patch @@ -1,4 +1,4 @@ -From 8614afd689df59d9ce019439389be20bd788a897 Mon Sep 17 00:00:00 2001 +From 8b08001d5ba895cf93925affda9c6c347c25bf74 Mon Sep 17 00:00:00 2001 From: Matthew Gerlach <matthew.gerlach@linux.intel.com> Date: Mon, 13 Jul 2020 14:10:03 +0800 Subject: [PATCH] fpga: dfl: fix bug in port reset handshake @@ -14,12 +14,13 @@ Signed-off-by: Xu Yilun <yilun.xu@intel.com> Acked-by: Wu Hao <hao.wu@intel.com> Reviewed-by: Tom Rix <trix@redhat.com> Signed-off-by: Moritz Fischer <mdf@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/fpga/dfl-afu-main.c b/drivers/fpga/dfl-afu-main.c -index b0c31789a909..3fa2c5992173 100644 +index 02baa6a227c0..fc048f9a99b1 100644 --- a/drivers/fpga/dfl-afu-main.c +++ b/drivers/fpga/dfl-afu-main.c -@@ -83,7 +83,8 @@ int __afu_port_disable(struct platform_device *pdev) +@@ -79,7 +79,8 @@ static int port_disable(struct platform_device *pdev) * on this port and minimum soft reset pulse width has elapsed. * Driver polls port_soft_reset_ack to determine if reset done by HW. */ diff --git a/queue/fuse-fix-weird-page-warning.patch b/queue/fuse-fix-weird-page-warning.patch index 70ba1a76..ec95e597 100644 --- a/queue/fuse-fix-weird-page-warning.patch +++ b/queue/fuse-fix-weird-page-warning.patch @@ -1,4 +1,4 @@ -From 94edac5cae346a101864dd530b1a523fc94ffeac Mon Sep 17 00:00:00 2001 +From 7e4bd865a160396d7c622193fea5777c3803ebe7 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi <mszeredi@redhat.com> Date: Tue, 19 May 2020 14:50:37 +0200 Subject: [PATCH] fuse: fix weird page warning @@ -11,6 +11,7 @@ Reported-by: Nikolaus Rath <Nikolaus@rath.org> Reported-by: Hugh Dickins <hughd@google.com> Fixes: 62906027091f ("mm: add PageWaiters indicating tasks are waiting for a page bit") Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 186468fba82e..9b7ddd7f9691 100644 diff --git a/queue/gpio-arizona-handle-pm_runtime_get_sync-failure-case.patch b/queue/gpio-arizona-handle-pm_runtime_get_sync-failure-case.patch index dd03753b..991040bb 100644 --- a/queue/gpio-arizona-handle-pm_runtime_get_sync-failure-case.patch +++ b/queue/gpio-arizona-handle-pm_runtime_get_sync-failure-case.patch @@ -1,4 +1,4 @@ -From e6f390a834b56583e6fc0949822644ce92fbb107 Mon Sep 17 00:00:00 2001 +From 4b3f2486b91a34fbe43b246c3adfb9d357d0b449 Mon Sep 17 00:00:00 2001 From: Navid Emamdoost <navid.emamdoost@gmail.com> Date: Thu, 4 Jun 2020 21:52:07 -0500 Subject: [PATCH] gpio: arizona: handle pm_runtime_get_sync failure case @@ -13,9 +13,10 @@ Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://lore.kernel.org/r/20200605025207.65719-1-navid.emamdoost@gmail.com Signed-off-by: Linus Walleij <linus.walleij@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpio/gpio-arizona.c b/drivers/gpio/gpio-arizona.c -index 5640efe5e750..7520a13b4c7c 100644 +index c07fad975049..f86873345201 100644 --- a/drivers/gpio/gpio-arizona.c +++ b/drivers/gpio/gpio-arizona.c @@ -106,6 +106,7 @@ static int arizona_gpio_direction_out(struct gpio_chip *chip, diff --git a/queue/gpio-arizona-put-pm_runtime-in-case-of-failure.patch b/queue/gpio-arizona-put-pm_runtime-in-case-of-failure.patch index 1f04a4d5..4974de63 100644 --- a/queue/gpio-arizona-put-pm_runtime-in-case-of-failure.patch +++ b/queue/gpio-arizona-put-pm_runtime-in-case-of-failure.patch @@ -1,4 +1,4 @@ -From 861254d826499944cb4d9b5a15f5a794a6b99a69 Mon Sep 17 00:00:00 2001 +From 32effed7646599a7175e2f4bdd2c8d4400cd6630 Mon Sep 17 00:00:00 2001 From: Navid Emamdoost <navid.emamdoost@gmail.com> Date: Thu, 4 Jun 2020 22:00:52 -0500 Subject: [PATCH] gpio: arizona: put pm_runtime in case of failure @@ -13,9 +13,10 @@ Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://lore.kernel.org/r/20200605030052.78235-1-navid.emamdoost@gmail.com Signed-off-by: Linus Walleij <linus.walleij@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpio/gpio-arizona.c b/drivers/gpio/gpio-arizona.c -index 7520a13b4c7c..5bda38e0780f 100644 +index f86873345201..6e192581495b 100644 --- a/drivers/gpio/gpio-arizona.c +++ b/drivers/gpio/gpio-arizona.c @@ -64,6 +64,7 @@ static int arizona_gpio_get(struct gpio_chip *chip, unsigned offset) diff --git a/queue/hippi-Fix-a-size-used-in-a-pci_free_consistent-in-an.patch b/queue/hippi-Fix-a-size-used-in-a-pci_free_consistent-in-an.patch index 91cb72ed..ebd240e6 100644 --- a/queue/hippi-Fix-a-size-used-in-a-pci_free_consistent-in-an.patch +++ b/queue/hippi-Fix-a-size-used-in-a-pci_free_consistent-in-an.patch @@ -1,4 +1,4 @@ -From 3195c4706b00106aa82c73acd28340fa8fc2bfc1 Mon Sep 17 00:00:00 2001 +From c66f52a36d26b991924d2104ebbd1e7f12ec8076 Mon Sep 17 00:00:00 2001 From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Date: Tue, 14 Jul 2020 13:00:27 +0200 Subject: [PATCH] hippi: Fix a size used in a 'pci_free_consistent()' in an @@ -14,12 +14,13 @@ Fix it and have it consistent with the corresponding call in 'rr_close()'. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c -index 2a6ec5394966..a4b3fce69ecd 100644 +index 7b9350dbebdd..dd6393394bab 100644 --- a/drivers/net/hippi/rrunner.c +++ b/drivers/net/hippi/rrunner.c -@@ -1242,7 +1242,7 @@ static int rr_open(struct net_device *dev) +@@ -1244,7 +1244,7 @@ static int rr_open(struct net_device *dev) rrpriv->info = NULL; } if (rrpriv->rx_ctrl) { diff --git a/queue/hwmon-adm1275-Make-sure-we-are-reading-enough-data-f.patch b/queue/hwmon-adm1275-Make-sure-we-are-reading-enough-data-f.patch index e7d983b1..31aa0251 100644 --- a/queue/hwmon-adm1275-Make-sure-we-are-reading-enough-data-f.patch +++ b/queue/hwmon-adm1275-Make-sure-we-are-reading-enough-data-f.patch @@ -1,4 +1,4 @@ -From 6d1d41c075a1a54ba03370e268171fec20e06563 Mon Sep 17 00:00:00 2001 +From 57871ba53b702d030b7a10f18a7892da83374e9d Mon Sep 17 00:00:00 2001 From: Chu Lin <linchuyuan@google.com> Date: Thu, 9 Jul 2020 04:06:12 +0000 Subject: [PATCH] hwmon: (adm1275) Make sure we are reading enough data for @@ -28,12 +28,13 @@ The change is only tested on adm1272. Signed-off-by: Chu Lin <linchuyuan@google.com> Link: https://lore.kernel.org/r/20200709040612.3977094-1-linchuyuan@google.com Signed-off-by: Guenter Roeck <linux@roeck-us.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hwmon/pmbus/adm1275.c b/drivers/hwmon/pmbus/adm1275.c -index e25f541227da..19317575d1c6 100644 +index 82052b6611c9..8104d8ad6086 100644 --- a/drivers/hwmon/pmbus/adm1275.c +++ b/drivers/hwmon/pmbus/adm1275.c -@@ -465,6 +465,7 @@ MODULE_DEVICE_TABLE(i2c, adm1275_id); +@@ -355,6 +355,7 @@ MODULE_DEVICE_TABLE(i2c, adm1275_id); static int adm1275_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -41,7 +42,7 @@ index e25f541227da..19317575d1c6 100644 u8 block_buffer[I2C_SMBUS_BLOCK_MAX + 1]; int config, device_config; int ret; -@@ -510,11 +511,16 @@ static int adm1275_probe(struct i2c_client *client, +@@ -400,11 +401,16 @@ static int adm1275_probe(struct i2c_client *client, "Device mismatch: Configured %s, detected %s\n", id->name, mid->name); diff --git a/queue/hwmon-aspeed-pwm-tacho-Avoid-possible-buffer-overflo.patch b/queue/hwmon-aspeed-pwm-tacho-Avoid-possible-buffer-overflo.patch index 30396aa4..26d532b9 100644 --- a/queue/hwmon-aspeed-pwm-tacho-Avoid-possible-buffer-overflo.patch +++ b/queue/hwmon-aspeed-pwm-tacho-Avoid-possible-buffer-overflo.patch @@ -1,4 +1,4 @@ -From bc4071aafcf4d0535ee423b69167696d6c03207d Mon Sep 17 00:00:00 2001 +From 8fb14c849508e5aa317f7b3026d8676da790cba3 Mon Sep 17 00:00:00 2001 From: Evgeny Novikov <novikov@ispras.ru> Date: Fri, 3 Jul 2020 14:15:18 +0300 Subject: [PATCH] hwmon: (aspeed-pwm-tacho) Avoid possible buffer overflow @@ -16,9 +16,10 @@ Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Evgeny Novikov <novikov@ispras.ru> Link: https://lore.kernel.org/r/20200703111518.9644-1-novikov@ispras.ru Signed-off-by: Guenter Roeck <linux@roeck-us.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hwmon/aspeed-pwm-tacho.c b/drivers/hwmon/aspeed-pwm-tacho.c -index 33fb54845bf6..3d8239fd66ed 100644 +index 40c489be62ea..40f3139f1e02 100644 --- a/drivers/hwmon/aspeed-pwm-tacho.c +++ b/drivers/hwmon/aspeed-pwm-tacho.c @@ -851,6 +851,8 @@ static int aspeed_create_fan(struct device *dev, diff --git a/queue/hwmon-nct6775-Accept-PECI-Calibration-as-temperature.patch b/queue/hwmon-nct6775-Accept-PECI-Calibration-as-temperature.patch index 3c501ec5..c259ff5f 100644 --- a/queue/hwmon-nct6775-Accept-PECI-Calibration-as-temperature.patch +++ b/queue/hwmon-nct6775-Accept-PECI-Calibration-as-temperature.patch @@ -1,4 +1,4 @@ -From 8a03746c8baf82e1616f05a1a716d34378dcf780 Mon Sep 17 00:00:00 2001 +From 33408d1f48a14b2f7ea4422e8c2d5a79143ccf9c Mon Sep 17 00:00:00 2001 From: Guenter Roeck <linux@roeck-us.net> Date: Tue, 14 Jul 2020 14:31:11 -0700 Subject: [PATCH] hwmon: (nct6775) Accept PECI Calibration as temperature @@ -19,12 +19,13 @@ Calibration", similar to other chips of the series. Reported-by: Stefan Dietrich <roots@gmx.de> Cc: Stefan Dietrich <roots@gmx.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c -index e7e1ddc1d631..750b08713dee 100644 +index d42bc0883a32..c6b7d6f72520 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c -@@ -786,13 +786,13 @@ static const char *const nct6798_temp_label[] = { +@@ -782,13 +782,13 @@ static const char *const nct6798_temp_label[] = { "Agent1 Dimm1", "BYTE_TEMP0", "BYTE_TEMP1", diff --git a/queue/hwmon-scmi-Fix-potential-buffer-overflow-in-scmi_hwm.patch b/queue/hwmon-scmi-Fix-potential-buffer-overflow-in-scmi_hwm.patch index d5476c1c..05375cba 100644 --- a/queue/hwmon-scmi-Fix-potential-buffer-overflow-in-scmi_hwm.patch +++ b/queue/hwmon-scmi-Fix-potential-buffer-overflow-in-scmi_hwm.patch @@ -1,4 +1,4 @@ -From 3ce17cd2b94907f6d91b81b32848044b84c97606 Mon Sep 17 00:00:00 2001 +From 53ab0556927a9558908f1dc0cc732b678a7a665e Mon Sep 17 00:00:00 2001 From: Cristian Marussi <cristian.marussi@arm.com> Date: Wed, 15 Jul 2020 13:13:38 +0100 Subject: [PATCH] hwmon: (scmi) Fix potential buffer overflow in @@ -19,12 +19,13 @@ Signed-off-by: Cristian Marussi <cristian.marussi@arm.com> Reviewed-by: Sudeep Holla <sudeep.holla@arm.com> Link: https://lore.kernel.org/r/20200715121338.GA18761@e119603-lin.cambridge.arm.com Signed-off-by: Guenter Roeck <linux@roeck-us.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hwmon/scmi-hwmon.c b/drivers/hwmon/scmi-hwmon.c -index 286d3cfda7de..d421e691318b 100644 +index a80183a488c5..8c70f6250241 100644 --- a/drivers/hwmon/scmi-hwmon.c +++ b/drivers/hwmon/scmi-hwmon.c -@@ -147,7 +147,7 @@ static enum hwmon_sensor_types scmi_types[] = { +@@ -99,7 +99,7 @@ static enum hwmon_sensor_types scmi_types[] = { [ENERGY] = hwmon_energy, }; diff --git a/queue/i2c-i2c-qcom-geni-Fix-DMA-transfer-race.patch b/queue/i2c-i2c-qcom-geni-Fix-DMA-transfer-race.patch index d49581a4..3c1dcdb8 100644 --- a/queue/i2c-i2c-qcom-geni-Fix-DMA-transfer-race.patch +++ b/queue/i2c-i2c-qcom-geni-Fix-DMA-transfer-race.patch @@ -1,4 +1,4 @@ -From 02b9aec59243c6240fc42884acc958602146ddf6 Mon Sep 17 00:00:00 2001 +From 21cb514d54a1a88733619ab8c3f708c2af0cc393 Mon Sep 17 00:00:00 2001 From: Douglas Anderson <dianders@chromium.org> Date: Wed, 22 Jul 2020 15:00:21 -0700 Subject: [PATCH] i2c: i2c-qcom-geni: Fix DMA transfer race @@ -43,9 +43,10 @@ Reviewed-by: Akash Asthana <akashast@codeaurora.org> Reviewed-by: Stephen Boyd <swboyd@chromium.org> Reviewed-by: Mukesh Kumar Savaliya <msavaliy@codeaurora.org> Signed-off-by: Wolfram Sang <wsa@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c -index 18d1e4fd4cf3..7f130829bf01 100644 +index 715ddc5d0eac..509fd583de89 100644 --- a/drivers/i2c/busses/i2c-qcom-geni.c +++ b/drivers/i2c/busses/i2c-qcom-geni.c @@ -367,7 +367,6 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, diff --git a/queue/i2c-rcar-always-clear-ICSAR-to-avoid-side-effects.patch b/queue/i2c-rcar-always-clear-ICSAR-to-avoid-side-effects.patch index 761e3d12..eb0f26f5 100644 --- a/queue/i2c-rcar-always-clear-ICSAR-to-avoid-side-effects.patch +++ b/queue/i2c-rcar-always-clear-ICSAR-to-avoid-side-effects.patch @@ -1,4 +1,4 @@ -From eb01597158ffb1853a7a7fc2c57d4c844640f75e Mon Sep 17 00:00:00 2001 +From c47d42f31134d6a0bd47ed12bc494a410b94a18f Mon Sep 17 00:00:00 2001 From: Wolfram Sang <wsa+renesas@sang-engineering.com> Date: Sat, 4 Jul 2020 15:38:29 +0200 Subject: [PATCH] i2c: rcar: always clear ICSAR to avoid side effects @@ -15,12 +15,13 @@ To reproduce: bind and undbind an I2C slave on some bus, run 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..2e3e1bb75013 100644 +index 531c01100b56..36af8fdb6658 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c -@@ -868,6 +868,7 @@ static int rcar_unreg_slave(struct i2c_client *slave) +@@ -865,6 +865,7 @@ static int rcar_unreg_slave(struct i2c_client *slave) /* disable irqs and ensure none is running before clearing ptr */ rcar_i2c_write(priv, ICSIER, 0); rcar_i2c_write(priv, ICSCR, 0); @@ -28,7 +29,7 @@ index a45c4bf1ec01..2e3e1bb75013 100644 synchronize_irq(priv->irq); priv->slave = NULL; -@@ -969,6 +970,8 @@ static int rcar_i2c_probe(struct platform_device *pdev) +@@ -971,6 +972,8 @@ static int rcar_i2c_probe(struct platform_device *pdev) if (ret < 0) goto out_pm_put; diff --git a/queue/i2c-rcar-avoid-race-when-unregistering-slave.patch b/queue/i2c-rcar-avoid-race-when-unregistering-slave.patch index 8728670d..1d8c7a0c 100644 --- a/queue/i2c-rcar-avoid-race-when-unregistering-slave.patch +++ b/queue/i2c-rcar-avoid-race-when-unregistering-slave.patch @@ -1,4 +1,4 @@ -From c7c9e914f9a0478fba4dc6f227cfd69cf84a4063 Mon Sep 17 00:00:00 2001 +From 87dfa2f9d74a1db90eb26c0a4dc7753a460b9710 Mon Sep 17 00:00:00 2001 From: Wolfram Sang <wsa+renesas@sang-engineering.com> Date: Sun, 26 Jul 2020 18:16:06 +0200 Subject: [PATCH] i2c: rcar: avoid race when unregistering slave @@ -22,12 +22,13 @@ Fixes: 7b814d852af6 ("i2c: rcar: avoid race when unregistering slave client") Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> 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 76c615be5aca..9e883474db8c 100644 +index 36af8fdb6658..468f94319d51 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c -@@ -866,12 +866,14 @@ static int rcar_unreg_slave(struct i2c_client *slave) +@@ -862,12 +862,14 @@ static int rcar_unreg_slave(struct i2c_client *slave) WARN_ON(!priv->slave); diff --git a/queue/ieee802154-fix-one-possible-memleak-in-adf7242_probe.patch b/queue/ieee802154-fix-one-possible-memleak-in-adf7242_probe.patch index fdeed49e..e0860c20 100644 --- a/queue/ieee802154-fix-one-possible-memleak-in-adf7242_probe.patch +++ b/queue/ieee802154-fix-one-possible-memleak-in-adf7242_probe.patch @@ -1,4 +1,4 @@ -From 66673f96f0f968b991dc38be06102246919c663c Mon Sep 17 00:00:00 2001 +From 0adc467778c1c3f3fa2105ab37a25bfdc7626507 Mon Sep 17 00:00:00 2001 From: Liu Jian <liujian56@huawei.com> Date: Fri, 17 Jul 2020 17:01:21 +0800 Subject: [PATCH] ieee802154: fix one possible memleak in adf7242_probe @@ -12,12 +12,13 @@ Signed-off-by: Liu Jian <liujian56@huawei.com> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Link: https://lore.kernel.org/r/20200717090121.2143-1-liujian56@huawei.com Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c -index 5a37514e4234..8dbccec6ac86 100644 +index c9392d70e639..3cbdda5e06e5 100644 --- a/drivers/net/ieee802154/adf7242.c +++ b/drivers/net/ieee802154/adf7242.c -@@ -1262,7 +1262,7 @@ static int adf7242_probe(struct spi_device *spi) +@@ -1269,7 +1269,7 @@ static int adf7242_probe(struct spi_device *spi) WQ_MEM_RECLAIM); if (unlikely(!lp->wqueue)) { ret = -ENOMEM; @@ -26,7 +27,7 @@ index 5a37514e4234..8dbccec6ac86 100644 } ret = adf7242_hw_init(lp); -@@ -1294,6 +1294,8 @@ static int adf7242_probe(struct spi_device *spi) +@@ -1301,6 +1301,8 @@ static int adf7242_probe(struct spi_device *spi) return ret; err_hw_init: diff --git a/queue/io-mapping-indicate-mapping-failure.patch b/queue/io-mapping-indicate-mapping-failure.patch index 9a61fd85..27da89a6 100644 --- a/queue/io-mapping-indicate-mapping-failure.patch +++ b/queue/io-mapping-indicate-mapping-failure.patch @@ -1,4 +1,4 @@ -From e0b3e0b1a04367fc15c07f44e78361545b55357c Mon Sep 17 00:00:00 2001 +From 1cf3447755f87f4c84aea5623cc7fe5f5b6af09d Mon Sep 17 00:00:00 2001 From: "Michael J. Ruhl" <michael.j.ruhl@intel.com> Date: Thu, 23 Jul 2020 21:15:46 -0700 Subject: [PATCH] io-mapping: indicate mapping failure @@ -47,12 +47,13 @@ Cc: Daniel Vetter <daniel@ffwll.ch> Cc: <stable@vger.kernel.org> Link: http://lkml.kernel.org/r/20200721171936.81563-1-michael.j.ruhl@intel.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h -index 0beaa3eba155..c75e4d3d8833 100644 +index 6e125e9b4187..b9c91d321240 100644 --- a/include/linux/io-mapping.h +++ b/include/linux/io-mapping.h -@@ -107,9 +107,12 @@ io_mapping_init_wc(struct io_mapping *iomap, +@@ -108,9 +108,12 @@ io_mapping_init_wc(struct io_mapping *iomap, resource_size_t base, unsigned long size) { diff --git a/queue/ipvs-fix-the-connection-sync-failed-in-some-cases.patch b/queue/ipvs-fix-the-connection-sync-failed-in-some-cases.patch index 9b86532f..6045d0cd 100644 --- a/queue/ipvs-fix-the-connection-sync-failed-in-some-cases.patch +++ b/queue/ipvs-fix-the-connection-sync-failed-in-some-cases.patch @@ -1,4 +1,4 @@ -From 8210e344ccb798c672ab237b1a4f241bda08909b Mon Sep 17 00:00:00 2001 +From 9799d32ea5e74d86e61b028908850c71387c3131 Mon Sep 17 00:00:00 2001 From: guodeqing <geffrey.guo@huawei.com> Date: Thu, 16 Jul 2020 16:12:08 +0800 Subject: [PATCH] ipvs: fix the connection sync failed in some cases @@ -20,9 +20,10 @@ Reported-by: zhouxudong <zhouxudong8@huawei.com> Signed-off-by: guodeqing <geffrey.guo@huawei.com> Acked-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c -index 605e0f68f8bd..2b8abbfe018c 100644 +index 8dc892a9dc91..0c1bc654245c 100644 --- a/net/netfilter/ipvs/ip_vs_sync.c +++ b/net/netfilter/ipvs/ip_vs_sync.c @@ -1717,6 +1717,8 @@ static int sync_thread_backup(void *data) diff --git a/queue/mac80211-allow-rx-of-mesh-eapol-frames-with-default-.patch b/queue/mac80211-allow-rx-of-mesh-eapol-frames-with-default-.patch index 69c0285b..a4ee2eb9 100644 --- a/queue/mac80211-allow-rx-of-mesh-eapol-frames-with-default-.patch +++ b/queue/mac80211-allow-rx-of-mesh-eapol-frames-with-default-.patch @@ -1,4 +1,4 @@ -From 0b467b63870d9c05c81456aa9bfee894ab2db3b6 Mon Sep 17 00:00:00 2001 +From fd950e533e52b48ad8d7f1ec578fb4d999ff4c76 Mon Sep 17 00:00:00 2001 From: Markus Theil <markus.theil@tu-ilmenau.de> Date: Thu, 25 Jun 2020 12:42:14 +0200 Subject: [PATCH] mac80211: allow rx of mesh eapol frames with default rx key @@ -24,12 +24,13 @@ Signed-off-by: Markus Theil <markus.theil@tu-ilmenau.de> Link: https://lore.kernel.org/r/20200625104214.50319-1-markus.theil@tu-ilmenau.de [small code cleanups] Signed-off-by: Johannes Berg <johannes.berg@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c -index a88ab6fb16f2..5c5af4b5fc08 100644 +index f9fb8ed934a9..5062532a4028 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -2396,6 +2396,7 @@ static int ieee80211_802_1x_port_control(struct ieee80211_rx_data *rx) +@@ -2305,6 +2305,7 @@ static int ieee80211_802_1x_port_control(struct ieee80211_rx_data *rx) static int ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx, __le16 fc) { @@ -37,7 +38,7 @@ index a88ab6fb16f2..5c5af4b5fc08 100644 struct sk_buff *skb = rx->skb; struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); -@@ -2406,6 +2407,31 @@ static int ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx, __le16 fc) +@@ -2315,6 +2316,31 @@ static int ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx, __le16 fc) if (status->flag & RX_FLAG_DECRYPTED) return 0; diff --git a/queue/mlxsw-destroy-workqueue-when-trap_register-in-mlxsw_.patch b/queue/mlxsw-destroy-workqueue-when-trap_register-in-mlxsw_.patch index 9044c58e..f5530501 100644 --- a/queue/mlxsw-destroy-workqueue-when-trap_register-in-mlxsw_.patch +++ b/queue/mlxsw-destroy-workqueue-when-trap_register-in-mlxsw_.patch @@ -1,4 +1,4 @@ -From 5dbaeb87f2b309936be0aeae00cbc9e7f20ab296 Mon Sep 17 00:00:00 2001 +From a6c234e992420856859758f1091daa3e1130701d Mon Sep 17 00:00:00 2001 From: Liu Jian <liujian56@huawei.com> Date: Mon, 20 Jul 2020 22:31:49 +0800 Subject: [PATCH] mlxsw: destroy workqueue when trap_register in @@ -13,12 +13,13 @@ Fixes: d965465b60ba ("mlxsw: core: Fix possible deadlock") Signed-off-by: Liu Jian <liujian56@huawei.com> Reviewed-by: Ido Schimmel <idosch@mellanox.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/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c -index e9ccd333f61d..d6d6fe64887b 100644 +index 09eb0b56a50f..ad94fb99059a 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c -@@ -710,7 +710,7 @@ static int mlxsw_emad_init(struct mlxsw_core *mlxsw_core) +@@ -593,7 +593,7 @@ static int mlxsw_emad_init(struct mlxsw_core *mlxsw_core) err = mlxsw_core_trap_register(mlxsw_core, &mlxsw_emad_rx_listener, mlxsw_core); if (err) @@ -27,7 +28,7 @@ index e9ccd333f61d..d6d6fe64887b 100644 err = mlxsw_core->driver->basic_trap_groups_set(mlxsw_core); if (err) -@@ -722,6 +722,7 @@ static int mlxsw_emad_init(struct mlxsw_core *mlxsw_core) +@@ -605,6 +605,7 @@ static int mlxsw_emad_init(struct mlxsw_core *mlxsw_core) err_emad_trap_set: mlxsw_core_trap_unregister(mlxsw_core, &mlxsw_emad_rx_listener, mlxsw_core); diff --git a/queue/mm-memcg-fix-refcount-error-while-moving-and-swappin.patch b/queue/mm-memcg-fix-refcount-error-while-moving-and-swappin.patch index d959619c..8b0ae59b 100644 --- a/queue/mm-memcg-fix-refcount-error-while-moving-and-swappin.patch +++ b/queue/mm-memcg-fix-refcount-error-while-moving-and-swappin.patch @@ -1,4 +1,4 @@ -From 8d22a9351035ef2ff12ef163a1091b8b8cf1e49c Mon Sep 17 00:00:00 2001 +From c795ba4053167209f4325b2ba3cae70ba28d1b7b Mon Sep 17 00:00:00 2001 From: Hugh Dickins <hughd@google.com> Date: Thu, 23 Jul 2020 21:15:24 -0700 Subject: [PATCH] mm/memcg: fix refcount error while moving and swapping @@ -31,12 +31,13 @@ Cc: Michal Hocko <mhocko@suse.com> Cc: <stable@vger.kernel.org> Link: http://lkml.kernel.org/r/alpine.LSU.2.11.2007071431050.4726@eggly.anvils Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/memcontrol.c b/mm/memcontrol.c -index c75c4face02e..13f559af1ab6 100644 +index e05bb6ea5771..996f4cbe612f 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c -@@ -5669,7 +5669,6 @@ static void __mem_cgroup_clear_mc(void) +@@ -5300,7 +5300,6 @@ static void __mem_cgroup_clear_mc(void) if (!mem_cgroup_is_root(mc.to)) page_counter_uncharge(&mc.to->memory, mc.moved_swap); @@ -44,7 +45,7 @@ index c75c4face02e..13f559af1ab6 100644 css_put_many(&mc.to->css, mc.moved_swap); mc.moved_swap = 0; -@@ -5860,7 +5859,8 @@ static int mem_cgroup_move_charge_pte_range(pmd_t *pmd, +@@ -5491,7 +5490,8 @@ static int mem_cgroup_move_charge_pte_range(pmd_t *pmd, ent = target.ent; if (!mem_cgroup_move_swap_account(ent, mc.from, mc.to)) { mc.precharge--; diff --git a/queue/mm-memcg-slab-fix-memory-leak-at-non-root-kmem_cache.patch b/queue/mm-memcg-slab-fix-memory-leak-at-non-root-kmem_cache.patch index b63eb6be..8fb13b9a 100644 --- a/queue/mm-memcg-slab-fix-memory-leak-at-non-root-kmem_cache.patch +++ b/queue/mm-memcg-slab-fix-memory-leak-at-non-root-kmem_cache.patch @@ -1,4 +1,4 @@ -From 3eed3df85f53c58c091fa0f6d9dacded5961643f Mon Sep 17 00:00:00 2001 +From 660cfa0c9be90ee5513c3174e89cfc92f9fd116d Mon Sep 17 00:00:00 2001 From: Muchun Song <songmuchun@bytedance.com> Date: Thu, 23 Jul 2020 21:15:27 -0700 Subject: [PATCH] mm: memcg/slab: fix memory leak at non-root kmem_cache @@ -39,6 +39,7 @@ Cc: Shakeel Butt <shakeelb@google.com> Cc: <stable@vger.kernel.org> Link: http://lkml.kernel.org/r/20200716165103.83462-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/slab_common.c b/mm/slab_common.c index f2e9911023a0..0d247ef3057b 100644 diff --git a/queue/mm-mmap.c-close-race-between-munmap-and-expand_upwar.patch b/queue/mm-mmap.c-close-race-between-munmap-and-expand_upwar.patch index 3e3ced33..974a91b6 100644 --- a/queue/mm-mmap.c-close-race-between-munmap-and-expand_upwar.patch +++ b/queue/mm-mmap.c-close-race-between-munmap-and-expand_upwar.patch @@ -1,4 +1,4 @@ -From 5b5d1f54118a1ce928289259b30ef3e315ab5154 Mon Sep 17 00:00:00 2001 +From 4b5eaf8bdf60068c43bbb60df055e16d22cb12dd Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Date: Thu, 23 Jul 2020 21:15:11 -0700 Subject: [PATCH] mm/mmap.c: close race between munmap() and @@ -41,6 +41,7 @@ Cc: Matthew Wilcox <willy@infradead.org> Cc: <stable@vger.kernel.org> [4.20+] Link: http://lkml.kernel.org/r/20200709105309.42495-1-kirill.shutemov@linux.intel.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/mmap.c b/mm/mmap.c index 93aeb7130d91..0b083bf96ff5 100644 diff --git a/queue/net-dp83640-fix-SIOCSHWTSTAMP-to-update-the-struct-w.patch b/queue/net-dp83640-fix-SIOCSHWTSTAMP-to-update-the-struct-w.patch index ed652590..a24d0617 100644 --- a/queue/net-dp83640-fix-SIOCSHWTSTAMP-to-update-the-struct-w.patch +++ b/queue/net-dp83640-fix-SIOCSHWTSTAMP-to-update-the-struct-w.patch @@ -1,4 +1,4 @@ -From 473309fb8372365ad211f425bca760af800e10a7 Mon Sep 17 00:00:00 2001 +From e84f8c1ea847390f9793b27ab3e74a488f6c62b9 Mon Sep 17 00:00:00 2001 From: Sergey Organov <sorganov@gmail.com> Date: Wed, 15 Jul 2020 19:10:00 +0300 Subject: [PATCH] net: dp83640: fix SIOCSHWTSTAMP to update the struct with @@ -18,12 +18,13 @@ Fixes: cb646e2b02b2 ("ptp: Added a clock driver for the National Semiconductor P Signed-off-by: Sergey Organov <sorganov@gmail.com> Acked-by: Richard Cochran <richardcochran@gmail.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c -index ecbd5e0d685c..acb0aae60755 100644 +index cc786eea4a02..1205affd5caa 100644 --- a/drivers/net/phy/dp83640.c +++ b/drivers/net/phy/dp83640.c -@@ -1260,6 +1260,7 @@ static int dp83640_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr) +@@ -1332,6 +1332,7 @@ static int dp83640_hwtstamp(struct phy_device *phydev, struct ifreq *ifr) dp83640->hwts_rx_en = 1; dp83640->layer = PTP_CLASS_L4; dp83640->version = PTP_CLASS_V1; @@ -31,7 +32,7 @@ index ecbd5e0d685c..acb0aae60755 100644 break; case HWTSTAMP_FILTER_PTP_V2_L4_EVENT: case HWTSTAMP_FILTER_PTP_V2_L4_SYNC: -@@ -1267,6 +1268,7 @@ static int dp83640_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr) +@@ -1339,6 +1340,7 @@ static int dp83640_hwtstamp(struct phy_device *phydev, struct ifreq *ifr) dp83640->hwts_rx_en = 1; dp83640->layer = PTP_CLASS_L4; dp83640->version = PTP_CLASS_V2; @@ -39,7 +40,7 @@ index ecbd5e0d685c..acb0aae60755 100644 break; case HWTSTAMP_FILTER_PTP_V2_L2_EVENT: case HWTSTAMP_FILTER_PTP_V2_L2_SYNC: -@@ -1274,6 +1276,7 @@ static int dp83640_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr) +@@ -1346,6 +1348,7 @@ static int dp83640_hwtstamp(struct phy_device *phydev, struct ifreq *ifr) dp83640->hwts_rx_en = 1; dp83640->layer = PTP_CLASS_L2; dp83640->version = PTP_CLASS_V2; @@ -47,7 +48,7 @@ index ecbd5e0d685c..acb0aae60755 100644 break; case HWTSTAMP_FILTER_PTP_V2_EVENT: case HWTSTAMP_FILTER_PTP_V2_SYNC: -@@ -1281,6 +1284,7 @@ static int dp83640_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr) +@@ -1353,6 +1356,7 @@ static int dp83640_hwtstamp(struct phy_device *phydev, struct ifreq *ifr) dp83640->hwts_rx_en = 1; dp83640->layer = PTP_CLASS_L4 | PTP_CLASS_L2; dp83640->version = PTP_CLASS_V2; diff --git a/queue/net-dsa-microchip-call-phy_remove_link_mode-during-p.patch b/queue/net-dsa-microchip-call-phy_remove_link_mode-during-p.patch index f1c1af42..963a7d9c 100644 --- a/queue/net-dsa-microchip-call-phy_remove_link_mode-during-p.patch +++ b/queue/net-dsa-microchip-call-phy_remove_link_mode-during-p.patch @@ -1,4 +1,4 @@ -From 463fbff249eabe54ccf9eff3919950e1fa712b5c Mon Sep 17 00:00:00 2001 +From d6631fb7627639aa76fa5c3d624be23e0bd97259 Mon Sep 17 00:00:00 2001 From: Helmut Grohne <helmut.grohne@intenta.de> Date: Tue, 21 Jul 2020 13:07:39 +0200 Subject: [PATCH] net: dsa: microchip: call phy_remove_link_mode during probe @@ -29,6 +29,7 @@ Signed-off-by: Helmut Grohne <helmut.grohne@intenta.de> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net> [PG: no phy_setup conditional until v5.4-rc1~131^2~329^2] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c index 8ec5678085b0..40dbe94bf9eb 100644 diff --git a/queue/net-ethernet-ave-Fix-error-returns-in-ave_init.patch b/queue/net-ethernet-ave-Fix-error-returns-in-ave_init.patch index ae659602..4cf4547b 100644 --- a/queue/net-ethernet-ave-Fix-error-returns-in-ave_init.patch +++ b/queue/net-ethernet-ave-Fix-error-returns-in-ave_init.patch @@ -1,4 +1,4 @@ -From 1264d7fa3a64d8bea7aebb77253f917947ffda25 Mon Sep 17 00:00:00 2001 +From d2f09251a7528069e1e1eed7aadf1c0b869ca3d8 Mon Sep 17 00:00:00 2001 From: Wang Hai <wanghai38@huawei.com> Date: Fri, 17 Jul 2020 10:50:49 +0800 Subject: [PATCH] net: ethernet: ave: Fix error returns in ave_init @@ -14,9 +14,10 @@ Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wang Hai <wanghai38@huawei.com> Reviewed-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.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/socionext/sni_ave.c b/drivers/net/ethernet/socionext/sni_ave.c -index f2638446b62e..81b554dd7221 100644 +index f4924a435fcd..6a102885fcfd 100644 --- a/drivers/net/ethernet/socionext/sni_ave.c +++ b/drivers/net/ethernet/socionext/sni_ave.c @@ -1191,7 +1191,7 @@ static int ave_init(struct net_device *ndev) diff --git a/queue/net-hns3-fix-error-handling-for-desc-filling.patch b/queue/net-hns3-fix-error-handling-for-desc-filling.patch index d831c0c0..de9ada2f 100644 --- a/queue/net-hns3-fix-error-handling-for-desc-filling.patch +++ b/queue/net-hns3-fix-error-handling-for-desc-filling.patch @@ -1,4 +1,4 @@ -From 2e13500f282a211d786844e989cc29648321d86e Mon Sep 17 00:00:00 2001 +From 460a622f1a50c6ae3c13eee98ff96c5b7a8437a2 Mon Sep 17 00:00:00 2001 From: Yunsheng Lin <linyunsheng@huawei.com> Date: Tue, 21 Jul 2020 19:03:53 +0800 Subject: [PATCH] net: hns3: fix error handling for desc filling @@ -21,6 +21,7 @@ Fixes: 76ad4f0ee747 ("net: hns3: Add support of HNS3 Ethernet Driver for hip08 S Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com> Signed-off-by: Huazhong Tan <tanhuazhong@huawei.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/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h index 0178de087fc0..537caba74107 100644 diff --git a/queue/net-sky2-initialize-return-of-gm_phy_read.patch b/queue/net-sky2-initialize-return-of-gm_phy_read.patch index afc06bbb..2cc6349a 100644 --- a/queue/net-sky2-initialize-return-of-gm_phy_read.patch +++ b/queue/net-sky2-initialize-return-of-gm_phy_read.patch @@ -1,4 +1,4 @@ -From 28b18e4eb515af7c6661c3995c6e3c34412c2874 Mon Sep 17 00:00:00 2001 +From c0a675c603c31508b1f72a7d0400eb83132052c4 Mon Sep 17 00:00:00 2001 From: Tom Rix <trix@redhat.com> Date: Fri, 3 Jul 2020 06:33:59 -0700 Subject: [PATCH] net: sky2: initialize return of gm_phy_read @@ -25,9 +25,10 @@ So handle similar to skge.c's gm_phy_read, initialize v. Signed-off-by: Tom Rix <trix@redhat.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c -index 241f00716979..fe54764caea9 100644 +index 7e88446ac97a..0b88fb96503f 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -203,7 +203,7 @@ static int __gm_phy_read(struct sky2_hw *hw, unsigned port, u16 reg, u16 *val) diff --git a/queue/net-smc91x-Fix-possible-memory-leak-in-smc_drv_probe.patch b/queue/net-smc91x-Fix-possible-memory-leak-in-smc_drv_probe.patch index 5e0ca6e4..1bddcfb3 100644 --- a/queue/net-smc91x-Fix-possible-memory-leak-in-smc_drv_probe.patch +++ b/queue/net-smc91x-Fix-possible-memory-leak-in-smc_drv_probe.patch @@ -1,4 +1,4 @@ -From bca9749b1aa23d964d3ab930938af66dbf887f15 Mon Sep 17 00:00:00 2001 +From dfc87e10f51f6ef2322f35bacf1a6ece1d13a8e8 Mon Sep 17 00:00:00 2001 From: Wang Hai <wanghai38@huawei.com> Date: Thu, 16 Jul 2020 11:50:38 +0800 Subject: [PATCH] net: smc91x: Fix possible memory leak in smc_drv_probe() @@ -13,12 +13,13 @@ Fixes: 7d2911c43815 ("net: smc91x: Fix gpios for device tree based booting") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wang Hai <wanghai38@huawei.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/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c -index 90410f9d3b1a..1c4fea9c3ec4 100644 +index 601e76ad99a0..24182dd3d38c 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c -@@ -2274,7 +2274,7 @@ static int smc_drv_probe(struct platform_device *pdev) +@@ -2275,7 +2275,7 @@ static int smc_drv_probe(struct platform_device *pdev) ret = try_toggle_control_gpio(&pdev->dev, &lp->power_gpio, "power", 0, 0, 100); if (ret) @@ -27,7 +28,7 @@ index 90410f9d3b1a..1c4fea9c3ec4 100644 /* * Optional reset GPIO configured? Minimum 100 ns reset needed -@@ -2283,7 +2283,7 @@ static int smc_drv_probe(struct platform_device *pdev) +@@ -2284,7 +2284,7 @@ static int smc_drv_probe(struct platform_device *pdev) ret = try_toggle_control_gpio(&pdev->dev, &lp->reset_gpio, "reset", 0, 0, 100); if (ret) diff --git a/queue/netdevsim-fix-unbalaced-locking-in-nsim_create.patch b/queue/netdevsim-fix-unbalaced-locking-in-nsim_create.patch index b457cf24..294f1c47 100644 --- a/queue/netdevsim-fix-unbalaced-locking-in-nsim_create.patch +++ b/queue/netdevsim-fix-unbalaced-locking-in-nsim_create.patch @@ -1,4 +1,4 @@ -From 2c9d8e01f0c6017317eee7638496173d4a64e6bc Mon Sep 17 00:00:00 2001 +From ead64a2fb25ceb87d946a29fff6fc3dc87e09d5a Mon Sep 17 00:00:00 2001 From: Taehee Yoo <ap420073@gmail.com> Date: Tue, 21 Jul 2020 14:51:50 +0000 Subject: [PATCH] netdevsim: fix unbalaced locking in nsim_create() @@ -14,12 +14,13 @@ Fixes: e05b2d141fef ("netdevsim: move netdev creation/destruction to dev probe") Signed-off-by: Taehee Yoo <ap420073@gmail.com> Reviewed-by: Jakub Kicinski <kuba@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/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c -index 2908e0a0d6e1..23950e7a0f81 100644 +index 533a182eefca..2a197cd22628 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c -@@ -302,7 +302,7 @@ nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port) +@@ -314,7 +314,7 @@ nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port) rtnl_lock(); err = nsim_bpf_init(ns); if (err) @@ -28,7 +29,7 @@ index 2908e0a0d6e1..23950e7a0f81 100644 nsim_ipsec_init(ns); -@@ -316,8 +316,8 @@ nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port) +@@ -328,8 +328,8 @@ nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port) err_ipsec_teardown: nsim_ipsec_teardown(ns); nsim_bpf_uninit(ns); diff --git a/queue/parisc-Add-atomic64_set_release-define-to-avoid-CPU-.patch b/queue/parisc-Add-atomic64_set_release-define-to-avoid-CPU-.patch index b2cbaaf8..01b5cc63 100644 --- a/queue/parisc-Add-atomic64_set_release-define-to-avoid-CPU-.patch +++ b/queue/parisc-Add-atomic64_set_release-define-to-avoid-CPU-.patch @@ -1,4 +1,4 @@ -From be6577af0cef934ccb036445314072e8cb9217b9 Mon Sep 17 00:00:00 2001 +From c032701dc6cf9feb16a6164710ffc0cff47506b4 Mon Sep 17 00:00:00 2001 From: John David Anglin <dave.anglin@bell.net> Date: Tue, 21 Jul 2020 07:36:59 -0400 Subject: [PATCH] parisc: Add atomic64_set_release() define to avoid CPU soft @@ -64,6 +64,7 @@ Adding this define fixes the stalls in bit operations. Signed-off-by: Dave Anglin <dave.anglin@bell.net> Cc: stable@vger.kernel.org Signed-off-by: Helge Deller <deller@gmx.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h index 118953d41763..6dd4171c9530 100644 diff --git a/queue/pinctrl-amd-fix-npins-for-uart0-in-kerncz_groups.patch b/queue/pinctrl-amd-fix-npins-for-uart0-in-kerncz_groups.patch index 2ff3b83b..72bc8ff8 100644 --- a/queue/pinctrl-amd-fix-npins-for-uart0-in-kerncz_groups.patch +++ b/queue/pinctrl-amd-fix-npins-for-uart0-in-kerncz_groups.patch @@ -1,4 +1,4 @@ -From 69339d083dfb7786b0e0b3fc19eaddcf11fabdfb Mon Sep 17 00:00:00 2001 +From f0be6177158ffb68fdb615f0aa6c45eb10d08152 Mon Sep 17 00:00:00 2001 From: Jacky Hu <hengqing.hu@gmail.com> Date: Tue, 16 Jun 2020 09:50:24 +0800 Subject: [PATCH] pinctrl: amd: fix npins for uart0 in kerncz_groups @@ -20,6 +20,7 @@ npins should be 5 instead of 9 according to the definition. Signed-off-by: Jacky Hu <hengqing.hu@gmail.com> Link: https://lore.kernel.org/r/20200616015024.287683-1-hengqing.hu@gmail.com Signed-off-by: Linus Walleij <linus.walleij@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pinctrl/pinctrl-amd.h b/drivers/pinctrl/pinctrl-amd.h index 3e5760f1a715..d4a192df5fab 100644 diff --git a/queue/qed-suppress-don-t-support-RoCE-iWARP-flooding-on-HW.patch b/queue/qed-suppress-don-t-support-RoCE-iWARP-flooding-on-HW.patch index c2a8aa39..4e9a008c 100644 --- a/queue/qed-suppress-don-t-support-RoCE-iWARP-flooding-on-HW.patch +++ b/queue/qed-suppress-don-t-support-RoCE-iWARP-flooding-on-HW.patch @@ -1,4 +1,4 @@ -From 17e4d53e07a0987aef7243a99b6f1ed73f99f83a Mon Sep 17 00:00:00 2001 +From 47ff51364ce8f5359bdc6691ea91cf2f86430d2c Mon Sep 17 00:00:00 2001 From: Alexander Lobakin <alobakin@marvell.com> Date: Tue, 21 Jul 2020 17:41:42 +0300 Subject: [PATCH] qed: suppress "don't support RoCE & iWARP" flooding on HW @@ -35,6 +35,7 @@ Signed-off-by: Alexander Lobakin <alobakin@marvell.com> Signed-off-by: Igor Russkikh <irusskikh@marvell.com> Signed-off-by: Michal Kalderon <michal.kalderon@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/qlogic/qed/qed_cxt.c b/drivers/net/ethernet/qlogic/qed/qed_cxt.c index d8c95101809f..ea27220d6b14 100644 diff --git a/queue/qed-suppress-false-positives-interrupt-error-message.patch b/queue/qed-suppress-false-positives-interrupt-error-message.patch index 61094045..e263d871 100644 --- a/queue/qed-suppress-false-positives-interrupt-error-message.patch +++ b/queue/qed-suppress-false-positives-interrupt-error-message.patch @@ -1,4 +1,4 @@ -From 07b48e24621b307b891d2c0b1ecac8b156a2004c Mon Sep 17 00:00:00 2001 +From 2f77660701a5b4717382877cb82a9d00bb33a14e Mon Sep 17 00:00:00 2001 From: Alexander Lobakin <alobakin@marvell.com> Date: Tue, 21 Jul 2020 17:41:43 +0300 Subject: [PATCH] qed: suppress false-positives interrupt error messages on HW @@ -25,6 +25,7 @@ Signed-off-by: Alexander Lobakin <alobakin@marvell.com> Signed-off-by: Igor Russkikh <irusskikh@marvell.com> Signed-off-by: Michal Kalderon <michal.kalderon@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/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c index 70fef2df165f..ede2d1cc4c8a 100644 diff --git a/queue/regmap-dev_get_regmap_match-fix-string-comparison.patch b/queue/regmap-dev_get_regmap_match-fix-string-comparison.patch index fa3dca4f..82669f0d 100644 --- a/queue/regmap-dev_get_regmap_match-fix-string-comparison.patch +++ b/queue/regmap-dev_get_regmap_match-fix-string-comparison.patch @@ -1,4 +1,4 @@ -From e84861fec32dee8a2e62bbaa52cded6b05a2a456 Mon Sep 17 00:00:00 2001 +From f4923b0b32a74e568788ef6bafe5a6736cb10aaa Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde <mkl@pengutronix.de> Date: Fri, 3 Jul 2020 12:33:15 +0200 Subject: [PATCH] regmap: dev_get_regmap_match(): fix string comparison @@ -18,12 +18,13 @@ Fix this by using strcmp() instead. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Link: https://lore.kernel.org/r/20200703103315.267996-1-mkl@pengutronix.de Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c -index 06a796821e8b..795a62a04022 100644 +index 320d23de02c2..927ebde1607b 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c -@@ -1364,7 +1364,7 @@ static int dev_get_regmap_match(struct device *dev, void *res, void *data) +@@ -1363,7 +1363,7 @@ static int dev_get_regmap_match(struct device *dev, void *res, void *data) /* If the user didn't specify a name match any */ if (data) diff --git a/queue/scsi-dh-Add-Fujitsu-device-to-devinfo-and-dh-lists.patch b/queue/scsi-dh-Add-Fujitsu-device-to-devinfo-and-dh-lists.patch index 4f8bf50e..d5446239 100644 --- a/queue/scsi-dh-Add-Fujitsu-device-to-devinfo-and-dh-lists.patch +++ b/queue/scsi-dh-Add-Fujitsu-device-to-devinfo-and-dh-lists.patch @@ -1,4 +1,4 @@ -From 95fd2aae700c683aeb874d471151841756f9c8e4 Mon Sep 17 00:00:00 2001 +From edaf8fb9426a9d01aa6612a60e7574938b20e086 Mon Sep 17 00:00:00 2001 From: Steve Schremmer <steve.schremmer@netapp.com> Date: Tue, 7 Jul 2020 17:07:22 +0000 Subject: [PATCH] scsi: dh: Add Fujitsu device to devinfo and dh lists @@ -10,6 +10,7 @@ Add FUJITSU ETERNUS_AHB Link: https://lore.kernel.org/r/DM6PR06MB5276CCA765336BD312C4282E8C660@DM6PR06MB5276.namprd06.prod.outlook.com Signed-off-by: Steve Schremmer <steve.schremmer@netapp.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c index a08ff3bd6310..d16d8b6aaccc 100644 diff --git a/queue/scsi-mpt3sas-Fix-error-returns-in-BRM_status_show.patch b/queue/scsi-mpt3sas-Fix-error-returns-in-BRM_status_show.patch index 78d8ecec..5299ed4e 100644 --- a/queue/scsi-mpt3sas-Fix-error-returns-in-BRM_status_show.patch +++ b/queue/scsi-mpt3sas-Fix-error-returns-in-BRM_status_show.patch @@ -1,4 +1,4 @@ -From 0fd181456aa0826057adbfb6c79c40f4083cfd75 Mon Sep 17 00:00:00 2001 +From 37d99fd2aa64f8fac8e1459c27538e50717e7c69 Mon Sep 17 00:00:00 2001 From: Johannes Thumshirn <johannes.thumshirn@wdc.com> Date: Wed, 1 Jul 2020 22:14:54 +0900 Subject: [PATCH] scsi: mpt3sas: Fix error returns in BRM_status_show @@ -22,12 +22,13 @@ Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com> Acked-by: Sreekanth Reddy <sreekanth.reddy@broadcom.com> Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.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/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c -index e94e72de2fc6..983e568ff231 100644 +index 521e18302b8b..10f8e1791a5a 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c +++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c -@@ -3149,15 +3149,14 @@ BRM_status_show(struct device *cdev, struct device_attribute *attr, +@@ -2897,15 +2897,14 @@ _ctl_BRM_status_show(struct device *cdev, struct device_attribute *attr, } /* pci_access_mutex lock acquired by sysfs show path */ mutex_lock(&ioc->pci_access_mutex); @@ -46,7 +47,7 @@ index e94e72de2fc6..983e568ff231 100644 ioc_err(ioc, "%s: failed allocating memory for iounit_pg3: (%d) bytes\n", __func__, sz); goto out; -@@ -3167,6 +3166,7 @@ BRM_status_show(struct device *cdev, struct device_attribute *attr, +@@ -2915,6 +2914,7 @@ _ctl_BRM_status_show(struct device *cdev, struct device_attribute *attr, 0) { ioc_err(ioc, "%s: failed reading iounit_pg3\n", __func__); @@ -54,7 +55,7 @@ index e94e72de2fc6..983e568ff231 100644 goto out; } -@@ -3174,12 +3174,14 @@ BRM_status_show(struct device *cdev, struct device_attribute *attr, +@@ -2922,12 +2922,14 @@ _ctl_BRM_status_show(struct device *cdev, struct device_attribute *attr, if (ioc_status != MPI2_IOCSTATUS_SUCCESS) { ioc_err(ioc, "%s: iounit_pg3 failed with ioc_status(0x%04x)\n", __func__, ioc_status); diff --git a/queue/scsi-mpt3sas-Fix-unlock-imbalance.patch b/queue/scsi-mpt3sas-Fix-unlock-imbalance.patch index d140d3a5..f9ad11c9 100644 --- a/queue/scsi-mpt3sas-Fix-unlock-imbalance.patch +++ b/queue/scsi-mpt3sas-Fix-unlock-imbalance.patch @@ -1,4 +1,4 @@ -From cb551b8dc079d2ef189145782627c99cb68c0255 Mon Sep 17 00:00:00 2001 +From d699f0e4178489be0fdefafbc8198d56c3512624 Mon Sep 17 00:00:00 2001 From: Damien Le Moal <damien.lemoal@wdc.com> Date: Wed, 1 Jul 2020 17:52:54 +0900 Subject: [PATCH] scsi: mpt3sas: Fix unlock imbalance @@ -57,12 +57,13 @@ Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Acked-by: Sreekanth Reddy <sreekanth.reddy@broadcom.com> Signed-off-by: Damien Le Moal <damien.lemoal@wdc.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/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c -index 62e552838565..e94e72de2fc6 100644 +index c20b4b70a3c8..521e18302b8b 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c +++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c -@@ -3145,7 +3145,7 @@ BRM_status_show(struct device *cdev, struct device_attribute *attr, +@@ -2893,7 +2893,7 @@ _ctl_BRM_status_show(struct device *cdev, struct device_attribute *attr, if (!ioc->is_warpdrive) { ioc_err(ioc, "%s: BRM attribute is only for warpdrive\n", __func__); diff --git a/queue/scsi-scsi_transport_spi-Fix-function-pointer-check.patch b/queue/scsi-scsi_transport_spi-Fix-function-pointer-check.patch index 4339e7f5..bca12068 100644 --- a/queue/scsi-scsi_transport_spi-Fix-function-pointer-check.patch +++ b/queue/scsi-scsi_transport_spi-Fix-function-pointer-check.patch @@ -1,4 +1,4 @@ -From 5aee52c44d9170591df65fafa1cd408acc1225ce Mon Sep 17 00:00:00 2001 +From dbe717fde6fbd26493bd81e8a423c324903db244 Mon Sep 17 00:00:00 2001 From: Tom Rix <trix@redhat.com> Date: Sat, 27 Jun 2020 06:32:42 -0700 Subject: [PATCH] scsi: scsi_transport_spi: Fix function pointer check @@ -25,6 +25,7 @@ Link: https://lore.kernel.org/r/20200627133242.21618-1-trix@redhat.com Reviewed-by: James Bottomley <jejb@linux.ibm.com> Signed-off-by: Tom Rix <trix@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/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c index f8661062ef95..f3d5b1bbd5aa 100644 diff --git a/queue/serial-8250-fix-null-ptr-deref-in-serial8250_start_t.patch b/queue/serial-8250-fix-null-ptr-deref-in-serial8250_start_t.patch index 6072bcf3..047a9b64 100644 --- a/queue/serial-8250-fix-null-ptr-deref-in-serial8250_start_t.patch +++ b/queue/serial-8250-fix-null-ptr-deref-in-serial8250_start_t.patch @@ -1,4 +1,4 @@ -From f4c23a140d80ef5e6d3d1f8f57007649014b60fa Mon Sep 17 00:00:00 2001 +From c4d7b0b14fb8b05f21f63926d063646405424029 Mon Sep 17 00:00:00 2001 From: Yang Yingliang <yangyingliang@huawei.com> Date: Tue, 21 Jul 2020 14:38:52 +0000 Subject: [PATCH] serial: 8250: fix null-ptr-deref in serial8250_start_tx() @@ -63,12 +63,13 @@ Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200721143852.4058352-1-yangyingliang@huawei.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c -index fc118f649887..cae61d1ebec5 100644 +index a8aa64c30fea..0c4451f7c4b9 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c -@@ -524,6 +524,7 @@ static void __init serial8250_isa_init_ports(void) +@@ -523,6 +523,7 @@ static void __init serial8250_isa_init_ports(void) */ up->mcr_mask = ~ALPHA_KLUDGE_MCR; up->mcr_force = ALPHA_KLUDGE_MCR; @@ -76,7 +77,7 @@ index fc118f649887..cae61d1ebec5 100644 } /* chain base port ops to support Remote Supervisor Adapter */ -@@ -547,7 +548,6 @@ static void __init serial8250_isa_init_ports(void) +@@ -546,7 +547,6 @@ static void __init serial8250_isa_init_ports(void) port->membase = old_serial_port[i].iomem_base; port->iotype = old_serial_port[i].io_type; port->regshift = old_serial_port[i].iomem_reg_shift; diff --git a/queue/serial-exar-Fix-GPIO-configuration-for-Sealevel-card.patch b/queue/serial-exar-Fix-GPIO-configuration-for-Sealevel-card.patch index 96204999..43c56e45 100644 --- a/queue/serial-exar-Fix-GPIO-configuration-for-Sealevel-card.patch +++ b/queue/serial-exar-Fix-GPIO-configuration-for-Sealevel-card.patch @@ -1,4 +1,4 @@ -From 5fdbe136ae19ab751daaa4d08d9a42f3e30d17f9 Mon Sep 17 00:00:00 2001 +From 97b9664848f6a6c91a62eefd1c9a8aa1aef6c55b Mon Sep 17 00:00:00 2001 From: Matthew Howell <matthew.howell@sealevel.com> Date: Wed, 22 Jul 2020 16:11:24 -0400 Subject: [PATCH] serial: exar: Fix GPIO configuration for Sealevel cards based @@ -23,12 +23,13 @@ Fixes: 7dea8165f1d6 ("serial: exar: Preconfigure xr17v35x MPIOs as output") Signed-off-by: Matthew Howell <matthew.howell@sealevel.com> Link: https://lore.kernel.org/r/alpine.DEB.2.21.2007221605270.13247@tstest-VirtualBox Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c -index ddb6aeb76dc5..04b9af7ed941 100644 +index 6f730c357bee..4c183889f65e 100644 --- a/drivers/tty/serial/8250/8250_exar.c +++ b/drivers/tty/serial/8250/8250_exar.c -@@ -326,7 +326,17 @@ static void setup_gpio(struct pci_dev *pcidev, u8 __iomem *p) +@@ -227,7 +227,17 @@ static void setup_gpio(struct pci_dev *pcidev, u8 __iomem *p) * devices will export them as GPIOs, so we pre-configure them safely * as inputs. */ diff --git a/queue/spi-mediatek-use-correct-SPI_CFG2_REG-MACRO.patch b/queue/spi-mediatek-use-correct-SPI_CFG2_REG-MACRO.patch index bc9619bb..25fab8a3 100644 --- a/queue/spi-mediatek-use-correct-SPI_CFG2_REG-MACRO.patch +++ b/queue/spi-mediatek-use-correct-SPI_CFG2_REG-MACRO.patch @@ -1,4 +1,4 @@ -From 44b37eb79e16a56cb30ba55b2da452396b941e7a Mon Sep 17 00:00:00 2001 +From f315a29b810e07bbf79435473f100696ec1dba95 Mon Sep 17 00:00:00 2001 From: "leilk.liu" <leilk.liu@mediatek.com> Date: Wed, 1 Jul 2020 17:00:20 +0800 Subject: [PATCH] spi: mediatek: use correct SPI_CFG2_REG MACRO @@ -10,12 +10,13 @@ this patch use correct SPI_CFG2_REG offset. Signed-off-by: leilk.liu <leilk.liu@mediatek.com> Link: https://lore.kernel.org/r/20200701090020.7935-1-leilk.liu@mediatek.com Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c -index 6783e12c40c2..a556795caeef 100644 +index 10041eab36a2..ea737f69a870 100644 --- a/drivers/spi/spi-mt65xx.c +++ b/drivers/spi/spi-mt65xx.c -@@ -36,7 +36,6 @@ +@@ -33,7 +33,6 @@ #define SPI_CFG0_SCK_LOW_OFFSET 8 #define SPI_CFG0_CS_HOLD_OFFSET 16 #define SPI_CFG0_CS_SETUP_OFFSET 24 @@ -23,7 +24,7 @@ index 6783e12c40c2..a556795caeef 100644 #define SPI_ADJUST_CFG0_CS_HOLD_OFFSET 0 #define SPI_ADJUST_CFG0_CS_SETUP_OFFSET 16 -@@ -48,6 +47,8 @@ +@@ -45,6 +44,8 @@ #define SPI_CFG1_CS_IDLE_MASK 0xff #define SPI_CFG1_PACKET_LOOP_MASK 0xff00 #define SPI_CFG1_PACKET_LENGTH_MASK 0x3ff0000 @@ -32,7 +33,7 @@ index 6783e12c40c2..a556795caeef 100644 #define SPI_CMD_ACT BIT(0) #define SPI_CMD_RESUME BIT(1) -@@ -283,7 +284,7 @@ static void mtk_spi_set_cs(struct spi_device *spi, bool enable) +@@ -263,7 +264,7 @@ static void mtk_spi_set_cs(struct spi_device *spi, bool enable) static void mtk_spi_prepare_transfer(struct spi_master *master, struct spi_transfer *xfer) { @@ -41,7 +42,7 @@ index 6783e12c40c2..a556795caeef 100644 struct mtk_spi *mdata = spi_master_get_devdata(master); spi_clk_hz = clk_get_rate(mdata->spi_clk); -@@ -296,18 +297,18 @@ static void mtk_spi_prepare_transfer(struct spi_master *master, +@@ -276,18 +277,18 @@ static void mtk_spi_prepare_transfer(struct spi_master *master, cs_time = sck_time * 2; if (mdata->dev_comp->enhance_timing) { diff --git a/queue/staging-comedi-addi_apci_1032-check-INSN_CONFIG_DIGI.patch b/queue/staging-comedi-addi_apci_1032-check-INSN_CONFIG_DIGI.patch index fa475c38..ea75bf00 100644 --- a/queue/staging-comedi-addi_apci_1032-check-INSN_CONFIG_DIGI.patch +++ b/queue/staging-comedi-addi_apci_1032-check-INSN_CONFIG_DIGI.patch @@ -1,4 +1,4 @@ -From 0bd0db42a030b75c20028c7ba6e327b9cb554116 Mon Sep 17 00:00:00 2001 +From e7dcd11eb36805aa63282601de4d5f366173177f Mon Sep 17 00:00:00 2001 From: Ian Abbott <abbotti@mev.co.uk> Date: Fri, 17 Jul 2020 15:52:55 +0100 Subject: [PATCH] staging: comedi: addi_apci_1032: check @@ -17,6 +17,7 @@ Cc: <stable@vger.kernel.org> #3.8+ Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Link: https://lore.kernel.org/r/20200717145257.112660-3-abbotti@mev.co.uk Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/staging/comedi/drivers/addi_apci_1032.c b/drivers/staging/comedi/drivers/addi_apci_1032.c index 560649be9d13..e035c9f757a1 100644 diff --git a/queue/staging-comedi-addi_apci_1500-check-INSN_CONFIG_DIGI.patch b/queue/staging-comedi-addi_apci_1500-check-INSN_CONFIG_DIGI.patch index 3b3bcade..a1bae16a 100644 --- a/queue/staging-comedi-addi_apci_1500-check-INSN_CONFIG_DIGI.patch +++ b/queue/staging-comedi-addi_apci_1500-check-INSN_CONFIG_DIGI.patch @@ -1,4 +1,4 @@ -From fc846e9db67c7e808d77bf9e2ef3d49e3820ce5d Mon Sep 17 00:00:00 2001 +From 57bf7e85b48f5b5ea0f5c2c974350e06689b1610 Mon Sep 17 00:00:00 2001 From: Ian Abbott <abbotti@mev.co.uk> Date: Fri, 17 Jul 2020 15:52:57 +0100 Subject: [PATCH] staging: comedi: addi_apci_1500: check @@ -21,6 +21,7 @@ Cc: <stable@vger.kernel.org> #4.0+ Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Link: https://lore.kernel.org/r/20200717145257.112660-5-abbotti@mev.co.uk Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c index 689acd69a1b9..816dd25b9d0e 100644 diff --git a/queue/staging-comedi-addi_apci_1564-check-INSN_CONFIG_DIGI.patch b/queue/staging-comedi-addi_apci_1564-check-INSN_CONFIG_DIGI.patch index 19481ab7..bc629f82 100644 --- a/queue/staging-comedi-addi_apci_1564-check-INSN_CONFIG_DIGI.patch +++ b/queue/staging-comedi-addi_apci_1564-check-INSN_CONFIG_DIGI.patch @@ -1,4 +1,4 @@ -From 926234f1b8434c4409aa4c53637aa3362ca07cea Mon Sep 17 00:00:00 2001 +From cc834ec14047f9b882cf3057fcc5fd9e1b85f8f0 Mon Sep 17 00:00:00 2001 From: Ian Abbott <abbotti@mev.co.uk> Date: Fri, 17 Jul 2020 15:52:56 +0100 Subject: [PATCH] staging: comedi: addi_apci_1564: check @@ -17,6 +17,7 @@ Cc: <stable@vger.kernel.org> #3.17+ Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Link: https://lore.kernel.org/r/20200717145257.112660-4-abbotti@mev.co.uk Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c index 10501fe6bb25..1268ba34be5f 100644 diff --git a/queue/staging-comedi-ni_6527-fix-INSN_CONFIG_DIGITAL_TRIG-.patch b/queue/staging-comedi-ni_6527-fix-INSN_CONFIG_DIGITAL_TRIG-.patch index 4ce53129..1369e47c 100644 --- a/queue/staging-comedi-ni_6527-fix-INSN_CONFIG_DIGITAL_TRIG-.patch +++ b/queue/staging-comedi-ni_6527-fix-INSN_CONFIG_DIGITAL_TRIG-.patch @@ -1,4 +1,4 @@ -From f07804ec77d77f8a9dcf570a24154e17747bc82f Mon Sep 17 00:00:00 2001 +From 1692c775c95a26b891585264eda32376a088e6c4 Mon Sep 17 00:00:00 2001 From: Ian Abbott <abbotti@mev.co.uk> Date: Fri, 17 Jul 2020 15:52:54 +0100 Subject: [PATCH] staging: comedi: ni_6527: fix INSN_CONFIG_DIGITAL_TRIG @@ -32,6 +32,7 @@ Cc: <stable@vger.kernel.org> # 3.17+ Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Link: https://lore.kernel.org/r/20200717145257.112660-2-abbotti@mev.co.uk Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c index 4d1eccb5041d..4518c2680b7c 100644 diff --git a/queue/staging-wlan-ng-properly-check-endpoint-types.patch b/queue/staging-wlan-ng-properly-check-endpoint-types.patch index 0bbe077a..bc808ee8 100644 --- a/queue/staging-wlan-ng-properly-check-endpoint-types.patch +++ b/queue/staging-wlan-ng-properly-check-endpoint-types.patch @@ -1,4 +1,4 @@ -From faaff9765664009c1c7c65551d32e9ed3b1dda8f Mon Sep 17 00:00:00 2001 +From 7dd9777e15f872a2fc0adf6e91ab8fdfbb3a16c5 Mon Sep 17 00:00:00 2001 From: Rustam Kovhaev <rkovhaev@gmail.com> Date: Wed, 22 Jul 2020 09:10:52 -0700 Subject: [PATCH] staging: wlan-ng: properly check endpoint types @@ -14,9 +14,10 @@ Signed-off-by: Rustam Kovhaev <rkovhaev@gmail.com> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200722161052.999754-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/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c -index 4689b2170e4f..456603fd26c0 100644 +index d8d86761b790..8d32b1603d10 100644 --- a/drivers/staging/wlan-ng/prism2usb.c +++ b/drivers/staging/wlan-ng/prism2usb.c @@ -61,11 +61,25 @@ static int prism2sta_probe_usb(struct usb_interface *interface, diff --git a/queue/uprobes-Change-handle_swbp-to-send-SIGTRAP-with-si_c.patch b/queue/uprobes-Change-handle_swbp-to-send-SIGTRAP-with-si_c.patch index 291860ee..319dab63 100644 --- a/queue/uprobes-Change-handle_swbp-to-send-SIGTRAP-with-si_c.patch +++ b/queue/uprobes-Change-handle_swbp-to-send-SIGTRAP-with-si_c.patch @@ -1,4 +1,4 @@ -From fe5ed7ab99c656bd2f5b79b49df0e9ebf2cead8a Mon Sep 17 00:00:00 2001 +From 6bb6a129588eea5ccbde2da3264f277bb7bb78eb Mon Sep 17 00:00:00 2001 From: Oleg Nesterov <oleg@redhat.com> Date: Thu, 23 Jul 2020 17:44:20 +0200 Subject: [PATCH] uprobes: Change handle_swbp() to send SIGTRAP with @@ -45,12 +45,13 @@ Signed-off-by: Ingo Molnar <mingo@kernel.org> Reviewed-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20200723154420.GA32043@redhat.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c -index bb0862873dba..5f8b0c52fd2e 100644 +index ccfeb313be21..673044edd9ad 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c -@@ -2199,7 +2199,7 @@ static void handle_swbp(struct pt_regs *regs) +@@ -2153,7 +2153,7 @@ static void handle_swbp(struct pt_regs *regs) if (!uprobe) { if (is_swbp > 0) { /* No matching uprobe; signal SIGTRAP. */ diff --git a/queue/usb-dwc3-pci-add-support-for-the-Intel-Jasper-Lake.patch b/queue/usb-dwc3-pci-add-support-for-the-Intel-Jasper-Lake.patch index 806d4c04..5a61b480 100644 --- a/queue/usb-dwc3-pci-add-support-for-the-Intel-Jasper-Lake.patch +++ b/queue/usb-dwc3-pci-add-support-for-the-Intel-Jasper-Lake.patch @@ -1,4 +1,4 @@ -From 66679bf480ddf1f528e8a1acde8cbfea941085ad Mon Sep 17 00:00:00 2001 +From 4d0eddad6b786164e5ad998ff4cced519e5b22dc Mon Sep 17 00:00:00 2001 From: Heikki Krogerus <heikki.krogerus@linux.intel.com> Date: Tue, 30 Jun 2020 15:24:59 +0300 Subject: [PATCH] usb: dwc3: pci: add support for the Intel Jasper Lake @@ -10,6 +10,7 @@ devices. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Felipe Balbi <balbi@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c index 3f3cce723c05..de8e5e971f70 100644 diff --git a/queue/usb-dwc3-pci-add-support-for-the-Intel-Tiger-Lake-PC.patch b/queue/usb-dwc3-pci-add-support-for-the-Intel-Tiger-Lake-PC.patch index ca81eb83..f2e98501 100644 --- a/queue/usb-dwc3-pci-add-support-for-the-Intel-Tiger-Lake-PC.patch +++ b/queue/usb-dwc3-pci-add-support-for-the-Intel-Tiger-Lake-PC.patch @@ -1,4 +1,4 @@ -From f79a3d64233b2e90db073b6cdcf3ca575eea04f7 Mon Sep 17 00:00:00 2001 +From ed115bb40aafc03ccb878f664091a352eab44a52 Mon Sep 17 00:00:00 2001 From: Heikki Krogerus <heikki.krogerus@linux.intel.com> Date: Thu, 25 Jun 2020 10:34:32 +0300 Subject: [PATCH] usb: dwc3: pci: add support for the Intel Tiger Lake PCH -H @@ -10,6 +10,7 @@ This patch adds the necessary PCI ID for TGP-H devices. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Felipe Balbi <balbi@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c index 389ec4c689c4..3f3cce723c05 100644 diff --git a/queue/usb-gadget-udc-gr_udc-fix-memleak-on-error-handling-.patch b/queue/usb-gadget-udc-gr_udc-fix-memleak-on-error-handling-.patch index f4d53232..0c142fe0 100644 --- a/queue/usb-gadget-udc-gr_udc-fix-memleak-on-error-handling-.patch +++ b/queue/usb-gadget-udc-gr_udc-fix-memleak-on-error-handling-.patch @@ -1,4 +1,4 @@ -From c8f8529e2c4141afa2ebb487ad48e8a6ec3e8c99 Mon Sep 17 00:00:00 2001 +From a5083de0b1d0af3e82e03599335a366847ca19c4 Mon Sep 17 00:00:00 2001 From: Evgeny Novikov <novikov@ispras.ru> Date: Fri, 26 Jun 2020 16:17:47 +0300 Subject: [PATCH] usb: gadget: udc: gr_udc: fix memleak on error handling path @@ -14,9 +14,10 @@ Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Evgeny Novikov <novikov@ispras.ru> Signed-off-by: Felipe Balbi <balbi@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/gadget/udc/gr_udc.c b/drivers/usb/gadget/udc/gr_udc.c -index 7164ad9800f1..7419889ebe9a 100644 +index e50108f9a374..e0b2fb33ed0d 100644 --- a/drivers/usb/gadget/udc/gr_udc.c +++ b/drivers/usb/gadget/udc/gr_udc.c @@ -1980,9 +1980,12 @@ static int gr_ep_init(struct gr_udc *dev, int num, int is_in, u32 maxplimit) diff --git a/queue/usb-xhci-Fix-ASM2142-ASM3142-DMA-addressing.patch b/queue/usb-xhci-Fix-ASM2142-ASM3142-DMA-addressing.patch index 9fe9a8b0..458c6d4a 100644 --- a/queue/usb-xhci-Fix-ASM2142-ASM3142-DMA-addressing.patch +++ b/queue/usb-xhci-Fix-ASM2142-ASM3142-DMA-addressing.patch @@ -1,4 +1,4 @@ -From dbb0897e805f2ab1b8bc358f6c3d878a376b8897 Mon Sep 17 00:00:00 2001 +From 02762a2ee1d11fe9ff016851658b47514725d788 Mon Sep 17 00:00:00 2001 From: Forest Crossman <cyrozap@gmail.com> Date: Fri, 17 Jul 2020 06:27:34 -0500 Subject: [PATCH] usb: xhci: Fix ASM2142/ASM3142 DMA addressing @@ -14,12 +14,13 @@ Signed-off-by: Forest Crossman <cyrozap@gmail.com> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200717112734.328432-1-cyrozap@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index ef513c2fb843..9234c82e70e4 100644 +index 2f67353d3cac..f55da3437b8e 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -265,6 +265,9 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) +@@ -250,6 +250,9 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && pdev->device == 0x1142) xhci->quirks |= XHCI_TRUST_TX_LENGTH; diff --git a/queue/usb-xhci-mtk-fix-the-failure-of-bandwidth-allocation.patch b/queue/usb-xhci-mtk-fix-the-failure-of-bandwidth-allocation.patch index dd5d0888..f14d41d4 100644 --- a/queue/usb-xhci-mtk-fix-the-failure-of-bandwidth-allocation.patch +++ b/queue/usb-xhci-mtk-fix-the-failure-of-bandwidth-allocation.patch @@ -1,4 +1,4 @@ -From 5ce1a24dd98c00a57a8fa13660648abf7e08e3ef Mon Sep 17 00:00:00 2001 +From ee58b5eb0bb42969ab218018aaf03908aa2748f8 Mon Sep 17 00:00:00 2001 From: Chunfeng Yun <chunfeng.yun@mediatek.com> Date: Fri, 10 Jul 2020 13:57:52 +0800 Subject: [PATCH] usb: xhci-mtk: fix the failure of bandwidth allocation @@ -15,6 +15,7 @@ Fixes: 0cbd4b34cda9 ("xhci: mediatek: support MTK xHCI host controller") Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> Link: https://lore.kernel.org/r/1594360672-2076-1-git-send-email-chunfeng.yun@mediatek.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c index fea555570ad4..45c54d56ecbd 100644 diff --git a/queue/vt-Reject-zero-sized-screen-buffer-size.patch b/queue/vt-Reject-zero-sized-screen-buffer-size.patch index 325eb572..3658e0d4 100644 --- a/queue/vt-Reject-zero-sized-screen-buffer-size.patch +++ b/queue/vt-Reject-zero-sized-screen-buffer-size.patch @@ -1,4 +1,4 @@ -From ce684552a266cb1c7cc2f7e623f38567adec6653 Mon Sep 17 00:00:00 2001 +From 0c47a7cd09c242fcc0896e2f359c82473ebf6d47 Mon Sep 17 00:00:00 2001 From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Date: Sun, 12 Jul 2020 20:10:12 +0900 Subject: [PATCH] vt: Reject zero-sized screen buffer size. @@ -52,9 +52,10 @@ Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200712111013.11881-1-penguin-kernel@I-love.SAKURA.ne.jp Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c -index 48a8199f7845..42d8c67a481f 100644 +index 95202c1c9a10..ec3b59f9bcb3 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -1092,10 +1092,19 @@ static const struct tty_port_operations vc_port_ops = { @@ -131,7 +132,7 @@ index 48a8199f7845..42d8c67a481f 100644 return -EINVAL; newscreen = kzalloc(new_screen_size, GFP_USER); if (!newscreen) -@@ -3393,6 +3399,7 @@ static int __init con_init(void) +@@ -3396,6 +3402,7 @@ static int __init con_init(void) INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK); tty_port_init(&vc->port); visual_init(vc, currcons, 1); diff --git a/queue/watchdog-initialize-device-before-misc_register.patch b/queue/watchdog-initialize-device-before-misc_register.patch index e747226e..5cb20926 100644 --- a/queue/watchdog-initialize-device-before-misc_register.patch +++ b/queue/watchdog-initialize-device-before-misc_register.patch @@ -1,4 +1,4 @@ -From 5ca68cf74b1bf092ad004ee37b29728704b863bf Mon Sep 17 00:00:00 2001 +From 1cb81e3976a9f7e5cadca00cc8031f0e4b2ba1e4 Mon Sep 17 00:00:00 2001 From: Krzysztof Sobota <krzysztof.sobota@nokia.com> Date: Fri, 17 Jul 2020 12:31:09 +0200 Subject: [PATCH] watchdog: initialize device before misc_register @@ -71,6 +71,7 @@ Signed-off-by: Krzysztof Sobota <krzysztof.sobota@nokia.com> Link: https://lore.kernel.org/r/20200717103109.14660-1-krzysztof.sobota@nokia.com 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/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index 4e0b308eadee..00bba772afbc 100644 diff --git a/queue/x86-math-emu-Fix-up-cmp-insn-for-clang-ias.patch b/queue/x86-math-emu-Fix-up-cmp-insn-for-clang-ias.patch index 0f14e7a5..4e13f68c 100644 --- a/queue/x86-math-emu-Fix-up-cmp-insn-for-clang-ias.patch +++ b/queue/x86-math-emu-Fix-up-cmp-insn-for-clang-ias.patch @@ -1,4 +1,4 @@ -From 81e96851ea32deb2c921c870eecabf335f598aeb Mon Sep 17 00:00:00 2001 +From 221a30738f4012e1f6b7cb578fa49da86bad8172 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd@arndb.de> Date: Wed, 27 May 2020 15:53:46 +0200 Subject: [PATCH] x86: math-emu: Fix up 'cmp' insn for clang ias @@ -18,9 +18,10 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Link: https://lkml.kernel.org/r/20200527135352.1198078-1-arnd@arndb.de +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/math-emu/wm_sqrt.S b/arch/x86/math-emu/wm_sqrt.S -index 3b2b58164ec1..40526dd85137 100644 +index f031c0e19356..515cdee90df7 100644 --- a/arch/x86/math-emu/wm_sqrt.S +++ b/arch/x86/math-emu/wm_sqrt.S @@ -209,7 +209,7 @@ sqrt_stage_2_finish: diff --git a/queue/x86-vmlinux.lds-Page-align-end-of-.page_aligned-sect.patch b/queue/x86-vmlinux.lds-Page-align-end-of-.page_aligned-sect.patch index 936baecb..daa0d957 100644 --- a/queue/x86-vmlinux.lds-Page-align-end-of-.page_aligned-sect.patch +++ b/queue/x86-vmlinux.lds-Page-align-end-of-.page_aligned-sect.patch @@ -1,4 +1,4 @@ -From de2b41be8fcccb2f5b6c480d35df590476344201 Mon Sep 17 00:00:00 2001 +From a742462ef198dc7b7fe5e6c22b70e8b6e9b480e4 Mon Sep 17 00:00:00 2001 From: Joerg Roedel <jroedel@suse.de> Date: Tue, 21 Jul 2020 11:34:48 +0200 Subject: [PATCH] x86, vmlinux.lds: Page-align end of ..page_aligned sections @@ -35,12 +35,13 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Kees Cook <keescook@chromium.org> Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20200721093448.10417-1-joro@8bytes.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S -index 3bfc8dd8a43d..9a03e5b23135 100644 +index b3f6a15b9593..96d8025ea1b0 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S -@@ -358,6 +358,7 @@ SECTIONS +@@ -362,6 +362,7 @@ SECTIONS .bss : AT(ADDR(.bss) - LOAD_OFFSET) { __bss_start = .; *(.bss..page_aligned) @@ -49,10 +50,10 @@ index 3bfc8dd8a43d..9a03e5b23135 100644 BSS_DECRYPTED . = ALIGN(PAGE_SIZE); diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h -index db600ef218d7..052e0f05a984 100644 +index 088987e9a3ea..e88463e53504 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h -@@ -341,7 +341,8 @@ +@@ -284,7 +284,8 @@ #define PAGE_ALIGNED_DATA(page_align) \ . = ALIGN(page_align); \ @@ -62,7 +63,7 @@ index db600ef218d7..052e0f05a984 100644 #define READ_MOSTLY_DATA(align) \ . = ALIGN(align); \ -@@ -737,7 +738,9 @@ +@@ -655,7 +656,9 @@ . = ALIGN(bss_align); \ .bss : AT(ADDR(.bss) - LOAD_OFFSET) { \ BSS_FIRST_SECTIONS \ diff --git a/queue/xtensa-fix-__sync_fetch_and_-and-or-_4-declarations.patch b/queue/xtensa-fix-__sync_fetch_and_-and-or-_4-declarations.patch index fd5cbe2d..34f8bf0f 100644 --- a/queue/xtensa-fix-__sync_fetch_and_-and-or-_4-declarations.patch +++ b/queue/xtensa-fix-__sync_fetch_and_-and-or-_4-declarations.patch @@ -1,4 +1,4 @@ -From 73f9941306d5ce030f3ffc7db425c7b2a798cf8e Mon Sep 17 00:00:00 2001 +From 45385ea5c8c90661fc047fbf88171cdd00a9188e Mon Sep 17 00:00:00 2001 From: Max Filippov <jcmvbkbc@gmail.com> Date: Thu, 4 Jun 2020 13:37:10 -0700 Subject: [PATCH] xtensa: fix __sync_fetch_and_{and,or}_4 declarations @@ -21,6 +21,7 @@ Building xtensa kernel with gcc-10 produces the following warnings: Fix declarations of these functions to avoid the warning. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/xtensa/kernel/xtensa_ksyms.c b/arch/xtensa/kernel/xtensa_ksyms.c index 4092555828b1..24cf6972eace 100644 diff --git a/queue/xtensa-update-pos-in-cpuinfo_op.next.patch b/queue/xtensa-update-pos-in-cpuinfo_op.next.patch index e10319a2..f824abcc 100644 --- a/queue/xtensa-update-pos-in-cpuinfo_op.next.patch +++ b/queue/xtensa-update-pos-in-cpuinfo_op.next.patch @@ -1,4 +1,4 @@ -From 0d5ab144429e8bd80889b856a44d56ab4a5cd59b Mon Sep 17 00:00:00 2001 +From d195a645504135fa6d3b5a60afd6d6dad23dead6 Mon Sep 17 00:00:00 2001 From: Max Filippov <jcmvbkbc@gmail.com> Date: Thu, 2 Jul 2020 08:32:25 -0700 Subject: [PATCH] xtensa: update *pos in cpuinfo_op.next @@ -11,12 +11,13 @@ triggered by cat /proc/cpuinfo: seq_file: buggy .next function c_next did not update position index Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c -index d9204dc2656e..be2c78f71695 100644 +index 0634bfb82a0b..5ea7f39e5d62 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c -@@ -724,7 +724,8 @@ c_start(struct seq_file *f, loff_t *pos) +@@ -723,7 +723,8 @@ c_start(struct seq_file *f, loff_t *pos) static void * c_next(struct seq_file *f, void *v, loff_t *pos) { |