diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-09-04 10:30:35 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-09-04 10:30:35 -0400 |
| commit | b2737decc4480e1594ead30bc14cad40bf195f1a (patch) | |
| tree | 271a6f6756135f862d725e67160f2aa967418cfc | |
| parent | f30798b9fe6e40e1a2bc35f9e13d6d9fc15eabf5 (diff) | |
| download | longterm-queue-5.2-b2737decc4480e1594ead30bc14cad40bf195f1a.tar.gz | |
re-export commits with SOB lines added
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
239 files changed, 894 insertions, 658 deletions
diff --git a/queue/9p-Fix-memory-leak-in-v9fs_mount.patch b/queue/9p-Fix-memory-leak-in-v9fs_mount.patch index 5ee498b0..0557074f 100644 --- a/queue/9p-Fix-memory-leak-in-v9fs_mount.patch +++ b/queue/9p-Fix-memory-leak-in-v9fs_mount.patch @@ -1,4 +1,4 @@ -From cb0aae0e31c632c407a2cab4307be85a001d4d98 Mon Sep 17 00:00:00 2001 +From d9ac4ba095429ca551e878da6fbbbc39125c5052 Mon Sep 17 00:00:00 2001 From: Zheng Bin <zhengbin13@huawei.com> Date: Mon, 15 Jun 2020 09:21:53 +0800 Subject: [PATCH] 9p: Fix memory leak in v9fs_mount @@ -23,6 +23,7 @@ Fixes: 60e78d2c993e ("9p: Add fscache support to 9p") Cc: <stable@vger.kernel.org> # v2.6.32+ Signed-off-by: Zheng Bin <zhengbin13@huawei.com> Signed-off-by: Dominique Martinet <asmadeus@codewreck.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c index 15a99f9c7253..39def020a074 100644 diff --git a/queue/ACPICA-Do-not-increment-operation_region-reference-c.patch b/queue/ACPICA-Do-not-increment-operation_region-reference-c.patch index 228ded93..20c9a46e 100644 --- a/queue/ACPICA-Do-not-increment-operation_region-reference-c.patch +++ b/queue/ACPICA-Do-not-increment-operation_region-reference-c.patch @@ -1,4 +1,4 @@ -From 6a54ebae6d047c988a31f5ac5a64ab5cf83797a2 Mon Sep 17 00:00:00 2001 +From de27f3adbf19a13bb2f4b52594d5cc8cf835b680 Mon Sep 17 00:00:00 2001 From: Erik Kaneda <erik.kaneda@intel.com> Date: Mon, 20 Jul 2020 10:31:20 -0700 Subject: [PATCH] ACPICA: Do not increment operation_region reference counts @@ -29,9 +29,10 @@ Link: https://github.com/acpica/acpica/commit/e17b28cf Signed-off-by: Erik Kaneda <erik.kaneda@intel.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c -index a4e306690a21..4a0f03157e08 100644 +index 728d752f7adc..85f799c9c25c 100644 --- a/drivers/acpi/acpica/exprep.c +++ b/drivers/acpi/acpica/exprep.c @@ -473,10 +473,6 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info) diff --git a/queue/ALSA-hda-fix-the-micmute-led-status-for-Lenovo-Think.patch b/queue/ALSA-hda-fix-the-micmute-led-status-for-Lenovo-Think.patch index a2fff397..6a9c698a 100644 --- a/queue/ALSA-hda-fix-the-micmute-led-status-for-Lenovo-Think.patch +++ b/queue/ALSA-hda-fix-the-micmute-led-status-for-Lenovo-Think.patch @@ -1,4 +1,4 @@ -From 386a6539992b82fe9ac4f9dc3f548956fd894d8c Mon Sep 17 00:00:00 2001 +From d7e2d72ddcfaa2c93ffb8943b1e9eaca68c9745e Mon Sep 17 00:00:00 2001 From: Hui Wang <hui.wang@canonical.com> Date: Mon, 10 Aug 2020 10:16:59 +0800 Subject: [PATCH] ALSA: hda - fix the micmute led status for Lenovo ThinkCentre @@ -17,12 +17,13 @@ Cc: <stable@vger.kernel.org> Signed-off-by: Hui Wang <hui.wang@canonical.com> Link: https://lore.kernel.org/r/20200810021659.7429-1-hui.wang@canonical.com Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index daedcc0adc21..09d93dd88713 100644 +index e1bcc930b201..0a3d985e3400 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c -@@ -4414,6 +4414,7 @@ static void alc233_fixup_lenovo_line2_mic_hotkey(struct hda_codec *codec, +@@ -4390,6 +4390,7 @@ static void alc233_fixup_lenovo_line2_mic_hotkey(struct hda_codec *codec, { struct alc_spec *spec = codec->spec; diff --git a/queue/ALSA-usb-audio-Creative-USB-X-Fi-Pro-SB1095-volume-k.patch b/queue/ALSA-usb-audio-Creative-USB-X-Fi-Pro-SB1095-volume-k.patch index 9238e9c4..b90f2c41 100644 --- a/queue/ALSA-usb-audio-Creative-USB-X-Fi-Pro-SB1095-volume-k.patch +++ b/queue/ALSA-usb-audio-Creative-USB-X-Fi-Pro-SB1095-volume-k.patch @@ -1,4 +1,4 @@ -From fec9008828cde0076aae595ac031bfcf49d335a4 Mon Sep 17 00:00:00 2001 +From b0f16d2ec747c5602ec5cb9d1f6f46b1383cae0e Mon Sep 17 00:00:00 2001 From: Mirko Dietrich <buzz@l4m1.de> Date: Thu, 6 Aug 2020 14:48:50 +0200 Subject: [PATCH] ALSA: usb-audio: Creative USB X-Fi Pro SB1095 volume knob @@ -15,12 +15,13 @@ Signed-off-by: Mirko Dietrich <buzz@l4m1.de> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200806124850.20334-1-buzz@l4m1.de Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c -index cec1cfd7edb7..199cdbfdc761 100644 +index 27d9b47ef7d3..c48104208fed 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c -@@ -185,6 +185,7 @@ static const struct rc_config { +@@ -183,6 +183,7 @@ static const struct rc_config { { USB_ID(0x041e, 0x3042), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 */ { USB_ID(0x041e, 0x30df), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 Pro */ { USB_ID(0x041e, 0x3237), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 Pro */ diff --git a/queue/ALSA-usb-audio-Update-documentation-comment-for-MS21.patch b/queue/ALSA-usb-audio-Update-documentation-comment-for-MS21.patch index 6b8117ec..9a3d8fe5 100644 --- a/queue/ALSA-usb-audio-Update-documentation-comment-for-MS21.patch +++ b/queue/ALSA-usb-audio-Update-documentation-comment-for-MS21.patch @@ -1,4 +1,4 @@ -From 74a2a7de81a2ef20732ec02087314e92692a7a1b Mon Sep 17 00:00:00 2001 +From 117775a915d6ee7f4a2084df257ab7603d4bcf50 Mon Sep 17 00:00:00 2001 From: Hector Martin <marcan@marcan.st> Date: Sun, 16 Aug 2020 17:44:31 +0900 Subject: [PATCH] ALSA: usb-audio: Update documentation comment for MS2109 @@ -13,12 +13,13 @@ Fixes: 1b7ecc241a67 ("ALSA: usb-audio: work around streaming quirk for MacroSili Signed-off-by: Hector Martin <marcan@marcan.st> Link: https://lore.kernel.org/r/20200816084431.102151-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 e6202608e043..f4fb002e3ef4 100644 +index 60139420433e..f55b605cfeb7 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h -@@ -3744,8 +3744,8 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* Asrock TRX40 Creator */ +@@ -3618,8 +3618,8 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* Asrock TRX40 Creator */ * they pretend to be 96kHz mono as a workaround for stereo being broken * by that... * diff --git a/queue/ALSA-usb-audio-add-quirk-for-Pioneer-DDJ-RB.patch b/queue/ALSA-usb-audio-add-quirk-for-Pioneer-DDJ-RB.patch index 156b3bf8..0b1b3315 100644 --- a/queue/ALSA-usb-audio-add-quirk-for-Pioneer-DDJ-RB.patch +++ b/queue/ALSA-usb-audio-add-quirk-for-Pioneer-DDJ-RB.patch @@ -1,4 +1,4 @@ -From 6e8596172ee1cd46ec0bfd5adcf4ff86371478b6 Mon Sep 17 00:00:00 2001 +From 1d4b9370577e5833b5f05c8fbdef3eb0d5070901 Mon Sep 17 00:00:00 2001 From: Hector Martin <marcan@marcan.st> Date: Mon, 10 Aug 2020 17:25:02 +0900 Subject: [PATCH] ALSA: usb-audio: add quirk for Pioneer DDJ-RB @@ -12,12 +12,13 @@ Cc: stable@vger.kernel.org Signed-off-by: Hector Martin <marcan@marcan.st> Link: https://lore.kernel.org/r/20200810082502.225979-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 9c3c03dc96d3..d79e3ddc5690 100644 +index 4c3129c57777..60139420433e 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h -@@ -3558,6 +3558,62 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), +@@ -3513,6 +3513,62 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), } } }, diff --git a/queue/ALSA-usb-audio-work-around-streaming-quirk-for-Macro.patch b/queue/ALSA-usb-audio-work-around-streaming-quirk-for-Macro.patch index 3ac208ca..ec618911 100644 --- a/queue/ALSA-usb-audio-work-around-streaming-quirk-for-Macro.patch +++ b/queue/ALSA-usb-audio-work-around-streaming-quirk-for-Macro.patch @@ -1,4 +1,4 @@ -From 74f0d5ee1aeb043d226092624cac97d8d73e288e Mon Sep 17 00:00:00 2001 +From bac948b53695bf94b75a95789af252b654afafe3 Mon Sep 17 00:00:00 2001 From: Hector Martin <marcan@marcan.st> Date: Mon, 10 Aug 2020 17:24:00 +0900 Subject: [PATCH] ALSA: usb-audio: work around streaming quirk for MacroSilicon @@ -21,6 +21,7 @@ Cc: stable@vger.kernel.org Signed-off-by: Hector Martin <marcan@marcan.st> Link: https://lore.kernel.org/r/20200810082400.225858-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/card.h b/sound/usb/card.h index de43267b9c8a..5351d7183b1b 100644 diff --git a/queue/ARM-8992-1-Fix-unwind_frame-for-clang-built-kernels.patch b/queue/ARM-8992-1-Fix-unwind_frame-for-clang-built-kernels.patch index 63fd984c..b7e0552a 100644 --- a/queue/ARM-8992-1-Fix-unwind_frame-for-clang-built-kernels.patch +++ b/queue/ARM-8992-1-Fix-unwind_frame-for-clang-built-kernels.patch @@ -1,4 +1,4 @@ -From b4d5ec9b39f8b31d98f65bc5577b5d15d93795d7 Mon Sep 17 00:00:00 2001 +From 00e4268f474b94e34fae1c9880baa3ce5e6b7037 Mon Sep 17 00:00:00 2001 From: Nathan Huckleberry <nhuck@google.com> Date: Fri, 10 Jul 2020 20:23:37 +0100 Subject: [PATCH] ARM: 8992/1: Fix unwind_frame for clang-built kernels @@ -23,9 +23,10 @@ Cc: stable@vger.kernel.org Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Nathan Huckleberry <nhuck@google.com> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c -index cc726afea023..76ea4178a55c 100644 +index 71778bb0475b..a082f6e4f0f4 100644 --- a/arch/arm/kernel/stacktrace.c +++ b/arch/arm/kernel/stacktrace.c @@ -22,6 +22,19 @@ diff --git a/queue/ARM-at91-pm-add-missing-put_device-call-in-at91_pm_s.patch b/queue/ARM-at91-pm-add-missing-put_device-call-in-at91_pm_s.patch index fd7e761b..073ea1ba 100644 --- a/queue/ARM-at91-pm-add-missing-put_device-call-in-at91_pm_s.patch +++ b/queue/ARM-at91-pm-add-missing-put_device-call-in-at91_pm_s.patch @@ -1,4 +1,4 @@ -From f87a4f022c44e5b87e842a9f3e644fba87e8385f Mon Sep 17 00:00:00 2001 +From 38591f7a43579cd3b14b80cad91869140963c1de Mon Sep 17 00:00:00 2001 From: yu kuai <yukuai3@huawei.com> Date: Thu, 4 Jun 2020 20:33:01 +0800 Subject: [PATCH] ARM: at91: pm: add missing put_device() call in @@ -14,12 +14,13 @@ Fixes: d2e467905596 ("ARM: at91: pm: use the mmio-sram pool to access SRAM") Signed-off-by: yu kuai <yukuai3@huawei.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Link: https://lore.kernel.org/r/20200604123301.3905837-1-yukuai3@huawei.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c -index 074bde64064e..2aab043441e8 100644 +index 6550a6231f6b..21591fff6b0e 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c -@@ -592,13 +592,13 @@ static void __init at91_pm_sram_init(void) +@@ -591,13 +591,13 @@ static void __init at91_pm_sram_init(void) sram_pool = gen_pool_get(&pdev->dev, NULL); if (!sram_pool) { pr_warn("%s: sram pool unavailable!\n", __func__); @@ -35,7 +36,7 @@ index 074bde64064e..2aab043441e8 100644 } sram_pbase = gen_pool_virt_to_phys(sram_pool, sram_base); -@@ -606,12 +606,17 @@ static void __init at91_pm_sram_init(void) +@@ -605,12 +605,17 @@ static void __init at91_pm_sram_init(void) at91_pm_suspend_in_sram_sz, false); if (!at91_suspend_sram_fn) { pr_warn("SRAM: Could not map\n"); diff --git a/queue/ARM-dts-gose-Fix-ports-node-name-for-adv7180.patch b/queue/ARM-dts-gose-Fix-ports-node-name-for-adv7180.patch index ec14834a..25d90412 100644 --- a/queue/ARM-dts-gose-Fix-ports-node-name-for-adv7180.patch +++ b/queue/ARM-dts-gose-Fix-ports-node-name-for-adv7180.patch @@ -1,4 +1,4 @@ -From d344234abde938ae1062edb6c05852b0bafb4a03 Mon Sep 17 00:00:00 2001 +From 00ebe88e47fa24fe12f862ebca68ef5ba04eb871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= <niklas.soderlund+renesas@ragnatech.se> Date: Sat, 4 Jul 2020 17:58:55 +0200 @@ -16,12 +16,13 @@ Fixes: 8cae359049a88b75 ("ARM: dts: gose: add composite video input") Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> Link: https://lore.kernel.org/r/20200704155856.3037010-2-niklas.soderlund+renesas@ragnatech.se Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts -index 79baf06019f5..a378b54867bb 100644 +index f51601af89a2..06a47cc9fee3 100644 --- a/arch/arm/boot/dts/r8a7793-gose.dts +++ b/arch/arm/boot/dts/r8a7793-gose.dts -@@ -336,7 +336,7 @@ composite-in@20 { +@@ -339,7 +339,7 @@ reg = <0x20>; remote = <&vin1>; diff --git a/queue/ARM-dts-gose-Fix-ports-node-name-for-adv7612.patch b/queue/ARM-dts-gose-Fix-ports-node-name-for-adv7612.patch index 20308cfb..66791ef7 100644 --- a/queue/ARM-dts-gose-Fix-ports-node-name-for-adv7612.patch +++ b/queue/ARM-dts-gose-Fix-ports-node-name-for-adv7612.patch @@ -1,4 +1,4 @@ -From 59692ac5a7bb8c97ff440fc8917828083fbc38d6 Mon Sep 17 00:00:00 2001 +From 591788146488e879b207a331a01b230b98610f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= <niklas.soderlund+renesas@ragnatech.se> Date: Mon, 13 Jul 2020 13:10:16 +0200 @@ -16,12 +16,13 @@ Fixes: bc63cd87f3ce924f ("ARM: dts: gose: add HDMI input") Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> Link: https://lore.kernel.org/r/20200713111016.523189-1-niklas.soderlund+renesas@ragnatech.se Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts -index 31fd3e9ae33e..abf487e8fe0f 100644 +index 06a47cc9fee3..68da21cbdd8f 100644 --- a/arch/arm/boot/dts/r8a7793-gose.dts +++ b/arch/arm/boot/dts/r8a7793-gose.dts -@@ -393,7 +393,7 @@ hdmi-in@4c { +@@ -399,7 +399,7 @@ interrupts = <2 IRQ_TYPE_LEVEL_LOW>; default-input = <0>; diff --git a/queue/ARM-dts-sunxi-bananapi-m2-plus-v1.2-Add-regulator-su.patch b/queue/ARM-dts-sunxi-bananapi-m2-plus-v1.2-Add-regulator-su.patch index d94179bc..f186f438 100644 --- a/queue/ARM-dts-sunxi-bananapi-m2-plus-v1.2-Add-regulator-su.patch +++ b/queue/ARM-dts-sunxi-bananapi-m2-plus-v1.2-Add-regulator-su.patch @@ -1,4 +1,4 @@ -From 55b271af765b0e03d1ff29502f81644b1a3c87fd Mon Sep 17 00:00:00 2001 +From 39ad79097533eb2a81a53455a645d9f15b59fc89 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai <wens@csie.org> Date: Sat, 18 Jul 2020 00:00:47 +0800 Subject: [PATCH] ARM: dts: sunxi: bananapi-m2-plus-v1.2: Add regulator supply @@ -18,12 +18,13 @@ Fixes: 6eeb4180d4b9 ("ARM: dts: sunxi: h3-h5: Add Bananapi M2+ v1.2 device trees Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime@cerno.tech> Link: https://lore.kernel.org/r/20200717160053.31191-3-wens@kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi b/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi -index 22466afd38a3..a628b5ee72b6 100644 +index 53edd1faee99..23fcdee27a8a 100644 --- a/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi +++ b/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi -@@ -28,3 +28,15 @@ reg_vdd_cpux: vdd-cpux { +@@ -29,3 +29,15 @@ &cpu0 { cpu-supply = <®_vdd_cpux>; }; diff --git a/queue/ARM-dts-sunxi-bananapi-m2-plus-v1.2-Fix-CPU-supply-v.patch b/queue/ARM-dts-sunxi-bananapi-m2-plus-v1.2-Fix-CPU-supply-v.patch index a17e4861..3c687623 100644 --- a/queue/ARM-dts-sunxi-bananapi-m2-plus-v1.2-Fix-CPU-supply-v.patch +++ b/queue/ARM-dts-sunxi-bananapi-m2-plus-v1.2-Fix-CPU-supply-v.patch @@ -1,4 +1,4 @@ -From 6c80c2dda75d61197317d434899d96147f217f0c Mon Sep 17 00:00:00 2001 +From c741f4a365adb1f455c5234065089e8dac81c3e5 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai <wens@csie.org> Date: Sat, 18 Jul 2020 00:00:48 +0800 Subject: [PATCH] ARM: dts: sunxi: bananapi-m2-plus-v1.2: Fix CPU supply @@ -19,6 +19,7 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime@cerno.tech> Link: https://lore.kernel.org/r/20200717160053.31191-4-wens@kernel.org [PG: adjust for extra line returns in v5.2.x code base.] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi b/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi index 23fcdee27a8a..3635b251e250 100644 diff --git a/queue/ARM-exynos-MCPM-Restore-big.LITTLE-cpuidle-support.patch b/queue/ARM-exynos-MCPM-Restore-big.LITTLE-cpuidle-support.patch index 2f84cfd3..170e39b3 100644 --- a/queue/ARM-exynos-MCPM-Restore-big.LITTLE-cpuidle-support.patch +++ b/queue/ARM-exynos-MCPM-Restore-big.LITTLE-cpuidle-support.patch @@ -1,4 +1,4 @@ -From ea9dd8f61c8a890843f68e8dc0062ce78365aab8 Mon Sep 17 00:00:00 2001 +From 66758fd399ac12bd665a41c9262bf9faac7251d3 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski <m.szyprowski@samsung.com> Date: Mon, 29 Jun 2020 12:02:18 +0200 Subject: [PATCH] ARM: exynos: MCPM: Restore big.LITTLE cpuidle support @@ -19,6 +19,7 @@ Fixes: 833b5794e330 ("ARM: EXYNOS: reset Little cores when cpu is up") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: Lukasz Luba <lukasz.luba@arm.com> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/mach-exynos/mcpm-exynos.c b/arch/arm/mach-exynos/mcpm-exynos.c index 9a681b421ae1..cd861c57d5ad 100644 diff --git a/queue/ARM-socfpga-PM-add-missing-put_device-call-in-socfpg.patch b/queue/ARM-socfpga-PM-add-missing-put_device-call-in-socfpg.patch index 86599b4e..da52a130 100644 --- a/queue/ARM-socfpga-PM-add-missing-put_device-call-in-socfpg.patch +++ b/queue/ARM-socfpga-PM-add-missing-put_device-call-in-socfpg.patch @@ -1,4 +1,4 @@ -From 3ad7b4e8f89d6bcc9887ca701cf2745a6aedb1a0 Mon Sep 17 00:00:00 2001 +From 2de5ed003f976ca22e3a3caedee9a772dd252ff3 Mon Sep 17 00:00:00 2001 From: Yu Kuai <yukuai3@huawei.com> Date: Tue, 21 Jul 2020 21:45:51 +0800 Subject: [PATCH] ARM: socfpga: PM: add missing put_device() call in @@ -13,6 +13,7 @@ fix the exception handling for this function implementation. Fixes: 44fd8c7d4005 ("ARM: socfpga: support suspend to ram") Signed-off-by: Yu Kuai <yukuai3@huawei.com> Signed-off-by: Dinh Nguyen <dinguyen@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/mach-socfpga/pm.c b/arch/arm/mach-socfpga/pm.c index 6ed887cf8dc9..365c0428b21b 100644 diff --git a/queue/ASoC-Intel-bxt_rt298-add-missing-.owner-field.patch b/queue/ASoC-Intel-bxt_rt298-add-missing-.owner-field.patch index 1524ba02..646b9464 100644 --- a/queue/ASoC-Intel-bxt_rt298-add-missing-.owner-field.patch +++ b/queue/ASoC-Intel-bxt_rt298-add-missing-.owner-field.patch @@ -1,4 +1,4 @@ -From 88cee34b776f80d2da04afb990c2a28c36799c43 Mon Sep 17 00:00:00 2001 +From 369a5019f866ad52573ab2c8a700623d4cf09592 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Date: Thu, 25 Jun 2020 14:12:55 -0500 Subject: [PATCH] ASoC: Intel: bxt_rt298: add missing .owner field @@ -18,12 +18,13 @@ Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Link: https://lore.kernel.org/r/20200625191308.3322-5-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/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c -index 7a4decf34191..c84c60df17db 100644 +index 771df36fbbaf..82d4fdacfcf7 100644 --- a/sound/soc/intel/boards/bxt_rt298.c +++ b/sound/soc/intel/boards/bxt_rt298.c -@@ -565,6 +565,7 @@ static int bxt_card_late_probe(struct snd_soc_card *card) +@@ -537,6 +537,7 @@ static int bxt_card_late_probe(struct snd_soc_card *card) /* broxton audio machine driver for SPT + RT298S */ static struct snd_soc_card broxton_rt298 = { .name = "broxton-rt298", @@ -31,7 +32,7 @@ index 7a4decf34191..c84c60df17db 100644 .dai_link = broxton_rt298_dais, .num_links = ARRAY_SIZE(broxton_rt298_dais), .controls = broxton_controls, -@@ -580,6 +581,7 @@ static struct snd_soc_card broxton_rt298 = { +@@ -552,6 +553,7 @@ static struct snd_soc_card broxton_rt298 = { static struct snd_soc_card geminilake_rt298 = { .name = "geminilake-rt298", diff --git a/queue/ASoC-SOF-nocodec-add-missing-.owner-field.patch b/queue/ASoC-SOF-nocodec-add-missing-.owner-field.patch index 65db6319..01b4500c 100644 --- a/queue/ASoC-SOF-nocodec-add-missing-.owner-field.patch +++ b/queue/ASoC-SOF-nocodec-add-missing-.owner-field.patch @@ -1,4 +1,4 @@ -From 8753889e2720c1ef7ebf03370e384f5bf5ff4fab Mon Sep 17 00:00:00 2001 +From 3e331e1c8942de702fab00db6602dd712721c01c Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Date: Thu, 25 Jun 2020 14:12:52 -0500 Subject: [PATCH] ASoC: SOF: nocodec: add missing .owner field @@ -18,9 +18,10 @@ Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Link: https://lore.kernel.org/r/20200625191308.3322-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/sof/nocodec.c b/sound/soc/sof/nocodec.c -index d03b5be31255..9e922df6a710 100644 +index dcdb36a46a6c..906cd6bdd54f 100644 --- a/sound/soc/sof/nocodec.c +++ b/sound/soc/sof/nocodec.c @@ -14,6 +14,7 @@ diff --git a/queue/ASoC-meson-axg-tdm-formatters-fix-sclk-inversion.patch b/queue/ASoC-meson-axg-tdm-formatters-fix-sclk-inversion.patch index 6dbcf617..eb234eb4 100644 --- a/queue/ASoC-meson-axg-tdm-formatters-fix-sclk-inversion.patch +++ b/queue/ASoC-meson-axg-tdm-formatters-fix-sclk-inversion.patch @@ -1,4 +1,4 @@ -From 7b27cb082192456d5c90a0abc59e9c897f5e2337 Mon Sep 17 00:00:00 2001 +From 43ddd82c92305490cac923c0a35fcc116be7bc51 Mon Sep 17 00:00:00 2001 From: Jerome Brunet <jbrunet@baylibre.com> Date: Wed, 29 Jul 2020 17:44:55 +0200 Subject: [PATCH] ASoC: meson: axg-tdm-formatters: fix sclk inversion @@ -16,6 +16,7 @@ Fixes: 1a11d88f499c ("ASoC: meson: add tdm formatter base driver") Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Link: https://lore.kernel.org/r/20200729154456.1983396-4-jbrunet@baylibre.com Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/meson/axg-tdm-formatter.c b/sound/soc/meson/axg-tdm-formatter.c index 0c6cce5c5773..9bcaf4b8b57e 100644 diff --git a/queue/ASoC-meson-axg-tdm-interface-fix-link-fmt-setup.patch b/queue/ASoC-meson-axg-tdm-interface-fix-link-fmt-setup.patch index dcadb660..d5b28a1d 100644 --- a/queue/ASoC-meson-axg-tdm-interface-fix-link-fmt-setup.patch +++ b/queue/ASoC-meson-axg-tdm-interface-fix-link-fmt-setup.patch @@ -1,4 +1,4 @@ -From 6878ba91ce84f7a07887a0615af70f969508839f Mon Sep 17 00:00:00 2001 +From a5e8b5feaa961249ed9c857429d64849c1e3fc30 Mon Sep 17 00:00:00 2001 From: Jerome Brunet <jbrunet@baylibre.com> Date: Wed, 29 Jul 2020 17:44:53 +0200 Subject: [PATCH] ASoC: meson: axg-tdm-interface: fix link fmt setup @@ -15,9 +15,10 @@ Fixes: d60e4f1e4be5 ("ASoC: meson: add tdm interface driver") Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Link: https://lore.kernel.org/r/20200729154456.1983396-2-jbrunet@baylibre.com Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/meson/axg-tdm-interface.c b/sound/soc/meson/axg-tdm-interface.c -index 6de27238e9df..36df30915378 100644 +index 585ce030b79b..702595715f94 100644 --- a/sound/soc/meson/axg-tdm-interface.c +++ b/sound/soc/meson/axg-tdm-interface.c @@ -119,18 +119,25 @@ static int axg_tdm_iface_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) diff --git a/queue/ASoC-meson-axg-tdmin-fix-g12a-skew.patch b/queue/ASoC-meson-axg-tdmin-fix-g12a-skew.patch index 391c641b..47a9592f 100644 --- a/queue/ASoC-meson-axg-tdmin-fix-g12a-skew.patch +++ b/queue/ASoC-meson-axg-tdmin-fix-g12a-skew.patch @@ -1,4 +1,4 @@ -From 80a254394fcfe55450b0351da298ca7231889219 Mon Sep 17 00:00:00 2001 +From 071671b953ea5746411a94ba5fb69e7841d93269 Mon Sep 17 00:00:00 2001 From: Jerome Brunet <jbrunet@baylibre.com> Date: Wed, 29 Jul 2020 17:44:54 +0200 Subject: [PATCH] ASoC: meson: axg-tdmin: fix g12a skew @@ -13,12 +13,13 @@ Fixes: f01bc67f58fd ("ASoC: meson: axg-tdm-formatter: rework quirks settings") Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Link: https://lore.kernel.org/r/20200729154456.1983396-3-jbrunet@baylibre.com Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/meson/axg-tdmin.c b/sound/soc/meson/axg-tdmin.c -index 973d4c02ef8d..3d002b4eb939 100644 +index a790f925a4ef..7f36fb422f56 100644 --- a/sound/soc/meson/axg-tdmin.c +++ b/sound/soc/meson/axg-tdmin.c -@@ -233,10 +233,26 @@ static const struct axg_tdm_formatter_driver axg_tdmin_drv = { +@@ -213,10 +213,26 @@ static const struct axg_tdm_formatter_driver axg_tdmin_drv = { }, }; diff --git a/queue/ASoC-meson-axg-tdmout-right_j-is-not-supported.patch b/queue/ASoC-meson-axg-tdmout-right_j-is-not-supported.patch index 3a119bf4..967f6ee5 100644 --- a/queue/ASoC-meson-axg-tdmout-right_j-is-not-supported.patch +++ b/queue/ASoC-meson-axg-tdmout-right_j-is-not-supported.patch @@ -1,4 +1,4 @@ -From 7e0d7d0fbd06af0507611f85dba8daf24832abd9 Mon Sep 17 00:00:00 2001 +From 3978a839134c501cd4ae1a03ff4c2914bbd253ee Mon Sep 17 00:00:00 2001 From: Jerome Brunet <jbrunet@baylibre.com> Date: Thu, 13 Jun 2019 13:42:31 +0200 Subject: [PATCH] ASoC: meson: axg-tdmout: right_j is not supported @@ -11,6 +11,7 @@ encoder. Fixes: c41c2a355b86 ("ASoC: meson: add tdm output driver") Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/meson/axg-tdmout.c b/sound/soc/meson/axg-tdmout.c index 527bfc4487e0..86537fc0ecb5 100644 diff --git a/queue/ASoC-meson-tdmout-add-sm1-support.patch b/queue/ASoC-meson-tdmout-add-sm1-support.patch index 818b3a80..363eacbb 100644 --- a/queue/ASoC-meson-tdmout-add-sm1-support.patch +++ b/queue/ASoC-meson-tdmout-add-sm1-support.patch @@ -1,4 +1,4 @@ -From 329299d6652fa287a0551ae412cc0227d539a0fe Mon Sep 17 00:00:00 2001 +From ba943abd127cfbb379d87cf7e62f37d32cbe46d1 Mon Sep 17 00:00:00 2001 From: Jerome Brunet <jbrunet@baylibre.com> Date: Thu, 5 Sep 2019 14:01:20 +0200 Subject: [PATCH] ASoC: meson: tdmout: add sm1 support @@ -11,6 +11,7 @@ the gain enable bit moved to accommodate this extension Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Link: https://lore.kernel.org/r/20190905120120.31752-9-jbrunet@baylibre.com Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/meson/axg-tdmout.c b/sound/soc/meson/axg-tdmout.c index 86537fc0ecb5..418ec314b37d 100644 diff --git a/queue/Bluetooth-add-a-mutex-lock-to-avoid-UAF-in-do_enale_.patch b/queue/Bluetooth-add-a-mutex-lock-to-avoid-UAF-in-do_enale_.patch index dd220d29..17eb1077 100644 --- a/queue/Bluetooth-add-a-mutex-lock-to-avoid-UAF-in-do_enale_.patch +++ b/queue/Bluetooth-add-a-mutex-lock-to-avoid-UAF-in-do_enale_.patch @@ -1,4 +1,4 @@ -From f9c70bdc279b191da8d60777c627702c06e4a37d Mon Sep 17 00:00:00 2001 +From 415f13a7f473cc8381610523c9c82d55f8db4d17 Mon Sep 17 00:00:00 2001 From: Lihong Kou <koulihong@huawei.com> Date: Tue, 23 Jun 2020 20:28:41 +0800 Subject: [PATCH] Bluetooth: add a mutex lock to avoid UAF in do_enale_set @@ -89,9 +89,10 @@ Memory state around the buggy address: Reported-by: syzbot+96414aa0033c363d8458@syzkaller.appspotmail.com Signed-off-by: Lihong Kou <koulihong@huawei.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c -index bb55d92691b0..cff4944d5b66 100644 +index 9001bf331d56..120529290d99 100644 --- a/net/bluetooth/6lowpan.c +++ b/net/bluetooth/6lowpan.c @@ -50,6 +50,7 @@ static bool enable_6lowpan; @@ -102,7 +103,7 @@ index bb55d92691b0..cff4944d5b66 100644 struct lowpan_peer { struct list_head list; -@@ -1078,12 +1079,14 @@ static void do_enable_set(struct work_struct *work) +@@ -1075,12 +1076,14 @@ static void do_enable_set(struct work_struct *work) enable_6lowpan = set_enable->flag; @@ -117,7 +118,7 @@ index bb55d92691b0..cff4944d5b66 100644 kfree(set_enable); } -@@ -1135,11 +1138,13 @@ static ssize_t lowpan_control_write(struct file *fp, +@@ -1132,11 +1135,13 @@ static ssize_t lowpan_control_write(struct file *fp, if (ret == -EINVAL) return ret; diff --git a/queue/Bluetooth-btmtksdio-fix-up-firmware-download-sequenc.patch b/queue/Bluetooth-btmtksdio-fix-up-firmware-download-sequenc.patch index ec0b1135..bee64e85 100644 --- a/queue/Bluetooth-btmtksdio-fix-up-firmware-download-sequenc.patch +++ b/queue/Bluetooth-btmtksdio-fix-up-firmware-download-sequenc.patch @@ -1,4 +1,4 @@ -From 737cd06072a72e8984e41af8e5919338d0c5bf2b Mon Sep 17 00:00:00 2001 +From f29b660a882d7134ce3a3f56eedbf00250daca08 Mon Sep 17 00:00:00 2001 From: Sean Wang <sean.wang@mediatek.com> Date: Fri, 19 Jun 2020 19:52:02 +0000 Subject: [PATCH] Bluetooth: btmtksdio: fix up firmware download sequence @@ -13,12 +13,13 @@ Co-developed-by: Mark Chen <Mark-YW.Chen@mediatek.com> Signed-off-by: Mark Chen <Mark-YW.Chen@mediatek.com> Signed-off-by: Sean Wang <sean.wang@mediatek.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c -index 519788c442ca..11494cd2a982 100644 +index 813338288453..b7de7cb8cca9 100644 --- a/drivers/bluetooth/btmtksdio.c +++ b/drivers/bluetooth/btmtksdio.c -@@ -685,7 +685,7 @@ static int mtk_setup_firmware(struct hci_dev *hdev, const char *fwname) +@@ -684,7 +684,7 @@ static int mtk_setup_firmware(struct hci_dev *hdev, const char *fwname) const u8 *fw_ptr; size_t fw_size; int err, dlen; @@ -27,7 +28,7 @@ index 519788c442ca..11494cd2a982 100644 err = request_firmware(&fw, fwname, &hdev->dev); if (err < 0) { -@@ -693,6 +693,20 @@ static int mtk_setup_firmware(struct hci_dev *hdev, const char *fwname) +@@ -692,6 +692,20 @@ static int mtk_setup_firmware(struct hci_dev *hdev, const char *fwname) return err; } diff --git a/queue/Bluetooth-hci_h5-Set-HCI_UART_RESET_ON_INIT-to-corre.patch b/queue/Bluetooth-hci_h5-Set-HCI_UART_RESET_ON_INIT-to-corre.patch index 57010dac..f4c8e347 100644 --- a/queue/Bluetooth-hci_h5-Set-HCI_UART_RESET_ON_INIT-to-corre.patch +++ b/queue/Bluetooth-hci_h5-Set-HCI_UART_RESET_ON_INIT-to-corre.patch @@ -1,4 +1,4 @@ -From a7ad4b6119d740b1ec5788f1b98be0fd1c1b5a5a Mon Sep 17 00:00:00 2001 +From ea0178ac956988d36b63afbea646347f289805e6 Mon Sep 17 00:00:00 2001 From: Nicolas Boichat <drinkcat@chromium.org> Date: Tue, 21 Jul 2020 10:37:15 +0800 Subject: [PATCH] Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct @@ -12,12 +12,13 @@ Fixes: ce945552fde4a09 ("Bluetooth: hci_h5: Add support for serdev enumerated de Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c -index e60b2e0773db..e41854e0d79a 100644 +index dacf297baf59..5df0651b6cd5 100644 --- a/drivers/bluetooth/hci_h5.c +++ b/drivers/bluetooth/hci_h5.c -@@ -793,7 +793,7 @@ static int h5_serdev_probe(struct serdev_device *serdev) +@@ -790,7 +790,7 @@ static int h5_serdev_probe(struct serdev_device *serdev) if (!h5) return -ENOMEM; diff --git a/queue/Bluetooth-hci_serdev-Only-unregister-device-if-it-wa.patch b/queue/Bluetooth-hci_serdev-Only-unregister-device-if-it-wa.patch index bf2e159c..ee35a632 100644 --- a/queue/Bluetooth-hci_serdev-Only-unregister-device-if-it-wa.patch +++ b/queue/Bluetooth-hci_serdev-Only-unregister-device-if-it-wa.patch @@ -1,4 +1,4 @@ -From 202798db9570104728dce8bb57dfeed47ce764bc Mon Sep 17 00:00:00 2001 +From 2bd73b4100b0bcb46fbddc012bdb33b49c96176d Mon Sep 17 00:00:00 2001 From: Nicolas Boichat <drinkcat@chromium.org> Date: Tue, 21 Jul 2020 10:37:16 +0800 Subject: [PATCH] Bluetooth: hci_serdev: Only unregister device if it was @@ -12,12 +12,13 @@ successfully registered. Fixes: c34dc3bfa7642fd ("Bluetooth: hci_serdev: Introduce hci_uart_unregister_device()") Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/bluetooth/hci_serdev.c b/drivers/bluetooth/hci_serdev.c -index 599855e4c57c..7b233312e723 100644 +index 4652896d4990..ad2f26cb2622 100644 --- a/drivers/bluetooth/hci_serdev.c +++ b/drivers/bluetooth/hci_serdev.c -@@ -355,7 +355,8 @@ void hci_uart_unregister_device(struct hci_uart *hu) +@@ -357,7 +357,8 @@ void hci_uart_unregister_device(struct hci_uart *hu) struct hci_dev *hdev = hu->hdev; clear_bit(HCI_UART_PROTO_READY, &hu->flags); diff --git a/queue/EDAC-Fix-reference-count-leaks.patch b/queue/EDAC-Fix-reference-count-leaks.patch index 9aae66c0..11a2f71e 100644 --- a/queue/EDAC-Fix-reference-count-leaks.patch +++ b/queue/EDAC-Fix-reference-count-leaks.patch @@ -1,4 +1,4 @@ -From 17ed808ad243192fb923e4e653c1338d3ba06207 Mon Sep 17 00:00:00 2001 +From 86637f92d3b1faf23b54d1ad9c68c2ced2ca85b0 Mon Sep 17 00:00:00 2001 From: Qiushi Wu <wu000273@umn.edu> Date: Thu, 28 May 2020 15:22:37 -0500 Subject: [PATCH] EDAC: Fix reference count leaks @@ -21,6 +21,7 @@ Signed-off-by: Qiushi Wu <wu000273@umn.edu> Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/20200528202238.18078-1-wu000273@umn.edu Link: https://lkml.kernel.org/r/20200528203526.20908-1-wu000273@umn.edu +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c index 0e7ea3591b78..5e7593753799 100644 diff --git a/queue/HID-input-Fix-devices-that-return-multiple-bytes-in-.patch b/queue/HID-input-Fix-devices-that-return-multiple-bytes-in-.patch index 1bc8c536..a9aac48e 100644 --- a/queue/HID-input-Fix-devices-that-return-multiple-bytes-in-.patch +++ b/queue/HID-input-Fix-devices-that-return-multiple-bytes-in-.patch @@ -1,4 +1,4 @@ -From 4f57cace81438cc873a96f9f13f08298815c9b51 Mon Sep 17 00:00:00 2001 +From 2f9ecd2d79dbbc29fc87f5b2f8c3c87a66a1b208 Mon Sep 17 00:00:00 2001 From: Grant Likely <grant.likely@secretlab.ca> Date: Fri, 10 Jul 2020 16:19:39 +0100 Subject: [PATCH] HID: input: Fix devices that return multiple bytes in battery @@ -33,9 +33,10 @@ Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com> Cc: stable@vger.kernel.org Tested-by: Darren Hart <dvhart@infradead.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c -index c8633beae260..b8eabf206e74 100644 +index dea9cc65bf80..e8641ce677e4 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -350,13 +350,13 @@ static int hidinput_query_battery_capacity(struct hid_device *dev) diff --git a/queue/Linux-5.2.59.patch b/queue/Linux-5.2.59.patch index 6b1e705f..88597c7e 100644 --- a/queue/Linux-5.2.59.patch +++ b/queue/Linux-5.2.59.patch @@ -1,8 +1,9 @@ -From fc7ab33fce5ad85b0e5e0f1306bf1a2d16e92c33 Mon Sep 17 00:00:00 2001 +From 683b4bdfed139b14d3074ef32f147548a6d32689 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Thu, 3 Sep 2020 16:14:29 -0400 Subject: [PATCH] Linux 5.2.59 +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/Makefile b/Makefile index 83663dc5d912..f42134a1b5bd 100644 diff --git a/queue/MIPS-OCTEON-add-missing-put_device-call-in-dwc3_octe.patch b/queue/MIPS-OCTEON-add-missing-put_device-call-in-dwc3_octe.patch index 465b617e..8326f971 100644 --- a/queue/MIPS-OCTEON-add-missing-put_device-call-in-dwc3_octe.patch +++ b/queue/MIPS-OCTEON-add-missing-put_device-call-in-dwc3_octe.patch @@ -1,4 +1,4 @@ -From e8b9fc10f2615b9a525fce56981e40b489528355 Mon Sep 17 00:00:00 2001 +From 3f4a958e73c02d7b209dc83456c71c292c2f146e Mon Sep 17 00:00:00 2001 From: Yu Kuai <yukuai3@huawei.com> Date: Tue, 21 Jul 2020 21:47:18 +0800 Subject: [PATCH] MIPS: OCTEON: add missing put_device() call in @@ -13,12 +13,13 @@ handling for this function implementation. Fixes: 93e502b3c2d4 ("MIPS: OCTEON: Platform support for OCTEON III USB controller") Signed-off-by: Yu Kuai <yukuai3@huawei.com> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/cavium-octeon/octeon-usb.c b/arch/mips/cavium-octeon/octeon-usb.c -index 1fd85c559700..950e6c6e8629 100644 +index 1f730ded5224..5ab29c18aacd 100644 --- a/arch/mips/cavium-octeon/octeon-usb.c +++ b/arch/mips/cavium-octeon/octeon-usb.c -@@ -518,6 +518,7 @@ static int __init dwc3_octeon_device_init(void) +@@ -517,6 +517,7 @@ static int __init dwc3_octeon_device_init(void) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (res == NULL) { @@ -26,7 +27,7 @@ index 1fd85c559700..950e6c6e8629 100644 dev_err(&pdev->dev, "No memory resources\n"); return -ENXIO; } -@@ -529,8 +530,10 @@ static int __init dwc3_octeon_device_init(void) +@@ -528,8 +529,10 @@ static int __init dwc3_octeon_device_init(void) * know the difference. */ base = devm_ioremap_resource(&pdev->dev, res); diff --git a/queue/NFS-Don-t-move-layouts-to-plh_return_segs-list-while.patch b/queue/NFS-Don-t-move-layouts-to-plh_return_segs-list-while.patch index d020288e..06984569 100644 --- a/queue/NFS-Don-t-move-layouts-to-plh_return_segs-list-while.patch +++ b/queue/NFS-Don-t-move-layouts-to-plh_return_segs-list-while.patch @@ -1,4 +1,4 @@ -From ff041727e9e029845857cac41aae118ead5e261b Mon Sep 17 00:00:00 2001 +From a65dedeafc785f4d056f6cbcfd1b233862e0f416 Mon Sep 17 00:00:00 2001 From: Trond Myklebust <trond.myklebust@hammerspace.com> Date: Tue, 4 Aug 2020 16:30:30 -0400 Subject: [PATCH] NFS: Don't move layouts to plh_return_segs list while in use @@ -12,12 +12,13 @@ up returning the layout while I/O is still in progress. Fixes: e0b7d420f72a ("pNFS: Don't discard layout segments that are marked for return") Cc: stable@vger.kernel.org # v4.19+ Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c -index d8cdb94c6668..262ce01c7abe 100644 +index 5308aade081b..ae73377843ac 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c -@@ -2392,16 +2392,6 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) +@@ -2301,16 +2301,6 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) return ERR_PTR(-EAGAIN); } @@ -34,7 +35,7 @@ index d8cdb94c6668..262ce01c7abe 100644 /** * pnfs_mark_matching_lsegs_return - Free or return matching layout segments * @lo: pointer to layout header -@@ -2438,7 +2428,7 @@ pnfs_mark_matching_lsegs_return(struct pnfs_layout_hdr *lo, +@@ -2347,7 +2337,7 @@ pnfs_mark_matching_lsegs_return(struct pnfs_layout_hdr *lo, lseg, lseg->pls_range.iomode, lseg->pls_range.offset, lseg->pls_range.length); diff --git a/queue/NFS-Don-t-return-layout-segments-that-are-in-use.patch b/queue/NFS-Don-t-return-layout-segments-that-are-in-use.patch index 67c50a9e..489f9183 100644 --- a/queue/NFS-Don-t-return-layout-segments-that-are-in-use.patch +++ b/queue/NFS-Don-t-return-layout-segments-that-are-in-use.patch @@ -1,4 +1,4 @@ -From d474f96104bd4377573526ebae2ee212205a6839 Mon Sep 17 00:00:00 2001 +From 2c7b4c469d9bdc5be7f7752a800dbbd42e6eb353 Mon Sep 17 00:00:00 2001 From: Trond Myklebust <trond.myklebust@hammerspace.com> Date: Wed, 5 Aug 2020 09:03:56 -0400 Subject: [PATCH] NFS: Don't return layout segments that are in use @@ -12,12 +12,13 @@ should be marked as invalid, and should no longer be in use for I/O. Fixes: f0b429819b5f ("pNFS: Ignore non-recalled layouts in pnfs_layout_need_return()") Cc: stable@vger.kernel.org # v4.19+ Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c -index 262ce01c7abe..b5baf36d4de5 100644 +index ae73377843ac..9b58894eb9b7 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c -@@ -1226,31 +1226,27 @@ pnfs_send_layoutreturn(struct pnfs_layout_hdr *lo, +@@ -1188,31 +1188,27 @@ pnfs_send_layoutreturn(struct pnfs_layout_hdr *lo, const nfs4_stateid *stateid, return status; } diff --git a/queue/PCI-ASPM-Add-missing-newline-in-sysfs-policy.patch b/queue/PCI-ASPM-Add-missing-newline-in-sysfs-policy.patch index 51c1c8b9..58e06d22 100644 --- a/queue/PCI-ASPM-Add-missing-newline-in-sysfs-policy.patch +++ b/queue/PCI-ASPM-Add-missing-newline-in-sysfs-policy.patch @@ -1,4 +1,4 @@ -From 3167e3d340c092fd47924bc4d23117a3074ef9a9 Mon Sep 17 00:00:00 2001 +From f3da38e03969d2d34b363baaf4f9d402f0f263d3 Mon Sep 17 00:00:00 2001 From: Xiongfeng Wang <wangxiongfeng2@huawei.com> Date: Fri, 17 Jul 2020 15:59:25 +0800 Subject: [PATCH] PCI/ASPM: Add missing newline in sysfs 'policy' @@ -16,12 +16,13 @@ Fixes: 7d715a6c1ae5 ("PCI: add PCI Express ASPM support") Link: https://lore.kernel.org/r/1594972765-10404-1-git-send-email-wangxiongfeng2@huawei.com Signed-off-by: Xiongfeng Wang <wangxiongfeng2@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c -index b17e5ffd31b1..253c30cc1967 100644 +index 72c705843347..676863722695 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c -@@ -1182,6 +1182,7 @@ static int pcie_aspm_get_policy(char *buffer, const struct kernel_param *kp) +@@ -1156,6 +1156,7 @@ static int pcie_aspm_get_policy(char *buffer, const struct kernel_param *kp) cnt += sprintf(buffer + cnt, "[%s] ", policy_str[i]); else cnt += sprintf(buffer + cnt, "%s ", policy_str[i]); diff --git a/queue/PCI-Fix-pci_cfg_wait-queue-locking-problem.patch b/queue/PCI-Fix-pci_cfg_wait-queue-locking-problem.patch index f72af93f..7e15526c 100644 --- a/queue/PCI-Fix-pci_cfg_wait-queue-locking-problem.patch +++ b/queue/PCI-Fix-pci_cfg_wait-queue-locking-problem.patch @@ -1,4 +1,4 @@ -From 2a7e32d0547f41c5ce244f84cf5d6ca7fccee7eb Mon Sep 17 00:00:00 2001 +From 315615ca944dd94e93272d84fc3dd357b0f3ad48 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas <bhelgaas@google.com> Date: Thu, 25 Jun 2020 18:14:55 -0500 Subject: [PATCH] PCI: Fix pci_cfg_wait queue locking problem @@ -36,9 +36,10 @@ Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Tested-by: Xiang Zheng <zhengxiang9@huawei.com> Cc: Heyi Guo <guoheyi@huawei.com> Cc: Biaoxiang Ye <yebiaoxiang@huawei.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/access.c b/drivers/pci/access.c -index 79c4a2ef269a..9793f17fa184 100644 +index 2fccb5762c76..0914ddeae17f 100644 --- a/drivers/pci/access.c +++ b/drivers/pci/access.c @@ -204,17 +204,13 @@ EXPORT_SYMBOL(pci_bus_set_ops); diff --git a/queue/PCI-Release-IVRS-table-in-AMD-ACS-quirk.patch b/queue/PCI-Release-IVRS-table-in-AMD-ACS-quirk.patch index 8d7889c1..1a6f7376 100644 --- a/queue/PCI-Release-IVRS-table-in-AMD-ACS-quirk.patch +++ b/queue/PCI-Release-IVRS-table-in-AMD-ACS-quirk.patch @@ -1,4 +1,4 @@ -From 090688fa4e448284aaa16136372397d7d10814db Mon Sep 17 00:00:00 2001 +From 50547bc2c8e4d427d7d89d5295b7e1e5bc63b4b7 Mon Sep 17 00:00:00 2001 From: Hanjun Guo <guohanjun@huawei.com> Date: Wed, 22 Jul 2020 17:44:28 +0800 Subject: [PATCH] PCI: Release IVRS table in AMD ACS quirk @@ -15,12 +15,13 @@ Fixes: 15b100dfd1c9 ("PCI: Claim ACS support for AMD southbridge devices") Link: https://lore.kernel.org/r/1595411068-15440-1-git-send-email-guohanjun@huawei.com Signed-off-by: Hanjun Guo <guohanjun@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 052efeb9f053..2456a1950a8a 100644 +index f767375ed4a2..14412a66b897 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -4409,6 +4409,8 @@ static int pci_quirk_amd_sb_acs(struct pci_dev *dev, u16 acs_flags) +@@ -4353,6 +4353,8 @@ static int pci_quirk_amd_sb_acs(struct pci_dev *dev, u16 acs_flags) if (ACPI_FAILURE(status)) return -ENODEV; diff --git a/queue/PCI-cadence-Fix-updating-Vendor-ID-and-Subsystem-Ven.patch b/queue/PCI-cadence-Fix-updating-Vendor-ID-and-Subsystem-Ven.patch index 809cc2a7..4d77d83a 100644 --- a/queue/PCI-cadence-Fix-updating-Vendor-ID-and-Subsystem-Ven.patch +++ b/queue/PCI-cadence-Fix-updating-Vendor-ID-and-Subsystem-Ven.patch @@ -1,4 +1,4 @@ -From ce169c1a420439f531c0d429df24f54bd9cea6c3 Mon Sep 17 00:00:00 2001 +From 73b3a2c848f2e7a526233c954bfe73a7e881c168 Mon Sep 17 00:00:00 2001 From: Kishon Vijay Abraham I <kishon@ti.com> Date: Wed, 22 Jul 2020 16:33:11 +0530 Subject: [PATCH] PCI: cadence: Fix updating Vendor ID and Subsystem Vendor ID @@ -18,6 +18,7 @@ Fixes: 1b79c5284439 ("PCI: cadence: Add host driver for Cadence PCIe controller" Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Reviewed-by: Rob Herring <robh@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/controller/pcie-cadence-host.c b/drivers/pci/controller/pcie-cadence-host.c index 97e251090b4f..0dfc778f40a7 100644 diff --git a/queue/RDMA-core-Fix-bogus-WARN_ON-during-ib_unregister_dev.patch b/queue/RDMA-core-Fix-bogus-WARN_ON-during-ib_unregister_dev.patch index a0f2ba55..07c284e7 100644 --- a/queue/RDMA-core-Fix-bogus-WARN_ON-during-ib_unregister_dev.patch +++ b/queue/RDMA-core-Fix-bogus-WARN_ON-during-ib_unregister_dev.patch @@ -1,4 +1,4 @@ -From 22f542be85753bbf76ae1cad1fb83266c92c5a49 Mon Sep 17 00:00:00 2001 +From b6f4d1496986e419b7a01c252bff6d5d277bb340 Mon Sep 17 00:00:00 2001 From: Jason Gunthorpe <jgg@nvidia.com> Date: Fri, 26 Jun 2020 14:49:10 -0300 Subject: [PATCH] RDMA/core: Fix bogus WARN_ON during @@ -24,6 +24,7 @@ Reported-by: syzbot+4088ed905e4ae2b0e13b@syzkaller.appspotmail.com Suggested-by: Hillf Danton <hdanton@sina.com> Reviewed-by: Leon Romanovsky <leonro@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index 7823c6738ab6..80a1e20a95ae 100644 diff --git a/queue/RDMA-core-Fix-return-error-value-in-_ib_modify_qp-to.patch b/queue/RDMA-core-Fix-return-error-value-in-_ib_modify_qp-to.patch index 25d57846..b058f60b 100644 --- a/queue/RDMA-core-Fix-return-error-value-in-_ib_modify_qp-to.patch +++ b/queue/RDMA-core-Fix-return-error-value-in-_ib_modify_qp-to.patch @@ -1,4 +1,4 @@ -From 47fda651d5af2506deac57d54887cf55ce26e244 Mon Sep 17 00:00:00 2001 +From 96b3899d029b4e3f20d87342a0f258189682c285 Mon Sep 17 00:00:00 2001 From: Li Heng <liheng40@huawei.com> Date: Sat, 25 Jul 2020 10:56:27 +0800 Subject: [PATCH] RDMA/core: Fix return error value in _ib_modify_qp() to @@ -14,12 +14,13 @@ Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Li Heng <liheng40@huawei.com> Reviewed-by: Parav Pandit <parav@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c -index 10f650a17ae7..3096e73797b7 100644 +index bca9877033a7..41caf36575df 100644 --- a/drivers/infiniband/core/verbs.c +++ b/drivers/infiniband/core/verbs.c -@@ -1710,7 +1710,7 @@ static int _ib_modify_qp(struct ib_qp *qp, struct ib_qp_attr *attr, +@@ -1641,7 +1641,7 @@ static int _ib_modify_qp(struct ib_qp *qp, struct ib_qp_attr *attr, if (!(rdma_protocol_ib(qp->device, attr->alt_ah_attr.port_num) && rdma_protocol_ib(qp->device, port))) { diff --git a/queue/RDMA-qedr-SRQ-s-bug-fixes.patch b/queue/RDMA-qedr-SRQ-s-bug-fixes.patch index b4f69275..a966af33 100644 --- a/queue/RDMA-qedr-SRQ-s-bug-fixes.patch +++ b/queue/RDMA-qedr-SRQ-s-bug-fixes.patch @@ -1,4 +1,4 @@ -From acca72e2b031b9fbb4184511072bd246a0abcebc Mon Sep 17 00:00:00 2001 +From 83327e24af0bde71b5325006ce4cc22938ed2e3a Mon Sep 17 00:00:00 2001 From: Yuval Basson <ybason@marvell.com> Date: Wed, 8 Jul 2020 22:55:26 +0300 Subject: [PATCH] RDMA/qedr: SRQ's bug fixes @@ -16,12 +16,13 @@ Link: https://lore.kernel.org/r/20200708195526.31040-1-ybason@marvell.com Signed-off-by: Michal Kalderon <mkalderon@marvell.com> Signed-off-by: Yuval Basson <ybason@marvell.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/hw/qedr/qedr.h b/drivers/infiniband/hw/qedr/qedr.h -index fdf90ecb2699..aa332027da86 100644 +index 8a9b0ee7dbc5..bbf72944b720 100644 --- a/drivers/infiniband/hw/qedr/qedr.h +++ b/drivers/infiniband/hw/qedr/qedr.h -@@ -344,10 +344,10 @@ struct qedr_srq_hwq_info { +@@ -347,10 +347,10 @@ struct qedr_srq_hwq_info { u32 wqe_prod; u32 sge_prod; u32 wr_prod_cnt; @@ -35,10 +36,10 @@ index fdf90ecb2699..aa332027da86 100644 }; diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c -index 3d7d5617818f..42273aa0b5e1 100644 +index 2b1ec2d43e74..9d3204410ead 100644 --- a/drivers/infiniband/hw/qedr/verbs.c +++ b/drivers/infiniband/hw/qedr/verbs.c -@@ -3686,7 +3686,7 @@ static u32 qedr_srq_elem_left(struct qedr_srq_hwq_info *hw_srq) +@@ -3497,7 +3497,7 @@ static u32 qedr_srq_elem_left(struct qedr_srq_hwq_info *hw_srq) * count and consumer count and subtract it from max * work request supported so that we get elements left. */ @@ -47,7 +48,7 @@ index 3d7d5617818f..42273aa0b5e1 100644 return hw_srq->max_wr - used; } -@@ -3701,7 +3701,6 @@ int qedr_post_srq_recv(struct ib_srq *ibsrq, const struct ib_recv_wr *wr, +@@ -3512,7 +3512,6 @@ int qedr_post_srq_recv(struct ib_srq *ibsrq, const struct ib_recv_wr *wr, unsigned long flags; int status = 0; u32 num_sge; @@ -55,7 +56,7 @@ index 3d7d5617818f..42273aa0b5e1 100644 spin_lock_irqsave(&srq->lock, flags); -@@ -3714,7 +3713,8 @@ int qedr_post_srq_recv(struct ib_srq *ibsrq, const struct ib_recv_wr *wr, +@@ -3525,7 +3524,8 @@ int qedr_post_srq_recv(struct ib_srq *ibsrq, const struct ib_recv_wr *wr, if (!qedr_srq_elem_left(hw_srq) || wr->num_sge > srq->hw_srq.max_sges) { DP_ERR(dev, "Can't post WR (%d,%d) || (%d > %d)\n", @@ -65,7 +66,7 @@ index 3d7d5617818f..42273aa0b5e1 100644 wr->num_sge, srq->hw_srq.max_sges); status = -ENOMEM; *bad_wr = wr; -@@ -3748,22 +3748,20 @@ int qedr_post_srq_recv(struct ib_srq *ibsrq, const struct ib_recv_wr *wr, +@@ -3559,22 +3559,20 @@ int qedr_post_srq_recv(struct ib_srq *ibsrq, const struct ib_recv_wr *wr, hw_srq->sge_prod++; } @@ -94,7 +95,7 @@ index 3d7d5617818f..42273aa0b5e1 100644 wr = wr->next; } -@@ -4182,7 +4180,7 @@ static int process_resp_one_srq(struct qedr_dev *dev, struct qedr_qp *qp, +@@ -3993,7 +3991,7 @@ static int process_resp_one_srq(struct qedr_dev *dev, struct qedr_qp *qp, } else { __process_resp_one(dev, qp, cq, wc, resp, wr_id); } diff --git a/queue/RDMA-rxe-Prevent-access-to-wr-next-ptr-afrer-wr-is-p.patch b/queue/RDMA-rxe-Prevent-access-to-wr-next-ptr-afrer-wr-is-p.patch index d66cf17e..19861178 100644 --- a/queue/RDMA-rxe-Prevent-access-to-wr-next-ptr-afrer-wr-is-p.patch +++ b/queue/RDMA-rxe-Prevent-access-to-wr-next-ptr-afrer-wr-is-p.patch @@ -1,4 +1,4 @@ -From 5f0b2a6093a4d9aab093964c65083fe801ef1e58 Mon Sep 17 00:00:00 2001 +From a2be4f78973369de84ccd3f0b0a439b1fcfa3bb1 Mon Sep 17 00:00:00 2001 From: Mikhail Malygin <m.malygin@yadro.com> Date: Thu, 16 Jul 2020 22:03:41 +0300 Subject: [PATCH] RDMA/rxe: Prevent access to wr->next ptr afrer wr is posted @@ -19,12 +19,13 @@ Link: https://lore.kernel.org/r/20200716190340.23453-1-m.malygin@yadro.com Signed-off-by: Mikhail Malygin <m.malygin@yadro.com> Signed-off-by: Sergey Kojushev <s.kojushev@yadro.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c -index 74f071003690..c1649aec8c23 100644 +index 8c3e2a18cfe4..75a41f99a23a 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.c +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c -@@ -682,6 +682,7 @@ static int rxe_post_send_kernel(struct rxe_qp *qp, const struct ib_send_wr *wr, +@@ -679,6 +679,7 @@ static int rxe_post_send_kernel(struct rxe_qp *qp, const struct ib_send_wr *wr, unsigned int mask; unsigned int length = 0; int i; @@ -32,7 +33,7 @@ index 74f071003690..c1649aec8c23 100644 while (wr) { mask = wr_opcode_mask(wr->opcode, qp); -@@ -698,6 +699,8 @@ static int rxe_post_send_kernel(struct rxe_qp *qp, const struct ib_send_wr *wr, +@@ -695,6 +696,8 @@ static int rxe_post_send_kernel(struct rxe_qp *qp, const struct ib_send_wr *wr, break; } @@ -41,7 +42,7 @@ index 74f071003690..c1649aec8c23 100644 length = 0; for (i = 0; i < wr->num_sge; i++) length += wr->sg_list[i].length; -@@ -708,7 +711,7 @@ static int rxe_post_send_kernel(struct rxe_qp *qp, const struct ib_send_wr *wr, +@@ -705,7 +708,7 @@ static int rxe_post_send_kernel(struct rxe_qp *qp, const struct ib_send_wr *wr, *bad_wr = wr; break; } diff --git a/queue/RDMA-rxe-Skip-dgid-check-in-loopback-mode.patch b/queue/RDMA-rxe-Skip-dgid-check-in-loopback-mode.patch index 9d69bfbb..110efaad 100644 --- a/queue/RDMA-rxe-Skip-dgid-check-in-loopback-mode.patch +++ b/queue/RDMA-rxe-Skip-dgid-check-in-loopback-mode.patch @@ -1,4 +1,4 @@ -From 5c99274be8864519328aa74bc550ba410095bc1c Mon Sep 17 00:00:00 2001 +From 33d0e72b038984bafa6493bbfca491efc094703e Mon Sep 17 00:00:00 2001 From: Zhu Yanjun <yanjunz@mellanox.com> Date: Tue, 30 Jun 2020 15:36:05 +0300 Subject: [PATCH] RDMA/rxe: Skip dgid check in loopback mode @@ -32,6 +32,7 @@ Link: https://lore.kernel.org/r/20200630123605.446959-1-leon@kernel.org Signed-off-by: Zhu Yanjun <yanjunz@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/sw/rxe/rxe_recv.c b/drivers/infiniband/sw/rxe/rxe_recv.c index 831ad578a7b2..46e111c218fd 100644 diff --git a/queue/Revert-mmc-core-Allow-host-controllers-to-require-R1.patch b/queue/Revert-mmc-core-Allow-host-controllers-to-require-R1.patch index c936c3d2..49aa6bd4 100644 --- a/queue/Revert-mmc-core-Allow-host-controllers-to-require-R1.patch +++ b/queue/Revert-mmc-core-Allow-host-controllers-to-require-R1.patch @@ -1,4 +1,4 @@ -From c6a194403db63b2c0f450f10443b897cd847bb39 Mon Sep 17 00:00:00 2001 +From d638029ad9626ac933957de7395f51c2cc6d92c4 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Fri, 4 Sep 2020 09:48:52 -0400 Subject: [PATCH] Revert "mmc: core: Allow host controllers to require R1B for diff --git a/queue/Revert-mmc-core-Default-to-generic_cmd6_time-as-time.patch b/queue/Revert-mmc-core-Default-to-generic_cmd6_time-as-time.patch index bb95f941..0baf1090 100644 --- a/queue/Revert-mmc-core-Default-to-generic_cmd6_time-as-time.patch +++ b/queue/Revert-mmc-core-Default-to-generic_cmd6_time-as-time.patch @@ -1,4 +1,4 @@ -From 4182153f7197b506ccf6e1551207deab5f6569c1 Mon Sep 17 00:00:00 2001 +From 34447a3d419e077e31d4530cbe41e953442892b9 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Fri, 4 Sep 2020 09:49:14 -0400 Subject: [PATCH] Revert "mmc: core: Default to generic_cmd6_time as timeout in diff --git a/queue/Revert-parisc-Drop-LDCW-barrier-in-CAS-code-when-run.patch b/queue/Revert-parisc-Drop-LDCW-barrier-in-CAS-code-when-run.patch index 10e09c60..b805188b 100644 --- a/queue/Revert-parisc-Drop-LDCW-barrier-in-CAS-code-when-run.patch +++ b/queue/Revert-parisc-Drop-LDCW-barrier-in-CAS-code-when-run.patch @@ -1,4 +1,4 @@ -From 462fb756c7de1ffe5bc6099149136031c2d9c02a Mon Sep 17 00:00:00 2001 +From 53f5f3ac1ffd8307de5559832502439ae1b37c5a Mon Sep 17 00:00:00 2001 From: Helge Deller <deller@gmx.de> Date: Tue, 28 Jul 2020 18:52:58 +0200 Subject: [PATCH] Revert "parisc: Drop LDCW barrier in CAS code when running @@ -11,9 +11,10 @@ We need to optimize it differently. A follow up patch will correct it. Signed-off-by: Helge Deller <deller@gmx.de> Cc: <stable@vger.kernel.org> # v5.2+ +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S -index f05c9d5b6b9e..ea505a81f821 100644 +index 97ac707c6bff..e54d5e4d3489 100644 --- a/arch/parisc/kernel/syscall.S +++ b/arch/parisc/kernel/syscall.S @@ -641,8 +641,7 @@ cas_action: diff --git a/queue/Revert-parisc-Revert-Release-spinlocks-using-ordered.patch b/queue/Revert-parisc-Revert-Release-spinlocks-using-ordered.patch index 34520367..4832f4f4 100644 --- a/queue/Revert-parisc-Revert-Release-spinlocks-using-ordered.patch +++ b/queue/Revert-parisc-Revert-Release-spinlocks-using-ordered.patch @@ -1,4 +1,4 @@ -From 157e9afcc4fa25068b0e8743bc254a9b56010e13 Mon Sep 17 00:00:00 2001 +From 1406f441059c66e4b415447d678ead50d09e3ef9 Mon Sep 17 00:00:00 2001 From: Helge Deller <deller@gmx.de> Date: Tue, 28 Jul 2020 18:56:14 +0200 Subject: [PATCH] Revert "parisc: Revert "Release spinlocks using ordered @@ -10,9 +10,10 @@ This reverts commit 86d4d068df573a8c2105554624796c086d6bec3d. Signed-off-by: Helge Deller <deller@gmx.de> Cc: <stable@vger.kernel.org> # v5.0+ +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/parisc/include/asm/spinlock.h b/arch/parisc/include/asm/spinlock.h -index 6f85ca70ce23..51b6c47f802f 100644 +index 8a63515f03bf..16aec9ba2580 100644 --- a/arch/parisc/include/asm/spinlock.h +++ b/arch/parisc/include/asm/spinlock.h @@ -37,8 +37,8 @@ static inline void arch_spin_unlock(arch_spinlock_t *x) @@ -27,7 +28,7 @@ index 6f85ca70ce23..51b6c47f802f 100644 static inline int arch_spin_trylock(arch_spinlock_t *x) diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S -index 472ce9921b30..3ad61a177f5b 100644 +index 93cc36d98875..a37814cb66c7 100644 --- a/arch/parisc/kernel/syscall.S +++ b/arch/parisc/kernel/syscall.S @@ -640,8 +640,7 @@ cas_action: diff --git a/queue/Revert-parisc-Use-ldcw-instruction-for-SMP-spinlock-.patch b/queue/Revert-parisc-Use-ldcw-instruction-for-SMP-spinlock-.patch index b5efb52b..5268b010 100644 --- a/queue/Revert-parisc-Use-ldcw-instruction-for-SMP-spinlock-.patch +++ b/queue/Revert-parisc-Use-ldcw-instruction-for-SMP-spinlock-.patch @@ -1,4 +1,4 @@ -From 6e9f06ee6c9566f3606d93182ac8f803a148504b Mon Sep 17 00:00:00 2001 +From 154457a45a7461af0759d766124ddfff142575ae Mon Sep 17 00:00:00 2001 From: Helge Deller <deller@gmx.de> Date: Tue, 28 Jul 2020 18:54:40 +0200 Subject: [PATCH] Revert "parisc: Use ldcw instruction for SMP spinlock release @@ -12,9 +12,10 @@ Revert it to gain back speed again. Signed-off-by: Helge Deller <deller@gmx.de> Cc: <stable@vger.kernel.org> # v5.2+ +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/parisc/include/asm/spinlock.h b/arch/parisc/include/asm/spinlock.h -index d2a3337599fb..6f85ca70ce23 100644 +index 197d2247e4db..8a63515f03bf 100644 --- a/arch/parisc/include/asm/spinlock.h +++ b/arch/parisc/include/asm/spinlock.h @@ -37,11 +37,7 @@ static inline void arch_spin_unlock(arch_spinlock_t *x) @@ -30,7 +31,7 @@ index d2a3337599fb..6f85ca70ce23 100644 } diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S -index 4b484ec7c7da..06455f1a40f5 100644 +index 89c801c2b5d1..562dbf4252a7 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S @@ -454,9 +454,8 @@ @@ -207,7 +208,7 @@ index 4b484ec7c7da..06455f1a40f5 100644 nop #endif diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S -index ea505a81f821..472ce9921b30 100644 +index e54d5e4d3489..93cc36d98875 100644 --- a/arch/parisc/kernel/syscall.S +++ b/arch/parisc/kernel/syscall.S @@ -640,9 +640,7 @@ cas_action: diff --git a/queue/Smack-fix-another-vsscanf-out-of-bounds.patch b/queue/Smack-fix-another-vsscanf-out-of-bounds.patch index fd46f3af..29ecead1 100644 --- a/queue/Smack-fix-another-vsscanf-out-of-bounds.patch +++ b/queue/Smack-fix-another-vsscanf-out-of-bounds.patch @@ -1,4 +1,4 @@ -From a6bd4f6d9b07452b0b19842044a6c3ea384b0b88 Mon Sep 17 00:00:00 2001 +From 6cc967311d9ebfafacb40536a47547d4f18f0e26 Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter@oracle.com> Date: Thu, 23 Jul 2020 18:22:19 +0300 Subject: [PATCH] Smack: fix another vsscanf out of bounds @@ -12,12 +12,13 @@ Reported-by: syzbot+a22c6092d003d6fe1122@syzkaller.appspotmail.com Fixes: f7112e6c9abf ("Smack: allow for significantly longer Smack labels v4") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c -index 840a192e9337..2bae1fc493d1 100644 +index 5ff9e65cf253..fd6207473fd4 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c -@@ -905,6 +905,10 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf, +@@ -904,6 +904,10 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf, for (i = 0; i < catlen; i++) { rule += SMK_DIGITLEN; diff --git a/queue/Smack-prevent-underflow-in-smk_set_cipso.patch b/queue/Smack-prevent-underflow-in-smk_set_cipso.patch index dad6a7c1..5ce000a8 100644 --- a/queue/Smack-prevent-underflow-in-smk_set_cipso.patch +++ b/queue/Smack-prevent-underflow-in-smk_set_cipso.patch @@ -1,4 +1,4 @@ -From 42a2df3e829f3c5562090391b33714b2e2e5ad4a Mon Sep 17 00:00:00 2001 +From cfe9bc8fdb49ba797a3f963f56712bbe5c800188 Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter@oracle.com> Date: Thu, 23 Jul 2020 18:23:05 +0300 Subject: [PATCH] Smack: prevent underflow in smk_set_cipso() @@ -11,12 +11,13 @@ values. Fixes: e114e473771c ("Smack: Simplified Mandatory Access Control Kernel") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c -index 2bae1fc493d1..9c4308077574 100644 +index fd6207473fd4..8c000344b7ec 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c -@@ -884,7 +884,7 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf, +@@ -883,7 +883,7 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf, } ret = sscanf(rule, "%d", &maplevel); diff --git a/queue/USB-Ignore-UAS-for-JMicron-JMS567-ATA-ATAPI-Bridge.patch b/queue/USB-Ignore-UAS-for-JMicron-JMS567-ATA-ATAPI-Bridge.patch index 6a93a99b..1cee0fae 100644 --- a/queue/USB-Ignore-UAS-for-JMicron-JMS567-ATA-ATAPI-Bridge.patch +++ b/queue/USB-Ignore-UAS-for-JMicron-JMS567-ATA-ATAPI-Bridge.patch @@ -1,4 +1,4 @@ -From 9aa37788e7ebb3f489fb4b71ce07adadd444264a Mon Sep 17 00:00:00 2001 +From 725107049dde434ee34a2e8c3410f84e6910cc17 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt <tipecaml@gmail.com> Date: Tue, 25 Aug 2020 23:22:31 +0200 Subject: [PATCH] USB: Ignore UAS for JMicron JMS567 ATA/ATAPI Bridge @@ -17,9 +17,10 @@ CC: <stable@vger.kernel.org> Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> Link: https://lore.kernel.org/r/20200825212231.46309-1-tipecaml@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/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h -index 220ae2c356ee..5732e9691f08 100644 +index f6c3681fa2e9..88275842219e 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -2328,7 +2328,7 @@ UNUSUAL_DEV( 0x357d, 0x7788, 0x0114, 0x0114, diff --git a/queue/USB-quirks-Ignore-duplicate-endpoint-on-Sound-Device.patch b/queue/USB-quirks-Ignore-duplicate-endpoint-on-Sound-Device.patch index 8be6bb74..fec1f565 100644 --- a/queue/USB-quirks-Ignore-duplicate-endpoint-on-Sound-Device.patch +++ b/queue/USB-quirks-Ignore-duplicate-endpoint-on-Sound-Device.patch @@ -1,4 +1,4 @@ -From 068834a2773b6a12805105cfadbb3d4229fc6e0a Mon Sep 17 00:00:00 2001 +From 1647982fa9089271df460649a96c8ed5b288c0ef Mon Sep 17 00:00:00 2001 From: Alan Stern <stern@rowland.harvard.edu> Date: Wed, 26 Aug 2020 15:46:24 -0400 Subject: [PATCH] USB: quirks: Ignore duplicate endpoint on Sound Devices @@ -24,9 +24,10 @@ CC: <stable@vger.kernel.org> Fixes: 3e4f8e21c4f2 ("USB: core: fix check for duplicate endpoints") Link: https://lore.kernel.org/r/20200826194624.GA412633@rowland.harvard.edu Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index d1f38956b210..f232914de5fd 100644 +index 7c1198f80c23..1dae4d88fd69 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -370,6 +370,10 @@ static const struct usb_device_id usb_quirk_list[] = { @@ -40,7 +41,7 @@ index d1f38956b210..f232914de5fd 100644 /* Keytouch QWERTY Panel keyboard */ { USB_DEVICE(0x0926, 0x3333), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS }, -@@ -511,6 +515,7 @@ static const struct usb_device_id usb_amd_resume_quirk_list[] = { +@@ -509,6 +513,7 @@ static const struct usb_device_id usb_amd_resume_quirk_list[] = { */ static const struct usb_device_id usb_endpoint_ignore[] = { { USB_DEVICE_INTERFACE_NUMBER(0x0926, 0x0202, 1), .driver_info = 0x85 }, diff --git a/queue/USB-rename-USB-quirk-to-USB_QUIRK_ENDPOINT_IGNORE.patch b/queue/USB-rename-USB-quirk-to-USB_QUIRK_ENDPOINT_IGNORE.patch index 0d3fa319..4f77c386 100644 --- a/queue/USB-rename-USB-quirk-to-USB_QUIRK_ENDPOINT_IGNORE.patch +++ b/queue/USB-rename-USB-quirk-to-USB_QUIRK_ENDPOINT_IGNORE.patch @@ -1,4 +1,4 @@ -From 91c7eaa686c3b7ae2d5b2aed22a45a02c8baa30e Mon Sep 17 00:00:00 2001 +From 64cc3d7d11fe5ab3e781e9eb09c11c4398d0e66e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Date: Thu, 18 Jun 2020 11:42:53 +0200 Subject: [PATCH] USB: rename USB quirk to USB_QUIRK_ENDPOINT_IGNORE @@ -21,9 +21,10 @@ Cc: "Thiébaud Weksteen" <tweek@google.com> Cc: Nishad Kamdar <nishadkamdar@gmail.com> Link: https://lore.kernel.org/r/20200618094300.1887727-2-gregkh@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c -index b7918f695434..37442f423a41 100644 +index c68217b7dace..a0c5569300cf 100644 --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c @@ -298,10 +298,10 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, @@ -42,10 +43,10 @@ index b7918f695434..37442f423a41 100644 d->bEndpointAddress); goto skip_to_next_endpoint_or_interface_descriptor; diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index 3e8efe759c3e..20dccf34182d 100644 +index c96c50faccf7..7c1198f80c23 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c -@@ -359,7 +359,7 @@ static const struct usb_device_id usb_quirk_list[] = { +@@ -368,7 +368,7 @@ static const struct usb_device_id usb_quirk_list[] = { /* Sound Devices USBPre2 */ { USB_DEVICE(0x0926, 0x0202), .driver_info = @@ -54,7 +55,7 @@ index 3e8efe759c3e..20dccf34182d 100644 /* Keytouch QWERTY Panel keyboard */ { USB_DEVICE(0x0926, 0x3333), .driver_info = -@@ -493,24 +493,24 @@ static const struct usb_device_id usb_amd_resume_quirk_list[] = { +@@ -502,24 +502,24 @@ static const struct usb_device_id usb_amd_resume_quirk_list[] = { }; /* @@ -88,7 +89,7 @@ index 3e8efe759c3e..20dccf34182d 100644 continue; diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h -index 19e4c550bc73..98e7d1ee63dc 100644 +index d376c725e51f..642a37653ac7 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h @@ -37,7 +37,7 @@ extern void usb_authorize_interface(struct usb_interface *); diff --git a/queue/USB-serial-cp210x-enable-usb-generic-throttle-unthro.patch b/queue/USB-serial-cp210x-enable-usb-generic-throttle-unthro.patch index a7234b41..e8ce680e 100644 --- a/queue/USB-serial-cp210x-enable-usb-generic-throttle-unthro.patch +++ b/queue/USB-serial-cp210x-enable-usb-generic-throttle-unthro.patch @@ -1,4 +1,4 @@ -From 4387b3dbb079d482d3c2b43a703ceed4dd27ed28 Mon Sep 17 00:00:00 2001 +From 67dc51ace57fa3048f75489eb3d6d9edb8ae602e Mon Sep 17 00:00:00 2001 From: Brant Merryman <brant.merryman@silabs.com> Date: Fri, 26 Jun 2020 04:22:58 +0000 Subject: [PATCH] USB: serial: cp210x: enable usb generic throttle/unthrottle @@ -17,9 +17,10 @@ Link: https://lore.kernel.org/r/57401AF3-9961-461F-95E1-F8AFC2105F5E@silabs.com Fixes: 39a66b8d22a3 ("[PATCH] USB: CP2101 Add support for flow control") Cc: stable <stable@vger.kernel.org> # 2.6.12 Signed-off-by: Johan Hovold <johan@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c -index f5143eedbc48..bcceb4ad8be0 100644 +index 22c5ad23b1cd..a90801ef0055 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c @@ -272,6 +272,8 @@ static struct usb_serial_driver cp210x_device = { diff --git a/queue/USB-serial-cp210x-re-enable-auto-RTS-on-open.patch b/queue/USB-serial-cp210x-re-enable-auto-RTS-on-open.patch index 0213e5d6..81dede55 100644 --- a/queue/USB-serial-cp210x-re-enable-auto-RTS-on-open.patch +++ b/queue/USB-serial-cp210x-re-enable-auto-RTS-on-open.patch @@ -1,4 +1,4 @@ -From c7614ff9b73a1e6fb2b1b51396da132ed22fecdb Mon Sep 17 00:00:00 2001 +From e200dd1232a2dc6b20ed64be5bef0704db47497b Mon Sep 17 00:00:00 2001 From: Brant Merryman <brant.merryman@silabs.com> Date: Fri, 26 Jun 2020 04:24:20 +0000 Subject: [PATCH] USB: serial: cp210x: re-enable auto-RTS on open @@ -18,12 +18,13 @@ Link: https://lore.kernel.org/r/ECCF8E73-91F3-4080-BE17-1714BC8818FB@silabs.com Fixes: 39a66b8d22a3 ("[PATCH] USB: CP2101 Add support for flow control") Cc: stable <stable@vger.kernel.org> # 2.6.12 Signed-off-by: Johan Hovold <johan@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c -index bcceb4ad8be0..a90801ef0055 100644 +index f5143eedbc48..22c5ad23b1cd 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c -@@ -917,6 +917,7 @@ static void cp210x_get_termios_port(struct usb_serial_port *port, +@@ -915,6 +915,7 @@ static void cp210x_get_termios_port(struct usb_serial_port *port, u32 baud; u16 bits; u32 ctl_hs; @@ -31,7 +32,7 @@ index bcceb4ad8be0..a90801ef0055 100644 cp210x_read_u32_reg(port, CP210X_GET_BAUDRATE, &baud); -@@ -1017,6 +1018,22 @@ static void cp210x_get_termios_port(struct usb_serial_port *port, +@@ -1015,6 +1016,22 @@ static void cp210x_get_termios_port(struct usb_serial_port *port, ctl_hs = le32_to_cpu(flow_ctl.ulControlHandshake); if (ctl_hs & CP210X_SERIAL_CTS_HANDSHAKE) { dev_dbg(dev, "%s - flow control = CRTSCTS\n", __func__); diff --git a/queue/USB-serial-iuu_phoenix-fix-led-activity-helpers.patch b/queue/USB-serial-iuu_phoenix-fix-led-activity-helpers.patch index f386fbc2..4f0e3532 100644 --- a/queue/USB-serial-iuu_phoenix-fix-led-activity-helpers.patch +++ b/queue/USB-serial-iuu_phoenix-fix-led-activity-helpers.patch @@ -1,4 +1,4 @@ -From 6124d88039625e39f68bd89b269a86098de42672 Mon Sep 17 00:00:00 2001 +From dab8f369883baa2798362bc9b3ca7a88cc0c8194 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Thu, 16 Jul 2020 10:50:55 +0200 Subject: [PATCH] USB: serial: iuu_phoenix: fix led-activity helpers @@ -21,6 +21,7 @@ Reported-by: George Spelvin <lkml@sdf.org> Link: https://lore.kernel.org/r/20200716085056.31471-1-johan@kernel.org Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Johan Hovold <johan@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c index b8dfeb4fb2ed..ffbb2a8901b2 100644 diff --git a/queue/agp-intel-Fix-a-memory-leak-on-module-initialisation.patch b/queue/agp-intel-Fix-a-memory-leak-on-module-initialisation.patch index 83830d54..16919595 100644 --- a/queue/agp-intel-Fix-a-memory-leak-on-module-initialisation.patch +++ b/queue/agp-intel-Fix-a-memory-leak-on-module-initialisation.patch @@ -1,4 +1,4 @@ -From b975abbd382fe442713a4c233549abb90e57c22b Mon Sep 17 00:00:00 2001 +From 910df53b7635d4e6bfa6150f3c49ebd9cdfd39d0 Mon Sep 17 00:00:00 2001 From: Qiushi Wu <wu000273@umn.edu> Date: Fri, 22 May 2020 09:34:51 +0100 Subject: [PATCH] agp/intel: Fix a memory leak on module initialisation failure @@ -15,9 +15,10 @@ Signed-off-by: Qiushi Wu <wu000273@umn.edu> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20200522083451.7448-1-chris@chris-wilson.co.uk +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c -index 4b34a5195c65..5bfdf222d5f9 100644 +index b161bdf60000..0941d38b2d32 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c @@ -304,8 +304,10 @@ static int intel_gtt_setup_scratch_page(void) diff --git a/queue/arm64-dts-exynos-Fix-silent-hang-after-boot-on-Espre.patch b/queue/arm64-dts-exynos-Fix-silent-hang-after-boot-on-Espre.patch index 9bc61b83..2ab0259e 100644 --- a/queue/arm64-dts-exynos-Fix-silent-hang-after-boot-on-Espre.patch +++ b/queue/arm64-dts-exynos-Fix-silent-hang-after-boot-on-Espre.patch @@ -1,4 +1,4 @@ -From b072714bfc0e42c984b8fd6e069f3ca17de8137a Mon Sep 17 00:00:00 2001 +From 353e3f58aaf1f2ac3b3111ff72ee2cedf67a5d1e Mon Sep 17 00:00:00 2001 From: Alim Akhtar <alim.akhtar@samsung.com> Date: Sun, 5 Jul 2020 12:39:17 +0530 Subject: [PATCH] arm64: dts: exynos: Fix silent hang after boot on Espresso @@ -13,12 +13,13 @@ always-on to fix this hang. Fixes: 9589f7721e16 ("arm64: dts: Add S2MPS15 PMIC node on exynos7-espresso") Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts -index 790f12ca8981..bb86950032d3 100644 +index 00dd89b92b42..d991eae5202f 100644 --- a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts +++ b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts -@@ -157,6 +157,7 @@ ldo7_reg: LDO7 { +@@ -152,6 +152,7 @@ regulator-min-microvolt = <700000>; regulator-max-microvolt = <1150000>; regulator-enable-ramp-delay = <125>; diff --git a/queue/arm64-dts-hisilicon-hikey-fixes-to-comply-with-adi-a.patch b/queue/arm64-dts-hisilicon-hikey-fixes-to-comply-with-adi-a.patch index 3c9bd194..b0214aab 100644 --- a/queue/arm64-dts-hisilicon-hikey-fixes-to-comply-with-adi-a.patch +++ b/queue/arm64-dts-hisilicon-hikey-fixes-to-comply-with-adi-a.patch @@ -1,4 +1,4 @@ -From bbe28fc3cbabbef781bcdf847615d52ce2e26e42 Mon Sep 17 00:00:00 2001 +From 2ec37fbb6871a6e0002791b5f4141e621b357a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Ca=C3=B1uelo?= <ricardo.canuelo@collabora.com> Date: Mon, 1 Jun 2020 08:33:06 +0200 Subject: [PATCH] arm64: dts: hisilicon: hikey: fixes to comply with adi, @@ -24,12 +24,13 @@ hi6220-hikey.dts: Signed-off-by: Ricardo Cañuelo <ricardo.canuelo@collabora.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Wei Xu <xuwei5@hisilicon.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts -index ff392a47562c..c1b614dabb8e 100644 +index e035cf195b19..8c4bfbaf3a80 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts -@@ -573,6 +573,17 @@ adv7533: adv7533@39 { +@@ -530,6 +530,17 @@ status = "ok"; compatible = "adi,adv7533"; reg = <0x39>; @@ -48,10 +49,10 @@ index ff392a47562c..c1b614dabb8e 100644 }; diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts -index a41e0db8e71b..533ed523888d 100644 +index c14205cd6bf5..3e47150c05ec 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts -@@ -506,7 +506,7 @@ adv7533: adv7533@39 { +@@ -516,7 +516,7 @@ reg = <0x39>; interrupt-parent = <&gpio1>; interrupts = <1 2>; diff --git a/queue/arm64-dts-qcom-msm8916-Replace-invalid-bias-pull-non.patch b/queue/arm64-dts-qcom-msm8916-Replace-invalid-bias-pull-non.patch index d6a57360..8ed421a8 100644 --- a/queue/arm64-dts-qcom-msm8916-Replace-invalid-bias-pull-non.patch +++ b/queue/arm64-dts-qcom-msm8916-Replace-invalid-bias-pull-non.patch @@ -1,4 +1,4 @@ -From 1fa67f7e130e833928b559b8dcdd3e32a6d3a055 Mon Sep 17 00:00:00 2001 +From 83e93f97941afa8bdec751d0f8d6c82656b48cc1 Mon Sep 17 00:00:00 2001 From: Stephan Gerhold <stephan@gerhold.net> Date: Fri, 5 Jun 2020 20:59:14 +0200 Subject: [PATCH] arm64: dts: qcom: msm8916: Replace invalid bias-pull-none @@ -21,6 +21,7 @@ Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Stephan Gerhold <stephan@gerhold.net> Link: https://lore.kernel.org/r/20200605185916.318494-2-stephan@gerhold.net Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi index 242aaea68804..1235830ffd0b 100644 diff --git a/queue/arm64-dts-rockchip-fix-rk3368-lion-gmac-reset-gpio.patch b/queue/arm64-dts-rockchip-fix-rk3368-lion-gmac-reset-gpio.patch index 9d5f67d2..f1e51aff 100644 --- a/queue/arm64-dts-rockchip-fix-rk3368-lion-gmac-reset-gpio.patch +++ b/queue/arm64-dts-rockchip-fix-rk3368-lion-gmac-reset-gpio.patch @@ -1,4 +1,4 @@ -From 2300e6dab473e93181cf76e4fe6671aa3d24c57b Mon Sep 17 00:00:00 2001 +From 7c54be36c89ce7f4cc36bd871dec23d659cf5998 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> Date: Sun, 7 Jun 2020 23:29:09 +0200 Subject: [PATCH] arm64: dts: rockchip: fix rk3368-lion gmac reset gpio @@ -18,12 +18,13 @@ other Rockchip board. Fixes: d99a02bcfa81 ("arm64: dts: rockchip: add RK3368-uQ7 (Lion) SoM") Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> Link: https://lore.kernel.org/r/20200607212909.920575-1-heiko@sntech.de +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi index e17311e09082..216aafd90e7f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi -@@ -156,7 +156,7 @@ &gmac { +@@ -156,7 +156,7 @@ pinctrl-0 = <&rgmii_pins>; snps,reset-active-low; snps,reset-delays-us = <0 10000 50000>; diff --git a/queue/arm64-dts-rockchip-fix-rk3399-puma-gmac-reset-gpio.patch b/queue/arm64-dts-rockchip-fix-rk3399-puma-gmac-reset-gpio.patch index ab22f103..88042c28 100644 --- a/queue/arm64-dts-rockchip-fix-rk3399-puma-gmac-reset-gpio.patch +++ b/queue/arm64-dts-rockchip-fix-rk3399-puma-gmac-reset-gpio.patch @@ -1,4 +1,4 @@ -From 8a445086f8af0b7b9bd8d1901d6f306bb154f70d Mon Sep 17 00:00:00 2001 +From 081fd167fb3eb241d394ea28bc71db7f7918e9b0 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> Date: Wed, 3 Jun 2020 15:28:36 +0200 Subject: [PATCH] arm64: dts: rockchip: fix rk3399-puma gmac reset gpio @@ -18,12 +18,13 @@ other Rockchip board. Fixes: 2c66fc34e945 ("arm64: dts: rockchip: add RK3399-Q7 (Puma) SoM") Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> Link: https://lore.kernel.org/r/20200603132836.362519-1-heiko@sntech.de +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi -index 063f59a420b6..72c06abd27ea 100644 +index fb47e4046f4e..45b86933c6ea 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi -@@ -157,7 +157,7 @@ &gmac { +@@ -157,7 +157,7 @@ phy-mode = "rgmii"; pinctrl-names = "default"; pinctrl-0 = <&rgmii_pins>; diff --git a/queue/arm64-dts-rockchip-fix-rk3399-puma-vcc5v0-host-gpio.patch b/queue/arm64-dts-rockchip-fix-rk3399-puma-vcc5v0-host-gpio.patch index ed8f3113..616d3691 100644 --- a/queue/arm64-dts-rockchip-fix-rk3399-puma-vcc5v0-host-gpio.patch +++ b/queue/arm64-dts-rockchip-fix-rk3399-puma-vcc5v0-host-gpio.patch @@ -1,4 +1,4 @@ -From 7a7184f6cfa9279f1a1c10a1845d247d7fad54ff Mon Sep 17 00:00:00 2001 +From 998b2f7271cd0a9c10b0088d020b47a194f936bd Mon Sep 17 00:00:00 2001 From: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> Date: Thu, 4 Jun 2020 11:12:39 +0200 Subject: [PATCH] arm64: dts: rockchip: fix rk3399-puma vcc5v0-host gpio @@ -18,12 +18,13 @@ gmac fix. Fixes: 2c66fc34e945 ("arm64: dts: rockchip: add RK3399-Q7 (Puma) SoM") Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> Link: https://lore.kernel.org/r/20200604091239.424318-1-heiko@sntech.de +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi -index 07694b196fdb..063f59a420b6 100644 +index 62ea288a1a70..fb47e4046f4e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi -@@ -101,7 +101,7 @@ vcc3v3_sys: vcc3v3-sys { +@@ -101,7 +101,7 @@ vcc5v0_host: vcc5v0-host-regulator { compatible = "regulator-fixed"; diff --git a/queue/ath10k-Acquire-tx_lock-in-tx-error-paths.patch b/queue/ath10k-Acquire-tx_lock-in-tx-error-paths.patch index b5e583d7..9d4ce50c 100644 --- a/queue/ath10k-Acquire-tx_lock-in-tx-error-paths.patch +++ b/queue/ath10k-Acquire-tx_lock-in-tx-error-paths.patch @@ -1,4 +1,4 @@ -From a738e766e3ed92c4ee5ec967777276b5ce11dd2c Mon Sep 17 00:00:00 2001 +From 029b41e3a68102a9e4c12b12aebfc0671dc034e0 Mon Sep 17 00:00:00 2001 From: Evan Green <evgreen@chromium.org> Date: Thu, 4 Jun 2020 10:59:11 -0700 Subject: [PATCH] ath10k: Acquire tx_lock in tx error paths @@ -14,12 +14,13 @@ Fixes: e62ee5c381c59 ("ath10k: Add support for htt_data_tx_desc_64 descriptor") Signed-off-by: Evan Green <evgreen@chromium.org> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20200604105901.1.I5b8b0c7ee0d3e51a73248975a9da61401b8f3900@changeid +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c -index 4fd10ac3a941..bbe869575855 100644 +index e726acaf9e36..50ab8a300cf4 100644 --- a/drivers/net/wireless/ath/ath10k/htt_tx.c +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c -@@ -1591,7 +1591,9 @@ static int ath10k_htt_tx_32(struct ath10k_htt *htt, +@@ -1513,7 +1513,9 @@ static int ath10k_htt_tx_32(struct ath10k_htt *htt, err_unmap_msdu: dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); err_free_msdu_id: @@ -29,7 +30,7 @@ index 4fd10ac3a941..bbe869575855 100644 err: return res; } -@@ -1798,7 +1800,9 @@ static int ath10k_htt_tx_64(struct ath10k_htt *htt, +@@ -1720,7 +1722,9 @@ static int ath10k_htt_tx_64(struct ath10k_htt *htt, err_unmap_msdu: dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); err_free_msdu_id: diff --git a/queue/bcache-fix-super-block-seq-numbers-comparision-in-re.patch b/queue/bcache-fix-super-block-seq-numbers-comparision-in-re.patch index e70aedb7..50d88328 100644 --- a/queue/bcache-fix-super-block-seq-numbers-comparision-in-re.patch +++ b/queue/bcache-fix-super-block-seq-numbers-comparision-in-re.patch @@ -1,4 +1,4 @@ -From 117f636ea695270fe492d0c0c9dfadc7a662af47 Mon Sep 17 00:00:00 2001 +From 98af9ccb0875f73a522a421cc2dba623aed7d1e7 Mon Sep 17 00:00:00 2001 From: Coly Li <colyli@suse.de> Date: Sat, 25 Jul 2020 20:00:26 +0800 Subject: [PATCH] bcache: fix super block seq numbers comparision in @@ -47,12 +47,13 @@ corectly including for a new created cache device. Signed-off-by: Coly Li <colyli@suse.de> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c -index 6134e075efc8..40fb18028c01 100644 +index 5b7cfb1d3968..de6d60ca1bd2 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c -@@ -2154,7 +2154,14 @@ static const char *register_cache_set(struct cache *ca) +@@ -2023,7 +2023,14 @@ static const char *register_cache_set(struct cache *ca) sysfs_create_link(&c->kobj, &ca->kobj, buf)) goto err; diff --git a/queue/bdc-Fix-bug-causing-crash-after-multiple-disconnects.patch b/queue/bdc-Fix-bug-causing-crash-after-multiple-disconnects.patch index 4b7eb6c5..61134015 100644 --- a/queue/bdc-Fix-bug-causing-crash-after-multiple-disconnects.patch +++ b/queue/bdc-Fix-bug-causing-crash-after-multiple-disconnects.patch @@ -1,4 +1,4 @@ -From a95bdfd22076497288868c028619bc5995f5cc7f Mon Sep 17 00:00:00 2001 +From 23b2310e1dcfab072c8e484800b617a2f8e04217 Mon Sep 17 00:00:00 2001 From: Sasi Kumar <sasi.kumar@broadcom.com> Date: Wed, 22 Jul 2020 13:07:42 -0400 Subject: [PATCH] bdc: Fix bug causing crash after multiple disconnects @@ -16,12 +16,13 @@ Signed-off-by: Sasi Kumar <sasi.kumar@broadcom.com> Signed-off-by: Al Cooper <alcooperx@gmail.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Felipe Balbi <balbi@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/gadget/udc/bdc/bdc_core.c b/drivers/usb/gadget/udc/bdc/bdc_core.c -index 27e8f50974bb..28909d4b8190 100644 +index ccbd1d34eb2a..ed86e7a41276 100644 --- a/drivers/usb/gadget/udc/bdc/bdc_core.c +++ b/drivers/usb/gadget/udc/bdc/bdc_core.c -@@ -278,6 +278,7 @@ static void bdc_mem_init(struct bdc *bdc, bool reinit) +@@ -282,6 +282,7 @@ static void bdc_mem_init(struct bdc *bdc, bool reinit) * in that case reinit is passed as 1 */ if (reinit) { @@ -29,7 +30,7 @@ index 27e8f50974bb..28909d4b8190 100644 /* Enable interrupts */ temp = bdc_readl(bdc->regs, BDC_BDCSC); temp |= BDC_GIE; -@@ -287,6 +288,9 @@ static void bdc_mem_init(struct bdc *bdc, bool reinit) +@@ -291,6 +292,9 @@ static void bdc_mem_init(struct bdc *bdc, bool reinit) /* Initialize SRR to 0 */ memset(bdc->srr.sr_bds, 0, NUM_SR_ENTRIES * sizeof(struct bdc_bd)); @@ -40,7 +41,7 @@ index 27e8f50974bb..28909d4b8190 100644 /* One time initiaization only */ /* Enable status report function pointers */ diff --git a/drivers/usb/gadget/udc/bdc/bdc_ep.c b/drivers/usb/gadget/udc/bdc/bdc_ep.c -index ba250cf75bef..fafdc9fdb4a5 100644 +index d49c6dc1082d..9ddc0b4e92c9 100644 --- a/drivers/usb/gadget/udc/bdc/bdc_ep.c +++ b/drivers/usb/gadget/udc/bdc/bdc_ep.c @@ -615,7 +615,6 @@ int bdc_ep_enable(struct bdc_ep *ep) diff --git a/queue/bfq-fix-blkio-cgroup-leakage-v4.patch b/queue/bfq-fix-blkio-cgroup-leakage-v4.patch index 54961abd..de08717e 100644 --- a/queue/bfq-fix-blkio-cgroup-leakage-v4.patch +++ b/queue/bfq-fix-blkio-cgroup-leakage-v4.patch @@ -1,4 +1,4 @@ -From c4c9d25f3bae68740b2e80baa941a092e47075d5 Mon Sep 17 00:00:00 2001 +From d7d58ce0721c12bcf58548ee04331dfab8ad3428 Mon Sep 17 00:00:00 2001 From: Dmitry Monakhov <dmtrmonakhov@yandex-team.ru> Date: Tue, 11 Aug 2020 06:43:40 +0000 Subject: [PATCH] bfq: fix blkio cgroup leakage v4 @@ -85,6 +85,7 @@ Fixes: db37a34c563b ("block, bfq: get a ref to a group when adding it to a servi Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name> Signed-off-by: Dmitry Monakhov <dmtrmonakhov@yandex-team.ru> Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index 52c2ab6c9d14..a1b4821bc103 100644 diff --git a/queue/bitfield.h-don-t-compile-time-validate-_val-in-FIELD.patch b/queue/bitfield.h-don-t-compile-time-validate-_val-in-FIELD.patch index b965e0ae..87c478ad 100644 --- a/queue/bitfield.h-don-t-compile-time-validate-_val-in-FIELD.patch +++ b/queue/bitfield.h-don-t-compile-time-validate-_val-in-FIELD.patch @@ -1,4 +1,4 @@ -From 444da3f52407d74c9aa12187ac6b01f76ee47d62 Mon Sep 17 00:00:00 2001 +From 4f7d02b95a3ecc570304ecd2576e91a6217b5f71 Mon Sep 17 00:00:00 2001 From: Jakub Kicinski <kuba@kernel.org> Date: Mon, 10 Aug 2020 11:21:11 -0700 Subject: [PATCH] bitfield.h: don't compile-time validate _val in FIELD_FIT @@ -34,12 +34,13 @@ Debugged-by: Sami Tolvanen <samitolvanen@google.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/bitfield.h b/include/linux/bitfield.h -index 48ea093ff04c..4e035aca6f7e 100644 +index 4bbb5f1c8b5b..4c0224ff0a14 100644 --- a/include/linux/bitfield.h +++ b/include/linux/bitfield.h -@@ -77,7 +77,7 @@ +@@ -64,7 +64,7 @@ */ #define FIELD_FIT(_mask, _val) \ ({ \ diff --git a/queue/block-loop-set-discard-granularity-and-alignment-for.patch b/queue/block-loop-set-discard-granularity-and-alignment-for.patch index 63d2d4b2..f3fa8455 100644 --- a/queue/block-loop-set-discard-granularity-and-alignment-for.patch +++ b/queue/block-loop-set-discard-granularity-and-alignment-for.patch @@ -1,4 +1,4 @@ -From bcb21c8cc9947286211327d663ace69f07d37a76 Mon Sep 17 00:00:00 2001 +From d303c08a912cbaab6d9aef31747ca3ef0c79c090 Mon Sep 17 00:00:00 2001 From: Ming Lei <ming.lei@redhat.com> Date: Mon, 17 Aug 2020 18:01:30 +0800 Subject: [PATCH] block: loop: set discard granularity and alignment for block @@ -36,12 +36,13 @@ Cc: Andrzej Pietrasiewicz <andrzej.p@collabora.com> Cc: Christoph Hellwig <hch@lst.de> Cc: <stable@vger.kernel.org> Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/block/loop.c b/drivers/block/loop.c -index 2f137d6ce169..3d7a1901bf28 100644 +index 80f1a5555e82..7b60c25d4172 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c -@@ -878,6 +878,7 @@ static void loop_config_discard(struct loop_device *lo) +@@ -871,6 +871,7 @@ static void loop_config_discard(struct loop_device *lo) struct file *file = lo->lo_backing_file; struct inode *inode = file->f_mapping->host; struct request_queue *q = lo->lo_queue; @@ -49,7 +50,7 @@ index 2f137d6ce169..3d7a1901bf28 100644 /* * If the backing device is a block device, mirror its zeroing -@@ -890,11 +891,10 @@ static void loop_config_discard(struct loop_device *lo) +@@ -883,11 +884,10 @@ static void loop_config_discard(struct loop_device *lo) struct request_queue *backingq; backingq = bdev_get_queue(inode->i_bdev); @@ -64,7 +65,7 @@ index 2f137d6ce169..3d7a1901bf28 100644 /* * We use punch hole to reclaim the free space used by the -@@ -903,23 +903,26 @@ static void loop_config_discard(struct loop_device *lo) +@@ -896,23 +896,26 @@ static void loop_config_discard(struct loop_device *lo) * useful information. */ } else if (!file->f_op->fallocate || lo->lo_encrypt_key_size) { diff --git a/queue/bpf-Fix-fds_example-SIGSEGV-error.patch b/queue/bpf-Fix-fds_example-SIGSEGV-error.patch index 7faa96dd..97368b3c 100644 --- a/queue/bpf-Fix-fds_example-SIGSEGV-error.patch +++ b/queue/bpf-Fix-fds_example-SIGSEGV-error.patch @@ -1,4 +1,4 @@ -From eef8a42d6ce087d1c81c960ae0d14f955b742feb Mon Sep 17 00:00:00 2001 +From bb81ca446659b561510346ea36eeb5e59896fde7 Mon Sep 17 00:00:00 2001 From: Wenbo Zhang <ethercflow@gmail.com> Date: Fri, 10 Jul 2020 05:20:35 -0400 Subject: [PATCH] bpf: Fix fds_example SIGSEGV error @@ -12,9 +12,10 @@ Signed-off-by: Wenbo Zhang <ethercflow@gmail.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Andrii Nakryiko <andriin@fb.com> Link: https://lore.kernel.org/bpf/20200710092035.28919-1-ethercflow@gmail.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/samples/bpf/fds_example.c b/samples/bpf/fds_example.c -index d5992f787232..59f45fef5110 100644 +index e51eb060244e..2e89eb2c2688 100644 --- a/samples/bpf/fds_example.c +++ b/samples/bpf/fds_example.c @@ -30,6 +30,8 @@ diff --git a/queue/brcmfmac-To-fix-Bss-Info-flag-definition-Bug.patch b/queue/brcmfmac-To-fix-Bss-Info-flag-definition-Bug.patch index 33e7140c..8a9e957c 100644 --- a/queue/brcmfmac-To-fix-Bss-Info-flag-definition-Bug.patch +++ b/queue/brcmfmac-To-fix-Bss-Info-flag-definition-Bug.patch @@ -1,4 +1,4 @@ -From fa3266541b13f390eb35bdbc38ff4a03368be004 Mon Sep 17 00:00:00 2001 +From 87216c6201c0d889bf6b586df6adfa48b220d850 Mon Sep 17 00:00:00 2001 From: Prasanna Kerekoppa <prasanna.kerekoppa@cypress.com> Date: Thu, 4 Jun 2020 02:18:35 -0500 Subject: [PATCH] brcmfmac: To fix Bss Info flag definition Bug @@ -14,12 +14,13 @@ Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com> Signed-off-by: Wright Feng <wright.feng@cypress.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20200604071835.3842-6-wright.feng@cypress.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h -index de0ef1b545c4..2e31cc10c195 100644 +index 39ac1bbb6cc0..7ca7afdd598e 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h -@@ -19,7 +19,7 @@ +@@ -30,7 +30,7 @@ #define BRCMF_ARP_OL_PEER_AUTO_REPLY 0x00000008 #define BRCMF_BSS_INFO_VERSION 109 /* curr ver of brcmf_bss_info_le struct */ diff --git a/queue/brcmfmac-keep-SDIO-watchdog-running-when-console_int.patch b/queue/brcmfmac-keep-SDIO-watchdog-running-when-console_int.patch index 1245806a..b27db888 100644 --- a/queue/brcmfmac-keep-SDIO-watchdog-running-when-console_int.patch +++ b/queue/brcmfmac-keep-SDIO-watchdog-running-when-console_int.patch @@ -1,4 +1,4 @@ -From eccbf46b15bb3e35d004148f7c3a8fa8e9b26c1e Mon Sep 17 00:00:00 2001 +From b1ce86858c1afd969c1925ff4972e5cde5e60f05 Mon Sep 17 00:00:00 2001 From: Wright Feng <wright.feng@cypress.com> Date: Thu, 4 Jun 2020 02:18:33 -0500 Subject: [PATCH] brcmfmac: keep SDIO watchdog running when console_interval is @@ -16,12 +16,13 @@ Signed-off-by: Wright Feng <wright.feng@cypress.com> Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20200604071835.3842-4-wright.feng@cypress.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -index 310d8075f5d7..bc02168ebb53 100644 +index ea8df8f6a790..868560c10544 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -@@ -3699,7 +3699,11 @@ static void brcmf_sdio_bus_watchdog(struct brcmf_sdio *bus) +@@ -3696,7 +3696,11 @@ static void brcmf_sdio_bus_watchdog(struct brcmf_sdio *bus) if (bus->idlecount > bus->idletime) { brcmf_dbg(SDIO, "idle\n"); sdio_claim_host(bus->sdiodev->func1); diff --git a/queue/brcmfmac-set-state-of-hanger-slot-to-FREE-when-flush.patch b/queue/brcmfmac-set-state-of-hanger-slot-to-FREE-when-flush.patch index f0b8908c..002797c3 100644 --- a/queue/brcmfmac-set-state-of-hanger-slot-to-FREE-when-flush.patch +++ b/queue/brcmfmac-set-state-of-hanger-slot-to-FREE-when-flush.patch @@ -1,4 +1,4 @@ -From fcdd7a875def793c38d7369633af3eba6c7cf089 Mon Sep 17 00:00:00 2001 +From 80e1f5737461423414f724ae96530bde6a0e5607 Mon Sep 17 00:00:00 2001 From: Wright Feng <wright.feng@cypress.com> Date: Wed, 24 Jun 2020 04:16:07 -0500 Subject: [PATCH] brcmfmac: set state of hanger slot to FREE when flushing PSQ @@ -46,12 +46,13 @@ Signed-off-by: Wright Feng <wright.feng@cypress.com> Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20200624091608.25154-2-wright.feng@cypress.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c -index 4fefa7c0b892..2df6811c066e 100644 +index c22c49ae552e..834ddb34502d 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c -@@ -629,6 +629,7 @@ static inline int brcmf_fws_hanger_poppkt(struct brcmf_fws_hanger *h, +@@ -654,6 +654,7 @@ static inline int brcmf_fws_hanger_poppkt(struct brcmf_fws_hanger *h, static void brcmf_fws_psq_flush(struct brcmf_fws_info *fws, struct pktq *q, int ifidx) { @@ -59,7 +60,7 @@ index 4fefa7c0b892..2df6811c066e 100644 bool (*matchfn)(struct sk_buff *, void *) = NULL; struct sk_buff *skb; int prec; -@@ -640,6 +641,9 @@ static void brcmf_fws_psq_flush(struct brcmf_fws_info *fws, struct pktq *q, +@@ -665,6 +666,9 @@ static void brcmf_fws_psq_flush(struct brcmf_fws_info *fws, struct pktq *q, skb = brcmu_pktq_pdeq_match(q, prec, matchfn, &ifidx); while (skb) { hslot = brcmf_skb_htod_tag_get_field(skb, HSLOT); diff --git a/queue/btmrvl-Fix-firmware-filename-for-sd8977-chipset.patch b/queue/btmrvl-Fix-firmware-filename-for-sd8977-chipset.patch index 5d32dd79..35c00c8e 100644 --- a/queue/btmrvl-Fix-firmware-filename-for-sd8977-chipset.patch +++ b/queue/btmrvl-Fix-firmware-filename-for-sd8977-chipset.patch @@ -1,4 +1,4 @@ -From dbec3af5f13b88a96e31f252957ae1a82484a923 Mon Sep 17 00:00:00 2001 +From 2e22102db4e11d167afb7fff3c9e859911739ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org> Date: Wed, 3 Jun 2020 10:22:28 +0200 Subject: [PATCH] btmrvl: Fix firmware filename for sd8977 chipset @@ -17,6 +17,7 @@ Fixes: 8c57983bf7a79 ("Bluetooth: btmrvl: add support for sd8977 chipset") Signed-off-by: Pali Rohár <pali@kernel.org> Acked-by: Ganapathi Bhat <ganapathi.bhat@nxp.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 0f3a020703ab..7aa2c94720bc 100644 diff --git a/queue/btmrvl-Fix-firmware-filename-for-sd8997-chipset.patch b/queue/btmrvl-Fix-firmware-filename-for-sd8997-chipset.patch index 3079bee3..f571f8c8 100644 --- a/queue/btmrvl-Fix-firmware-filename-for-sd8997-chipset.patch +++ b/queue/btmrvl-Fix-firmware-filename-for-sd8997-chipset.patch @@ -1,4 +1,4 @@ -From 00eb0cb36fad53315047af12e83c643d3a2c2e49 Mon Sep 17 00:00:00 2001 +From 597337727d23c7e8c1372991814d1190dfae6b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org> Date: Wed, 3 Jun 2020 10:22:29 +0200 Subject: [PATCH] btmrvl: Fix firmware filename for sd8997 chipset @@ -17,6 +17,7 @@ Fixes: f0ef67485f591 ("Bluetooth: btmrvl: add sd8997 chipset support") Signed-off-by: Pali Rohár <pali@kernel.org> Acked-by: Ganapathi Bhat <ganapathi.bhat@nxp.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 7aa2c94720bc..4c7978cb1786 100644 diff --git a/queue/bus-ti-sysc-Add-missing-quirk-flags-for-usb_host_hs.patch b/queue/bus-ti-sysc-Add-missing-quirk-flags-for-usb_host_hs.patch index d6094c91..0d8f9c44 100644 --- a/queue/bus-ti-sysc-Add-missing-quirk-flags-for-usb_host_hs.patch +++ b/queue/bus-ti-sysc-Add-missing-quirk-flags-for-usb_host_hs.patch @@ -1,4 +1,4 @@ -From dc881e740d189865d46a599f2b9f2709db242a33 Mon Sep 17 00:00:00 2001 +From 1f7aa051fa80ccf2c57ce4c423d6af3afd08c99f Mon Sep 17 00:00:00 2001 From: Tony Lindgren <tony@atomide.com> Date: Mon, 13 Jul 2020 09:59:47 -0700 Subject: [PATCH] bus: ti-sysc: Add missing quirk flags for usb_host_hs @@ -12,6 +12,7 @@ These are needed to drop the legacy platform data for usb_host_hs. Signed-off-by: Tony Lindgren <tony@atomide.com> [PG: use -1 vs. -ENODEV ; see v5.7-rc1~99^2~5^2~11.] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index 8fb90245f7b6..801c39ca46a5 100644 diff --git a/queue/clk-qcom-clk-rpmh-Wait-for-completion-when-enabling-.patch b/queue/clk-qcom-clk-rpmh-Wait-for-completion-when-enabling-.patch index dfd3f976..6e27265a 100644 --- a/queue/clk-qcom-clk-rpmh-Wait-for-completion-when-enabling-.patch +++ b/queue/clk-qcom-clk-rpmh-Wait-for-completion-when-enabling-.patch @@ -1,4 +1,4 @@ -From 687ed1939c112d8863e2265778d3cf5b2a9d8d6f Mon Sep 17 00:00:00 2001 +From eed1f1a7d766573c46f10e93e33d4f8be3a74b7f Mon Sep 17 00:00:00 2001 From: Mike Tipton <mdtipton@codeaurora.org> Date: Fri, 14 Feb 2020 18:12:32 -0800 Subject: [PATCH] clk: qcom: clk-rpmh: Wait for completion when enabling clocks @@ -27,6 +27,7 @@ Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> [sboyd@kernel.org: Reorg code a bit for readability, rename to 'wait' to make local variable not conflict with completion.h mechanism] Signed-off-by: Stephen Boyd <sboyd@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c index c3fd632af119..3ed9e623e32b 100644 diff --git a/queue/clk-scmi-Fix-min-and-max-rate-when-registering-clock.patch b/queue/clk-scmi-Fix-min-and-max-rate-when-registering-clock.patch index 497e291e..195a43ca 100644 --- a/queue/clk-scmi-Fix-min-and-max-rate-when-registering-clock.patch +++ b/queue/clk-scmi-Fix-min-and-max-rate-when-registering-clock.patch @@ -1,4 +1,4 @@ -From fcd2e0deae50bce48450f14c8fc5611b08d7438c Mon Sep 17 00:00:00 2001 +From 1b062d91722ca29e0177f7b968fbfe2f60bd4cd8 Mon Sep 17 00:00:00 2001 From: Sudeep Holla <sudeep.holla@arm.com> Date: Thu, 9 Jul 2020 09:17:05 +0100 Subject: [PATCH] clk: scmi: Fix min and max rate when registering clocks with @@ -19,9 +19,10 @@ Fixes: 6d6a1d82eaef7 ("clk: add support for clocks provided by SCMI") Reviewed-by: Stephen Boyd <sboyd@kernel.org> Reported-and-tested-by: Dien Pham <dien.pham.ry@renesas.com> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c -index c491f5de0f3f..c754dfbb73fd 100644 +index a2287c770d5c..06a47bbcf565 100644 --- a/drivers/clk/clk-scmi.c +++ b/drivers/clk/clk-scmi.c @@ -103,6 +103,8 @@ static const struct clk_ops scmi_clk_ops = { diff --git a/queue/console-newport_con-fix-an-issue-about-leak-related-.patch b/queue/console-newport_con-fix-an-issue-about-leak-related-.patch index fab9637b..75b3d62a 100644 --- a/queue/console-newport_con-fix-an-issue-about-leak-related-.patch +++ b/queue/console-newport_con-fix-an-issue-about-leak-related-.patch @@ -1,4 +1,4 @@ -From fd4b8243877250c05bb24af7fea5567110c9720b Mon Sep 17 00:00:00 2001 +From e64a842070e68a54d8790b8858684c047e9be8d6 Mon Sep 17 00:00:00 2001 From: Dejin Zheng <zhengdejin5@gmail.com> Date: Fri, 24 Apr 2020 00:42:51 +0800 Subject: [PATCH] console: newport_con: fix an issue about leak related system @@ -21,6 +21,7 @@ cc: Thomas Gleixner <tglx@linutronix.de> Cc: Andrew Morton <akpm@osdl.org> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200423164251.3349-1-zhengdejin5@gmail.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c index 00dddf6e08b0..2d2ee17052e8 100644 diff --git a/queue/coresight-tmc-Fix-TMC-mode-read-in-tmc_read_unprepar.patch b/queue/coresight-tmc-Fix-TMC-mode-read-in-tmc_read_unprepar.patch index 7a0e2617..afc96013 100644 --- a/queue/coresight-tmc-Fix-TMC-mode-read-in-tmc_read_unprepar.patch +++ b/queue/coresight-tmc-Fix-TMC-mode-read-in-tmc_read_unprepar.patch @@ -1,4 +1,4 @@ -From d021f5c5ff679432c5e9faee0fd7350db2efb97c Mon Sep 17 00:00:00 2001 +From 4fcf09bdc7a04da25f92705256eb917118243ca1 Mon Sep 17 00:00:00 2001 From: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org> Date: Thu, 16 Jul 2020 11:57:42 -0600 Subject: [PATCH] coresight: tmc: Fix TMC mode read in tmc_read_unprepare_etb() @@ -42,12 +42,13 @@ Tested-by: Mike Leach <mike.leach@linaro.org> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Link: https://lore.kernel.org/r/20200716175746.3338735-14-mathieu.poirier@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c -index 36cce2bfb744..6375504ba8b0 100644 +index 64b12fe2660f..e43e9ef0617c 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etf.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c -@@ -639,15 +639,14 @@ int tmc_read_unprepare_etb(struct tmc_drvdata *drvdata) +@@ -635,15 +635,14 @@ int tmc_read_unprepare_etb(struct tmc_drvdata *drvdata) spin_lock_irqsave(&drvdata->spinlock, flags); diff --git a/queue/cpufreq-ap806-fix-cpufreq-driver-needs-ap-cpu-clk.patch b/queue/cpufreq-ap806-fix-cpufreq-driver-needs-ap-cpu-clk.patch index f3728964..65d66550 100644 --- a/queue/cpufreq-ap806-fix-cpufreq-driver-needs-ap-cpu-clk.patch +++ b/queue/cpufreq-ap806-fix-cpufreq-driver-needs-ap-cpu-clk.patch @@ -1,4 +1,4 @@ -From 8c37ad2f523396e15cf002b29f8f796447c71932 Mon Sep 17 00:00:00 2001 +From e41bdebc0b2b2806cedc2bdc56ce866606deb877 Mon Sep 17 00:00:00 2001 From: Sven Auhagen <sven.auhagen@voleatech.de> Date: Mon, 22 Jun 2020 14:01:23 +0200 Subject: [PATCH] cpufreq: ap806: fix cpufreq driver needs ap cpu clk @@ -14,12 +14,13 @@ Add it to the cpufreq Armada8k driver. Fixes: f525a670533d ("cpufreq: ap806: add cpufreq driver for Armada 8K") Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm -index c6cbfc8baf72..a967894c4613 100644 +index f8129edc145e..bac07ebcb29c 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm -@@ -41,6 +41,7 @@ config ARM_ARMADA_37XX_CPUFREQ +@@ -29,6 +29,7 @@ config ARM_ARMADA_37XX_CPUFREQ config ARM_ARMADA_8K_CPUFREQ tristate "Armada 8K CPUFreq driver" depends on ARCH_MVEBU && CPUFREQ_DT diff --git a/queue/cpufreq-dt-fix-oops-on-armada37xx.patch b/queue/cpufreq-dt-fix-oops-on-armada37xx.patch index 7b4d0816..b8bef3bb 100644 --- a/queue/cpufreq-dt-fix-oops-on-armada37xx.patch +++ b/queue/cpufreq-dt-fix-oops-on-armada37xx.patch @@ -1,4 +1,4 @@ -From 10470dec3decaf5ed3c596f85debd7c42777ae12 Mon Sep 17 00:00:00 2001 +From 94f0d7f21d4e797723a1da4f5a4171eabd173284 Mon Sep 17 00:00:00 2001 From: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Date: Sat, 20 Jun 2020 17:44:49 +0100 Subject: [PATCH] cpufreq: dt: fix oops on armada37xx @@ -28,12 +28,13 @@ Cc: <stable@vger.kernel.org> # v5.7+ Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/cpufreq/armada-37xx-cpufreq.c b/drivers/cpufreq/armada-37xx-cpufreq.c -index aa0f06dec959..df1c941260d1 100644 +index 0df16eb1eb3c..c5f98cafc25c 100644 --- a/drivers/cpufreq/armada-37xx-cpufreq.c +++ b/drivers/cpufreq/armada-37xx-cpufreq.c -@@ -456,6 +456,7 @@ static int __init armada37xx_cpufreq_driver_init(void) +@@ -458,6 +458,7 @@ static int __init armada37xx_cpufreq_driver_init(void) /* Now that everything is setup, enable the DVFS at hardware level */ armada37xx_cpufreq_enable_dvfs(nb_pm_base); diff --git a/queue/crc-t10dif-Fix-potential-crypto-notify-dead-lock.patch b/queue/crc-t10dif-Fix-potential-crypto-notify-dead-lock.patch index ece5b66b..768c9188 100644 --- a/queue/crc-t10dif-Fix-potential-crypto-notify-dead-lock.patch +++ b/queue/crc-t10dif-Fix-potential-crypto-notify-dead-lock.patch @@ -1,4 +1,4 @@ -From 3906f640224dbe7714b52b66d7d68c0812808e19 Mon Sep 17 00:00:00 2001 +From 8f2853758930091f6d330aa0af495346dadeeb22 Mon Sep 17 00:00:00 2001 From: Herbert Xu <herbert@gondor.apana.org.au> Date: Fri, 5 Jun 2020 16:59:18 +1000 Subject: [PATCH] crc-t10dif: Fix potential crypto notify dead-lock @@ -27,6 +27,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Reviewed-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/lib/crc-t10dif.c b/lib/crc-t10dif.c index 8cc01a603416..c9acf1c12cfc 100644 diff --git a/queue/crypto-aesni-Fix-build-with-LLVM_IAS-1.patch b/queue/crypto-aesni-Fix-build-with-LLVM_IAS-1.patch index afb76012..e569b19c 100644 --- a/queue/crypto-aesni-Fix-build-with-LLVM_IAS-1.patch +++ b/queue/crypto-aesni-Fix-build-with-LLVM_IAS-1.patch @@ -1,4 +1,4 @@ -From 3347c8a079d67af21760a78cc5f2abbcf06d9571 Mon Sep 17 00:00:00 2001 +From 3595d36a708be0dedb0d7741b89fe2ba4efab4ce Mon Sep 17 00:00:00 2001 From: Sedat Dilek <sedat.dilek@gmail.com> Date: Fri, 3 Jul 2020 16:32:06 +0200 Subject: [PATCH] crypto: aesni - Fix build with LLVM_IAS=1 @@ -66,9 +66,10 @@ Link: https://github.com/ClangBuiltLinux/linux/issues/1050 Link: https://bugs.llvm.org/show_bug.cgi?id=24494 Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S -index 54e7d15dbd0d..7d4298e6d4cb 100644 +index e40bdf024ba7..9afeb58c910e 100644 --- a/arch/x86/crypto/aesni-intel_asm.S +++ b/arch/x86/crypto/aesni-intel_asm.S @@ -266,7 +266,7 @@ ALL_F: .octa 0xffffffffffffffffffffffffffffffff diff --git a/queue/crypto-aesni-add-compatibility-with-IAS.patch b/queue/crypto-aesni-add-compatibility-with-IAS.patch index eaa89282..e0773859 100644 --- a/queue/crypto-aesni-add-compatibility-with-IAS.patch +++ b/queue/crypto-aesni-add-compatibility-with-IAS.patch @@ -1,4 +1,4 @@ -From 44069737ac9625a0f02f0f7f5ab96aae4cd819bc Mon Sep 17 00:00:00 2001 +From 54abc1d0376e39a83e16b63ac67f5385a2e250a7 Mon Sep 17 00:00:00 2001 From: Jian Cai <caij2003@gmail.com> Date: Mon, 22 Jun 2020 16:24:33 -0700 Subject: [PATCH] crypto: aesni - add compatibility with IAS @@ -19,9 +19,10 @@ Reported-by: Fangrui Song <maskray@google.com> Tested-by: Sedat Dilek <sedat.dilek@gmail.com> # build+boot Linux v5.7.5; clang v11.0.0-git Signed-off-by: Jian Cai <caij2003@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/crypto/aes_ctrby8_avx-x86_64.S b/arch/x86/crypto/aes_ctrby8_avx-x86_64.S -index ec437db1fa54..494a3bda8487 100644 +index 5f6a5af9c489..77043a82da51 100644 --- a/arch/x86/crypto/aes_ctrby8_avx-x86_64.S +++ b/arch/x86/crypto/aes_ctrby8_avx-x86_64.S @@ -127,10 +127,6 @@ ddq_add_8: diff --git a/queue/crypto-ccp-Fix-use-of-merged-scatterlists.patch b/queue/crypto-ccp-Fix-use-of-merged-scatterlists.patch index ad59cf8f..31f4195a 100644 --- a/queue/crypto-ccp-Fix-use-of-merged-scatterlists.patch +++ b/queue/crypto-ccp-Fix-use-of-merged-scatterlists.patch @@ -1,4 +1,4 @@ -From 8a302808c60d441d9884cb00ea7f2b534f2e3ca5 Mon Sep 17 00:00:00 2001 +From 32d62c52da850cd8bbfc69bbd757dd2b759031a0 Mon Sep 17 00:00:00 2001 From: John Allen <john.allen@amd.com> Date: Mon, 22 Jun 2020 15:24:02 -0500 Subject: [PATCH] crypto: ccp - Fix use of merged scatterlists @@ -44,12 +44,13 @@ Signed-off-by: John Allen <john.allen@amd.com> Cc: stable@vger.kernel.org Acked-by: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/crypto/ccp/ccp-dev.h b/drivers/crypto/ccp/ccp-dev.h -index 3f68262d9ab4..87a34d91fdf7 100644 +index 5e624920fd99..ee9d2ca5e651 100644 --- a/drivers/crypto/ccp/ccp-dev.h +++ b/drivers/crypto/ccp/ccp-dev.h -@@ -469,6 +469,7 @@ struct ccp_sg_workarea { +@@ -468,6 +468,7 @@ struct ccp_sg_workarea { unsigned int sg_used; struct scatterlist *dma_sg; @@ -58,10 +59,10 @@ index 3f68262d9ab4..87a34d91fdf7 100644 unsigned int dma_count; enum dma_data_direction dma_dir; diff --git a/drivers/crypto/ccp/ccp-ops.c b/drivers/crypto/ccp/ccp-ops.c -index d270aa792888..a06d20263efa 100644 +index e12506c93a52..95d06cfb7421 100644 --- a/drivers/crypto/ccp/ccp-ops.c +++ b/drivers/crypto/ccp/ccp-ops.c -@@ -63,7 +63,7 @@ static u32 ccp_gen_jobid(struct ccp_device *ccp) +@@ -64,7 +64,7 @@ static u32 ccp_gen_jobid(struct ccp_device *ccp) static void ccp_sg_free(struct ccp_sg_workarea *wa) { if (wa->dma_count) @@ -70,7 +71,7 @@ index d270aa792888..a06d20263efa 100644 wa->dma_count = 0; } -@@ -92,6 +92,7 @@ static int ccp_init_sg_workarea(struct ccp_sg_workarea *wa, struct device *dev, +@@ -93,6 +93,7 @@ static int ccp_init_sg_workarea(struct ccp_sg_workarea *wa, struct device *dev, return 0; wa->dma_sg = sg; @@ -78,7 +79,7 @@ index d270aa792888..a06d20263efa 100644 wa->dma_dev = dev; wa->dma_dir = dma_dir; wa->dma_count = dma_map_sg(dev, sg, wa->nents, dma_dir); -@@ -104,14 +105,28 @@ static int ccp_init_sg_workarea(struct ccp_sg_workarea *wa, struct device *dev, +@@ -105,14 +106,28 @@ static int ccp_init_sg_workarea(struct ccp_sg_workarea *wa, struct device *dev, static void ccp_update_sg_workarea(struct ccp_sg_workarea *wa, unsigned int len) { unsigned int nbytes = min_t(u64, len, wa->bytes_left); @@ -109,7 +110,7 @@ index d270aa792888..a06d20263efa 100644 wa->sg_used = 0; } } -@@ -299,7 +314,7 @@ static unsigned int ccp_queue_buf(struct ccp_data *data, unsigned int from) +@@ -301,7 +316,7 @@ static unsigned int ccp_queue_buf(struct ccp_data *data, unsigned int from) /* Update the structures and generate the count */ buf_count = 0; while (sg_wa->bytes_left && (buf_count < dm_wa->length)) { @@ -118,7 +119,7 @@ index d270aa792888..a06d20263efa 100644 dm_wa->length - buf_count); nbytes = min_t(u64, sg_wa->bytes_left, nbytes); -@@ -331,11 +346,11 @@ static void ccp_prepare_data(struct ccp_data *src, struct ccp_data *dst, +@@ -333,11 +348,11 @@ static void ccp_prepare_data(struct ccp_data *src, struct ccp_data *dst, * and destination. The resulting len values will always be <= UINT_MAX * because the dma length is an unsigned int. */ @@ -132,7 +133,7 @@ index d270aa792888..a06d20263efa 100644 sg_dst_len = min_t(u64, src->sg_wa.bytes_left, sg_dst_len); op_len = min(sg_src_len, sg_dst_len); } else { -@@ -365,7 +380,7 @@ static void ccp_prepare_data(struct ccp_data *src, struct ccp_data *dst, +@@ -367,7 +382,7 @@ static void ccp_prepare_data(struct ccp_data *src, struct ccp_data *dst, /* Enough data in the sg element, but we need to * adjust for any previously copied data */ @@ -141,7 +142,7 @@ index d270aa792888..a06d20263efa 100644 op->src.u.dma.offset = src->sg_wa.sg_used; op->src.u.dma.length = op_len & ~(block_size - 1); -@@ -386,7 +401,7 @@ static void ccp_prepare_data(struct ccp_data *src, struct ccp_data *dst, +@@ -388,7 +403,7 @@ static void ccp_prepare_data(struct ccp_data *src, struct ccp_data *dst, /* Enough room in the sg element, but we need to * adjust for any previously used area */ @@ -150,7 +151,7 @@ index d270aa792888..a06d20263efa 100644 op->dst.u.dma.offset = dst->sg_wa.sg_used; op->dst.u.dma.length = op->src.u.dma.length; } -@@ -2027,7 +2042,7 @@ ccp_run_passthru_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd) +@@ -2040,7 +2055,7 @@ static int ccp_run_passthru_cmd(struct ccp_cmd_queue *cmd_q, dst.sg_wa.sg_used = 0; for (i = 1; i <= src.sg_wa.dma_count; i++) { if (!dst.sg_wa.sg || @@ -159,7 +160,7 @@ index d270aa792888..a06d20263efa 100644 ret = -EINVAL; goto e_dst; } -@@ -2053,8 +2068,8 @@ ccp_run_passthru_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd) +@@ -2066,8 +2081,8 @@ static int ccp_run_passthru_cmd(struct ccp_cmd_queue *cmd_q, goto e_dst; } diff --git a/queue/crypto-ccree-fix-resource-leak-on-error-path.patch b/queue/crypto-ccree-fix-resource-leak-on-error-path.patch index c43b4080..9090ae06 100644 --- a/queue/crypto-ccree-fix-resource-leak-on-error-path.patch +++ b/queue/crypto-ccree-fix-resource-leak-on-error-path.patch @@ -1,4 +1,4 @@ -From 9bc6165d608d676f05d8bf156a2c9923ee38d05b Mon Sep 17 00:00:00 2001 +From cc0fb11ad877c3b1464d80085047499c2d943556 Mon Sep 17 00:00:00 2001 From: Gilad Ben-Yossef <gilad@benyossef.com> Date: Sun, 21 Jun 2020 14:19:57 +0300 Subject: [PATCH] crypto: ccree - fix resource leak on error path @@ -11,12 +11,13 @@ Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com> Fixes: 63ee04c8b491e ("crypto: ccree - add skcipher support") Cc: Markus Elfring <Markus.Elfring@web.de> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/crypto/ccree/cc_cipher.c b/drivers/crypto/ccree/cc_cipher.c -index 872ea3ff1c6b..f144fe04748b 100644 +index 67ac87d25aea..5604e188d2d4 100644 --- a/drivers/crypto/ccree/cc_cipher.c +++ b/drivers/crypto/ccree/cc_cipher.c -@@ -159,7 +159,6 @@ static int cc_cipher_init(struct crypto_tfm *tfm) +@@ -167,7 +167,6 @@ static int cc_cipher_init(struct crypto_tfm *tfm) skcipher_alg.base); struct device *dev = drvdata_to_dev(cc_alg->drvdata); unsigned int max_key_buf_size = cc_alg->skcipher_alg.max_keysize; @@ -24,7 +25,7 @@ index 872ea3ff1c6b..f144fe04748b 100644 dev_dbg(dev, "Initializing context @%p for %s\n", ctx_p, crypto_tfm_alg_name(tfm)); -@@ -171,10 +170,19 @@ static int cc_cipher_init(struct crypto_tfm *tfm) +@@ -179,10 +178,19 @@ static int cc_cipher_init(struct crypto_tfm *tfm) ctx_p->flow_mode = cc_alg->flow_mode; ctx_p->drvdata = cc_alg->drvdata; @@ -45,7 +46,7 @@ index 872ea3ff1c6b..f144fe04748b 100644 dev_dbg(dev, "Allocated key buffer in context. key=@%p\n", ctx_p->user.key); -@@ -186,21 +194,19 @@ static int cc_cipher_init(struct crypto_tfm *tfm) +@@ -194,21 +202,19 @@ static int cc_cipher_init(struct crypto_tfm *tfm) if (dma_mapping_error(dev, ctx_p->user.key_dma_addr)) { dev_err(dev, "Mapping Key %u B at va=%pK for DMA failed\n", max_key_buf_size, ctx_p->user.key); diff --git a/queue/crypto-cpt-don-t-sleep-of-CRYPTO_TFM_REQ_MAY_SLEEP-w.patch b/queue/crypto-cpt-don-t-sleep-of-CRYPTO_TFM_REQ_MAY_SLEEP-w.patch index c31d004c..f717410a 100644 --- a/queue/crypto-cpt-don-t-sleep-of-CRYPTO_TFM_REQ_MAY_SLEEP-w.patch +++ b/queue/crypto-cpt-don-t-sleep-of-CRYPTO_TFM_REQ_MAY_SLEEP-w.patch @@ -1,4 +1,4 @@ -From 9e27c99104707f083dccd3b4d79762859b5a0614 Mon Sep 17 00:00:00 2001 +From 049aa7f7dd1a94c5ccdc241e227d16db8642bc34 Mon Sep 17 00:00:00 2001 From: Mikulas Patocka <mpatocka@redhat.com> Date: Wed, 17 Jun 2020 09:48:56 -0400 Subject: [PATCH] crypto: cpt - don't sleep of CRYPTO_TFM_REQ_MAY_SLEEP was not @@ -15,12 +15,13 @@ Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Cc: stable@vger.kernel.org # v4.11+ Fixes: c694b233295b ("crypto: cavium - Add the Virtual Function driver for CPT") Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/crypto/cavium/cpt/cptvf_algs.c b/drivers/crypto/cavium/cpt/cptvf_algs.c -index 1be1adffff1d..2e4bf90c5798 100644 +index e9f4704494fb..10fd8f314c1c 100644 --- a/drivers/crypto/cavium/cpt/cptvf_algs.c +++ b/drivers/crypto/cavium/cpt/cptvf_algs.c -@@ -200,6 +200,7 @@ static inline int cvm_enc_dec(struct skcipher_request *req, u32 enc) +@@ -201,6 +201,7 @@ static inline int cvm_enc_dec(struct ablkcipher_request *req, u32 enc) int status; memset(req_info, 0, sizeof(struct cpt_request_info)); diff --git a/queue/crypto-hisilicon-don-t-sleep-of-CRYPTO_TFM_REQ_MAY_S.patch b/queue/crypto-hisilicon-don-t-sleep-of-CRYPTO_TFM_REQ_MAY_S.patch index 7b8d5e27..b1af9601 100644 --- a/queue/crypto-hisilicon-don-t-sleep-of-CRYPTO_TFM_REQ_MAY_S.patch +++ b/queue/crypto-hisilicon-don-t-sleep-of-CRYPTO_TFM_REQ_MAY_S.patch @@ -1,4 +1,4 @@ -From 5ead051780404b5cb22147170acadd1994dc3236 Mon Sep 17 00:00:00 2001 +From 3ac762336661775d92ccf02eb21b11babdedb026 Mon Sep 17 00:00:00 2001 From: Mikulas Patocka <mpatocka@redhat.com> Date: Wed, 17 Jun 2020 09:49:52 -0400 Subject: [PATCH] crypto: hisilicon - don't sleep of CRYPTO_TFM_REQ_MAY_SLEEP @@ -17,12 +17,13 @@ Cc: stable@vger.kernel.org # v4.19+ Fixes: 915e4e8413da ("crypto: hisilicon - SEC security accelerator driver") Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/crypto/hisilicon/sec/sec_algs.c b/drivers/crypto/hisilicon/sec/sec_algs.c -index c27e7160d2df..4ad4ffd90cee 100644 +index 8c789b8671fc..9a98efc95333 100644 --- a/drivers/crypto/hisilicon/sec/sec_algs.c +++ b/drivers/crypto/hisilicon/sec/sec_algs.c -@@ -175,7 +175,8 @@ static int sec_alloc_and_fill_hw_sgl(struct sec_hw_sgl **sec_sgl, +@@ -157,7 +157,8 @@ static int sec_alloc_and_fill_hw_sgl(struct sec_hw_sgl **sec_sgl, dma_addr_t *psec_sgl, struct scatterlist *sgl, int count, @@ -32,7 +33,7 @@ index c27e7160d2df..4ad4ffd90cee 100644 { struct sec_hw_sgl *sgl_current = NULL; struct sec_hw_sgl *sgl_next; -@@ -190,7 +191,7 @@ static int sec_alloc_and_fill_hw_sgl(struct sec_hw_sgl **sec_sgl, +@@ -172,7 +173,7 @@ static int sec_alloc_and_fill_hw_sgl(struct sec_hw_sgl **sec_sgl, sge_index = i % SEC_MAX_SGE_NUM; if (sge_index == 0) { sgl_next = dma_pool_zalloc(info->hw_sgl_pool, @@ -41,7 +42,7 @@ index c27e7160d2df..4ad4ffd90cee 100644 if (!sgl_next) { ret = -ENOMEM; goto err_free_hw_sgls; -@@ -545,14 +546,14 @@ void sec_alg_callback(struct sec_bd_info *resp, void *shadow) +@@ -555,14 +556,14 @@ void sec_alg_callback(struct sec_bd_info *resp, void *shadow) } static int sec_alg_alloc_and_calc_split_sizes(int length, size_t **split_sizes, @@ -58,7 +59,7 @@ index c27e7160d2df..4ad4ffd90cee 100644 if (!sizes) return -ENOMEM; -@@ -568,7 +569,7 @@ static int sec_map_and_split_sg(struct scatterlist *sgl, size_t *split_sizes, +@@ -578,7 +579,7 @@ static int sec_map_and_split_sg(struct scatterlist *sgl, size_t *split_sizes, int steps, struct scatterlist ***splits, int **splits_nents, int sgl_len_in, @@ -67,7 +68,7 @@ index c27e7160d2df..4ad4ffd90cee 100644 { int ret, count; -@@ -576,12 +577,12 @@ static int sec_map_and_split_sg(struct scatterlist *sgl, size_t *split_sizes, +@@ -586,12 +587,12 @@ static int sec_map_and_split_sg(struct scatterlist *sgl, size_t *split_sizes, if (!count) return -EINVAL; @@ -82,7 +83,7 @@ index c27e7160d2df..4ad4ffd90cee 100644 if (!*splits_nents) { ret = -ENOMEM; goto err_free_splits; -@@ -589,7 +590,7 @@ static int sec_map_and_split_sg(struct scatterlist *sgl, size_t *split_sizes, +@@ -599,7 +600,7 @@ static int sec_map_and_split_sg(struct scatterlist *sgl, size_t *split_sizes, /* output the scatter list before and after this */ ret = sg_split(sgl, count, 0, steps, split_sizes, @@ -91,7 +92,7 @@ index c27e7160d2df..4ad4ffd90cee 100644 if (ret) { ret = -ENOMEM; goto err_free_splits_nents; -@@ -630,13 +631,13 @@ static struct sec_request_el +@@ -640,13 +641,13 @@ static struct sec_request_el int el_size, bool different_dest, struct scatterlist *sgl_in, int n_ents_in, struct scatterlist *sgl_out, int n_ents_out, @@ -107,7 +108,7 @@ index c27e7160d2df..4ad4ffd90cee 100644 if (!el) return ERR_PTR(-ENOMEM); el->el_length = el_size; -@@ -668,7 +669,7 @@ static struct sec_request_el +@@ -678,7 +679,7 @@ static struct sec_request_el el->sgl_in = sgl_in; ret = sec_alloc_and_fill_hw_sgl(&el->in, &el->dma_in, el->sgl_in, @@ -116,7 +117,7 @@ index c27e7160d2df..4ad4ffd90cee 100644 if (ret) goto err_free_el; -@@ -679,7 +680,7 @@ static struct sec_request_el +@@ -689,7 +690,7 @@ static struct sec_request_el el->sgl_out = sgl_out; ret = sec_alloc_and_fill_hw_sgl(&el->out, &el->dma_out, el->sgl_out, @@ -125,7 +126,7 @@ index c27e7160d2df..4ad4ffd90cee 100644 if (ret) goto err_free_hw_sgl_in; -@@ -720,6 +721,7 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq, +@@ -730,6 +731,7 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq, int *splits_out_nents = NULL; struct sec_request_el *el, *temp; bool split = skreq->src != skreq->dst; @@ -133,7 +134,7 @@ index c27e7160d2df..4ad4ffd90cee 100644 mutex_init(&sec_req->lock); sec_req->req_base = &skreq->base; -@@ -728,13 +730,13 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq, +@@ -738,13 +740,13 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq, sec_req->len_in = sg_nents(skreq->src); ret = sec_alg_alloc_and_calc_split_sizes(skreq->cryptlen, &split_sizes, @@ -149,7 +150,7 @@ index c27e7160d2df..4ad4ffd90cee 100644 if (ret) goto err_free_split_sizes; -@@ -742,7 +744,7 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq, +@@ -752,7 +754,7 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq, sec_req->len_out = sg_nents(skreq->dst); ret = sec_map_and_split_sg(skreq->dst, split_sizes, steps, &splits_out, &splits_out_nents, @@ -158,7 +159,7 @@ index c27e7160d2df..4ad4ffd90cee 100644 if (ret) goto err_unmap_in_sg; } -@@ -775,7 +777,7 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq, +@@ -785,7 +787,7 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq, splits_in[i], splits_in_nents[i], split ? splits_out[i] : NULL, split ? splits_out_nents[i] : 0, diff --git a/queue/crypto-qat-fix-double-free-in-qat_uclo_create_batch_.patch b/queue/crypto-qat-fix-double-free-in-qat_uclo_create_batch_.patch index 79a57fb9..ca7ad9c5 100644 --- a/queue/crypto-qat-fix-double-free-in-qat_uclo_create_batch_.patch +++ b/queue/crypto-qat-fix-double-free-in-qat_uclo_create_batch_.patch @@ -1,4 +1,4 @@ -From c06c76602e03bde24ee69a2022a829127e504202 Mon Sep 17 00:00:00 2001 +From 94b36f352c2fec96d66f475215cf401a4249cf43 Mon Sep 17 00:00:00 2001 From: Tom Rix <trix@redhat.com> Date: Mon, 13 Jul 2020 07:06:34 -0700 Subject: [PATCH] crypto: qat - fix double free in @@ -59,12 +59,13 @@ Fixes: b4b7e67c917f ("crypto: qat - Intel(R) QAT ucode part of fw loader") Cc: <stable@vger.kernel.org> Signed-off-by: Tom Rix <trix@redhat.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/crypto/qat/qat_common/qat_uclo.c b/drivers/crypto/qat/qat_common/qat_uclo.c -index 4cc1f436b075..bff759e2f811 100644 +index 6bd8f6a2a24f..aeb03081415c 100644 --- a/drivers/crypto/qat/qat_common/qat_uclo.c +++ b/drivers/crypto/qat/qat_common/qat_uclo.c -@@ -288,13 +288,18 @@ static int qat_uclo_create_batch_init_list(struct icp_qat_fw_loader_handle +@@ -332,13 +332,18 @@ static int qat_uclo_create_batch_init_list(struct icp_qat_fw_loader_handle } return 0; out_err: diff --git a/queue/cxl-Fix-kobject-memleak.patch b/queue/cxl-Fix-kobject-memleak.patch index 7a96efe8..76968247 100644 --- a/queue/cxl-Fix-kobject-memleak.patch +++ b/queue/cxl-Fix-kobject-memleak.patch @@ -1,4 +1,4 @@ -From 85c5cbeba8f4fb28e6b9bfb3e467718385f78f76 Mon Sep 17 00:00:00 2001 +From 58e543ab76586fe8b1ead003fa091f8338a85ec3 Mon Sep 17 00:00:00 2001 From: Wang Hai <wanghai38@huawei.com> Date: Tue, 2 Jun 2020 20:07:33 +0800 Subject: [PATCH] cxl: Fix kobject memleak @@ -19,6 +19,7 @@ Acked-by: Andrew Donnellan <ajd@linux.ibm.com> Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> Link: https://lore.kernel.org/r/20200602120733.5943-1-wanghai38@huawei.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/misc/cxl/sysfs.c b/drivers/misc/cxl/sysfs.c index f0263d1a1fdf..d97a243ad30c 100644 diff --git a/queue/dlm-Fix-kobject-memleak.patch b/queue/dlm-Fix-kobject-memleak.patch index 26d76ed4..aebeeba7 100644 --- a/queue/dlm-Fix-kobject-memleak.patch +++ b/queue/dlm-Fix-kobject-memleak.patch @@ -1,4 +1,4 @@ -From 0ffddafc3a3970ef7013696e7f36b3d378bc4c16 Mon Sep 17 00:00:00 2001 +From b4ececcd4c6676ddc4b730e90c78747dadfdfc33 Mon Sep 17 00:00:00 2001 From: Wang Hai <wanghai38@huawei.com> Date: Mon, 15 Jun 2020 11:25:33 +0800 Subject: [PATCH] dlm: Fix kobject memleak @@ -16,12 +16,13 @@ Fixes: 901195ed7f4b ("Kobject: change GFS2 to use kobject_init_and_add") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wang Hai <wanghai38@huawei.com> Signed-off-by: David Teigland <teigland@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c -index e93670ecfae5..624617c12250 100644 +index 4c2c85a223ac..3dd6e0189d39 100644 --- a/fs/dlm/lockspace.c +++ b/fs/dlm/lockspace.c -@@ -622,6 +622,9 @@ static int new_lockspace(const char *name, const char *cluster, +@@ -631,6 +631,9 @@ static int new_lockspace(const char *name, const char *cluster, wait_event(ls->ls_recover_lock_wait, test_bit(LSFL_RECOVER_LOCK, &ls->ls_flags)); @@ -31,7 +32,7 @@ index e93670ecfae5..624617c12250 100644 ls->ls_kobj.kset = dlm_kset; error = kobject_init_and_add(&ls->ls_kobj, &dlm_ktype, NULL, "%s", ls->ls_name); -@@ -629,9 +632,6 @@ static int new_lockspace(const char *name, const char *cluster, +@@ -638,9 +641,6 @@ static int new_lockspace(const char *name, const char *cluster, goto out_recoverd; kobject_uevent(&ls->ls_kobj, KOBJ_ADD); diff --git a/queue/drivers-net-wan-lapbether-Added-needed_headroom-and-.patch b/queue/drivers-net-wan-lapbether-Added-needed_headroom-and-.patch index 644fbd48..2cf13c64 100644 --- a/queue/drivers-net-wan-lapbether-Added-needed_headroom-and-.patch +++ b/queue/drivers-net-wan-lapbether-Added-needed_headroom-and-.patch @@ -1,4 +1,4 @@ -From c7ca03c216acb14466a713fedf1b9f2c24994ef2 Mon Sep 17 00:00:00 2001 +From 7af07aedc35e3c4ed7bc4fccadb8330b8a54cbf2 Mon Sep 17 00:00:00 2001 From: Xie He <xie.he.0141@gmail.com> Date: Wed, 5 Aug 2020 18:50:40 -0700 Subject: [PATCH] drivers/net/wan/lapbether: Added needed_headroom and a @@ -66,9 +66,10 @@ Cc: Brian Norris <briannorris@chromium.org> Signed-off-by: Xie He <xie.he.0141@gmail.com> Acked-by: Willem de Bruijn <willemb@google.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 b2868433718f..1ea15f2123ed 100644 +index 134e4dd916c1..996eb9c55b39 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c @@ -157,6 +157,12 @@ static netdev_tx_t lapbeth_xmit(struct sk_buff *skb, diff --git a/queue/drm-amd-powerplay-fix-compile-error-with-ARCH-arc.patch b/queue/drm-amd-powerplay-fix-compile-error-with-ARCH-arc.patch index 8390507b..67a96ae8 100644 --- a/queue/drm-amd-powerplay-fix-compile-error-with-ARCH-arc.patch +++ b/queue/drm-amd-powerplay-fix-compile-error-with-ARCH-arc.patch @@ -1,4 +1,4 @@ -From 444df227a9e828299a348faa8dd58c86bc0edfae Mon Sep 17 00:00:00 2001 +From 9caf664693f5403956fce2f02b6b217855611342 Mon Sep 17 00:00:00 2001 From: Evan Quan <evan.quan@amd.com> Date: Sun, 28 Jun 2020 19:12:42 +0800 Subject: [PATCH] drm/amd/powerplay: fix compile error with ARCH=arc @@ -17,6 +17,7 @@ Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Evan Quan <evan.quan@amd.com> Acked-by: Alex Deucher <alexander.deucher@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/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c index 4749574d5fd5..50e5ab5a0be1 100644 diff --git a/queue/drm-amdgpu-avoid-dereferencing-a-NULL-pointer.patch b/queue/drm-amdgpu-avoid-dereferencing-a-NULL-pointer.patch index 6b705c1b..6ad0f739 100644 --- a/queue/drm-amdgpu-avoid-dereferencing-a-NULL-pointer.patch +++ b/queue/drm-amdgpu-avoid-dereferencing-a-NULL-pointer.patch @@ -1,4 +1,4 @@ -From 55611b507fd6453d26030c0c0619fdf0c262766d Mon Sep 17 00:00:00 2001 +From 5e61e7bd7c1b919e422f29c5b99acff6b1620e4d Mon Sep 17 00:00:00 2001 From: Jack Xiao <Jack.Xiao@amd.com> Date: Wed, 5 Jun 2019 16:30:13 +0800 Subject: [PATCH] drm/amdgpu: avoid dereferencing a NULL pointer @@ -16,12 +16,13 @@ Acked-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Reviewed-by: Christian König <christian.koenig@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/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c -index d878fe7fee51..3414e119f0cb 100644 +index 4dee2326b29c..04ef5a264f7b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c -@@ -416,7 +416,9 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring, +@@ -402,7 +402,9 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring, ring->fence_drv.gpu_addr = adev->uvd.inst[ring->me].gpu_addr + index; } amdgpu_fence_write(ring, atomic_read(&ring->fence_drv.last_seq)); @@ -32,7 +33,7 @@ index d878fe7fee51..3414e119f0cb 100644 ring->fence_drv.irq_src = irq_src; ring->fence_drv.irq_type = irq_type; -@@ -537,8 +539,9 @@ void amdgpu_fence_driver_fini(struct amdgpu_device *adev) +@@ -514,8 +516,9 @@ void amdgpu_fence_driver_fini(struct amdgpu_device *adev) /* no need to trigger GPU reset as we are unloading */ amdgpu_fence_driver_force_completion(ring); } @@ -44,7 +45,7 @@ index d878fe7fee51..3414e119f0cb 100644 drm_sched_fini(&ring->sched); del_timer_sync(&ring->fence_drv.fallback_timer); for (j = 0; j <= ring->fence_drv.num_fences_mask; ++j) -@@ -574,8 +577,9 @@ void amdgpu_fence_driver_suspend(struct amdgpu_device *adev) +@@ -551,8 +554,9 @@ void amdgpu_fence_driver_suspend(struct amdgpu_device *adev) } /* disable the interrupt */ @@ -56,7 +57,7 @@ index d878fe7fee51..3414e119f0cb 100644 } } -@@ -601,8 +605,9 @@ void amdgpu_fence_driver_resume(struct amdgpu_device *adev) +@@ -578,8 +582,9 @@ void amdgpu_fence_driver_resume(struct amdgpu_device *adev) continue; /* enable the interrupt */ diff --git a/queue/drm-amdgpu-display-bail-early-in-dm_pp_get_static_cl.patch b/queue/drm-amdgpu-display-bail-early-in-dm_pp_get_static_cl.patch index fa46a551..803cf88f 100644 --- a/queue/drm-amdgpu-display-bail-early-in-dm_pp_get_static_cl.patch +++ b/queue/drm-amdgpu-display-bail-early-in-dm_pp_get_static_cl.patch @@ -1,4 +1,4 @@ -From b56f4620c654d919006efc2da25ca2131a5cb3b7 Mon Sep 17 00:00:00 2001 +From e0c59cbfb4e13a1e7f879901179c2ad09b246546 Mon Sep 17 00:00:00 2001 From: Alex Deucher <alexander.deucher@amd.com> Date: Wed, 17 Jun 2020 16:33:47 -0400 Subject: [PATCH] drm/amdgpu/display bail early in dm_pp_get_static_clocks @@ -11,6 +11,7 @@ nominal clocks. Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1170 Reviewed-by: Evan Quan <evan.quan@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_pp_smu.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c index 37893145e712..b7ab878f3932 100644 diff --git a/queue/drm-arm-fix-unintentional-integer-overflow-on-left-s.patch b/queue/drm-arm-fix-unintentional-integer-overflow-on-left-s.patch index cfd94870..d7c05079 100644 --- a/queue/drm-arm-fix-unintentional-integer-overflow-on-left-s.patch +++ b/queue/drm-arm-fix-unintentional-integer-overflow-on-left-s.patch @@ -1,4 +1,4 @@ -From 5f368ddea6fec519bdb93b5368f6a844b6ea27a6 Mon Sep 17 00:00:00 2001 +From 0e5103126e811e855748bedae8b7298393d4399c Mon Sep 17 00:00:00 2001 From: Colin Ian King <colin.king@canonical.com> Date: Thu, 18 Jun 2020 11:04:00 +0100 Subject: [PATCH] drm/arm: fix unintentional integer overflow on left shift @@ -16,9 +16,10 @@ Signed-off-by: Colin Ian King <colin.king@canonical.com> Acked-by: Liviu Dudau <liviu.dudau@arm.com> Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200618100400.11464-1-colin.king@canonical.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c -index 37715cc6064e..ab45ac445045 100644 +index 062e88e238dd..2631e76bac7c 100644 --- a/drivers/gpu/drm/arm/malidp_planes.c +++ b/drivers/gpu/drm/arm/malidp_planes.c @@ -928,7 +928,7 @@ int malidp_de_planes_init(struct drm_device *drm) diff --git a/queue/drm-bridge-sil_sii8620-initialize-return-of-sii8620_.patch b/queue/drm-bridge-sil_sii8620-initialize-return-of-sii8620_.patch index f9d26718..d4f2aee1 100644 --- a/queue/drm-bridge-sil_sii8620-initialize-return-of-sii8620_.patch +++ b/queue/drm-bridge-sil_sii8620-initialize-return-of-sii8620_.patch @@ -1,4 +1,4 @@ -From 02cd2d3144653e6e2a0c7ccaa73311e48e2dc686 Mon Sep 17 00:00:00 2001 +From b8c0cf37d4ec7cbb183b064d2a6ed7329570c3fe Mon Sep 17 00:00:00 2001 From: Tom Rix <trix@redhat.com> Date: Sun, 12 Jul 2020 08:24:53 -0700 Subject: [PATCH] drm/bridge: sil_sii8620: initialize return of sii8620_readb @@ -24,12 +24,13 @@ Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Link: https://patchwork.freedesktop.org/patch/msgid/20200712152453.27510-1-trix@redhat.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c -index 7c0c93c7e61f..95f3d8cfe9ec 100644 +index bd3165ee5354..04431dbac4a4 100644 --- a/drivers/gpu/drm/bridge/sil-sii8620.c +++ b/drivers/gpu/drm/bridge/sil-sii8620.c -@@ -178,7 +178,7 @@ static void sii8620_read_buf(struct sii8620 *ctx, u16 addr, u8 *buf, int len) +@@ -177,7 +177,7 @@ static void sii8620_read_buf(struct sii8620 *ctx, u16 addr, u8 *buf, int len) static u8 sii8620_readb(struct sii8620 *ctx, u16 addr) { diff --git a/queue/drm-bridge-ti-sn65dsi86-Clear-old-error-bits-before-.patch b/queue/drm-bridge-ti-sn65dsi86-Clear-old-error-bits-before-.patch index 8fe5f210..f1dfd693 100644 --- a/queue/drm-bridge-ti-sn65dsi86-Clear-old-error-bits-before-.patch +++ b/queue/drm-bridge-ti-sn65dsi86-Clear-old-error-bits-before-.patch @@ -1,4 +1,4 @@ -From baef4d56195b6d6e0f681f6eac03d8c6db011d34 Mon Sep 17 00:00:00 2001 +From 0aabfe0ba1764850533262da12f807056c5eebff Mon Sep 17 00:00:00 2001 From: Douglas Anderson <dianders@chromium.org> Date: Fri, 8 May 2020 16:33:29 -0700 Subject: [PATCH] drm/bridge: ti-sn65dsi86: Clear old error bits before AUX @@ -18,12 +18,13 @@ Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Rob Clark <robdclark@gmail.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Link: https://patchwork.freedesktop.org/patch/msgid/20200508163314.1.Idfa69d5d3fc9623083c0ff78572fea87dccb199c@changeid +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c -index 3b91fa0ebdf9..03a29c797784 100644 +index f72ee137e5f1..638fd14e0858 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c -@@ -869,6 +869,12 @@ static ssize_t ti_sn_aux_transfer(struct drm_dp_aux *aux, +@@ -607,6 +607,12 @@ static ssize_t ti_sn_aux_transfer(struct drm_dp_aux *aux, buf[i]); } diff --git a/queue/drm-debugfs-fix-plain-echo-to-connector-force-attrib.patch b/queue/drm-debugfs-fix-plain-echo-to-connector-force-attrib.patch index 73722f25..16a2711b 100644 --- a/queue/drm-debugfs-fix-plain-echo-to-connector-force-attrib.patch +++ b/queue/drm-debugfs-fix-plain-echo-to-connector-force-attrib.patch @@ -1,4 +1,4 @@ -From c704b17071c4dc571dca3af4e4151dac51de081a Mon Sep 17 00:00:00 2001 +From 58a2254d418b6ce1cfaae84ff9541374b99a0c21 Mon Sep 17 00:00:00 2001 From: Michael Tretter <m.tretter@pengutronix.de> Date: Thu, 17 Aug 2017 12:43:07 +0200 Subject: [PATCH] drm/debugfs: fix plain echo to connector "force" attribute @@ -17,12 +17,13 @@ Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/20170817104307.17124-1-m.tretter@pengutronix.de +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c -index 2bea22130703..bfe4602f206b 100644 +index f8468eae0503..b531649e4ee2 100644 --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c -@@ -311,13 +311,13 @@ static ssize_t connector_write(struct file *file, const char __user *ubuf, +@@ -354,13 +354,13 @@ static ssize_t connector_write(struct file *file, const char __user *ubuf, buf[len] = '\0'; diff --git a/queue/drm-etnaviv-Fix-error-path-on-failure-to-enable-bus-.patch b/queue/drm-etnaviv-Fix-error-path-on-failure-to-enable-bus-.patch index 00edcc12..4268d08c 100644 --- a/queue/drm-etnaviv-Fix-error-path-on-failure-to-enable-bus-.patch +++ b/queue/drm-etnaviv-Fix-error-path-on-failure-to-enable-bus-.patch @@ -1,4 +1,4 @@ -From f8794feaf65cdc97767604cf864775d20b97f397 Mon Sep 17 00:00:00 2001 +From f6ed458cb50ce82518b566e3aaa645e451e1de02 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak@v3.sk> Date: Tue, 16 Jun 2020 23:21:24 +0200 Subject: [PATCH] drm/etnaviv: Fix error path on failure to enable bus clk @@ -12,12 +12,13 @@ its enablement on error. Fixes: 65f037e8e908 ("drm/etnaviv: add support for slave interface clock") Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> Signed-off-by: Lucas Stach <l.stach@pengutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c -index a31eeff2b297..c6dacfe3d321 100644 +index 8cb6f310eabc..517d87175fed 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c -@@ -1496,7 +1496,7 @@ static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu) +@@ -1459,7 +1459,7 @@ static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu) if (gpu->clk_bus) { ret = clk_prepare_enable(gpu->clk_bus); if (ret) @@ -26,7 +27,7 @@ index a31eeff2b297..c6dacfe3d321 100644 } if (gpu->clk_core) { -@@ -1519,6 +1519,9 @@ static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu) +@@ -1482,6 +1482,9 @@ static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu) disable_clk_bus: if (gpu->clk_bus) clk_disable_unprepare(gpu->clk_bus); diff --git a/queue/drm-etnaviv-fix-ref-count-leak-via-pm_runtime_get_sy.patch b/queue/drm-etnaviv-fix-ref-count-leak-via-pm_runtime_get_sy.patch index 9de58943..66e9049a 100644 --- a/queue/drm-etnaviv-fix-ref-count-leak-via-pm_runtime_get_sy.patch +++ b/queue/drm-etnaviv-fix-ref-count-leak-via-pm_runtime_get_sy.patch @@ -1,4 +1,4 @@ -From a9a620fc9fd84ff18502243ca3e3e7d0428cda97 Mon Sep 17 00:00:00 2001 +From 791b38be5a3479f59994a5f44129c35e9ca0194c Mon Sep 17 00:00:00 2001 From: Navid Emamdoost <navid.emamdoost@gmail.com> Date: Mon, 15 Jun 2020 01:12:20 -0500 Subject: [PATCH] drm/etnaviv: fix ref count leak via pm_runtime_get_sync @@ -12,6 +12,7 @@ In case of failure, decrement the ref count before returning. Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> Signed-off-by: Lucas Stach <l.stach@pengutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index 5418a1a87b2c..8cb6f310eabc 100644 diff --git a/queue/drm-gem-Fix-a-leak-in-drm_gem_objects_lookup.patch b/queue/drm-gem-Fix-a-leak-in-drm_gem_objects_lookup.patch index a594e55d..c0946dc5 100644 --- a/queue/drm-gem-Fix-a-leak-in-drm_gem_objects_lookup.patch +++ b/queue/drm-gem-Fix-a-leak-in-drm_gem_objects_lookup.patch @@ -1,4 +1,4 @@ -From ec0bb482de0ad5e4aba2a4537ea53eaeb77d11a6 Mon Sep 17 00:00:00 2001 +From 0d53fe9a86e07a2385b418f9cfd7c34b172921ed Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter@oracle.com> Date: Fri, 20 Mar 2020 16:23:34 +0300 Subject: [PATCH] drm/gem: Fix a leak in drm_gem_objects_lookup() @@ -12,12 +12,13 @@ Fixes: c117aa4d8701 ("drm: Add a drm_gem_objects_lookup helper") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200320132334.GC95012@mwanda +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c -index 7bf628e13023..d6ef48bc7a7b 100644 +index 1ee8f3189ef2..dbab035203ee 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c -@@ -709,6 +709,8 @@ int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles, +@@ -703,6 +703,8 @@ int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles, if (!objs) return -ENOMEM; @@ -26,7 +27,7 @@ index 7bf628e13023..d6ef48bc7a7b 100644 handles = kvmalloc_array(count, sizeof(u32), GFP_KERNEL); if (!handles) { ret = -ENOMEM; -@@ -722,8 +724,6 @@ int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles, +@@ -716,8 +718,6 @@ int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles, } ret = objects_lookup(filp, handles, count, objs); diff --git a/queue/drm-imx-fix-use-after-free.patch b/queue/drm-imx-fix-use-after-free.patch index 4c9634c9..d72ba4db 100644 --- a/queue/drm-imx-fix-use-after-free.patch +++ b/queue/drm-imx-fix-use-after-free.patch @@ -1,4 +1,4 @@ -From a8421c86dbb0069ac7b94c83fa63a08442c6de6f Mon Sep 17 00:00:00 2001 +From 71e46838cb66acb70b0c54b1baf64a951a3976fc Mon Sep 17 00:00:00 2001 From: Philipp Zabel <p.zabel@pengutronix.de> Date: Thu, 11 Jun 2020 14:43:31 +0200 Subject: [PATCH] drm/imx: fix use after free @@ -30,6 +30,7 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> [m.felsch@pengutronix: adapt commit message] Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/imx/dw_hdmi-imx.c b/drivers/gpu/drm/imx/dw_hdmi-imx.c index 06393cd1067d..fb86fb6c67e7 100644 diff --git a/queue/drm-imx-tve-fix-regulator_disable-error-path.patch b/queue/drm-imx-tve-fix-regulator_disable-error-path.patch index 9da33e2d..a38f7a67 100644 --- a/queue/drm-imx-tve-fix-regulator_disable-error-path.patch +++ b/queue/drm-imx-tve-fix-regulator_disable-error-path.patch @@ -1,4 +1,4 @@ -From 7bb58b987fee26da2a1665c01033022624986b7c Mon Sep 17 00:00:00 2001 +From e67b6da29318e2db4e6209c62684c35c418e3ad1 Mon Sep 17 00:00:00 2001 From: Marco Felsch <m.felsch@pengutronix.de> Date: Thu, 11 Jun 2020 14:43:32 +0200 Subject: [PATCH] drm/imx: tve: fix regulator_disable error path @@ -11,9 +11,10 @@ unbind() callback and fix the missing error handling. Fixes: fcbc51e54d2a ("staging: drm/imx: Add support for Television Encoder (TVEv2)") Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c -index 82d1ee1fb0c8..3758de3e09bd 100644 +index 64fecd968554..527e2659d99c 100644 --- a/drivers/gpu/drm/imx/imx-tve.c +++ b/drivers/gpu/drm/imx/imx-tve.c @@ -490,6 +490,13 @@ static int imx_tve_register(struct drm_device *drm, struct imx_tve *tve) diff --git a/queue/drm-mipi-use-dcs-write-for-mipi_dsi_dcs_set_tear_sca.patch b/queue/drm-mipi-use-dcs-write-for-mipi_dsi_dcs_set_tear_sca.patch index 0ff2a602..471b6bc4 100644 --- a/queue/drm-mipi-use-dcs-write-for-mipi_dsi_dcs_set_tear_sca.patch +++ b/queue/drm-mipi-use-dcs-write-for-mipi_dsi_dcs_set_tear_sca.patch @@ -1,4 +1,4 @@ -From 7a05c3b6d24b8460b3cec436cf1d33fac43c8450 Mon Sep 17 00:00:00 2001 +From 5ab285bfce9831e033918abbc06aa9d73514ef37 Mon Sep 17 00:00:00 2001 From: Emil Velikov <emil.velikov@collabora.com> Date: Tue, 5 May 2020 17:03:29 +0100 Subject: [PATCH] drm/mipi: use dcs write for mipi_dsi_dcs_set_tear_scanline @@ -19,12 +19,13 @@ Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Link: https://patchwork.freedesktop.org/patch/msgid/20200505160329.2976059-3-emil.l.velikov@gmail.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c -index b96d5b4629d7..07102d8da58f 100644 +index 80b75501f5c6..7ed8e510565e 100644 --- a/drivers/gpu/drm/drm_mipi_dsi.c +++ b/drivers/gpu/drm/drm_mipi_dsi.c -@@ -1082,11 +1082,11 @@ EXPORT_SYMBOL(mipi_dsi_dcs_set_pixel_format); +@@ -1034,11 +1034,11 @@ EXPORT_SYMBOL(mipi_dsi_dcs_set_pixel_format); */ int mipi_dsi_dcs_set_tear_scanline(struct mipi_dsi_device *dsi, u16 scanline) { diff --git a/queue/drm-msm-Fix-a-null-pointer-access-in-msm_gem_shrinke.patch b/queue/drm-msm-Fix-a-null-pointer-access-in-msm_gem_shrinke.patch index 03141040..5fa623d8 100644 --- a/queue/drm-msm-Fix-a-null-pointer-access-in-msm_gem_shrinke.patch +++ b/queue/drm-msm-Fix-a-null-pointer-access-in-msm_gem_shrinke.patch @@ -1,4 +1,4 @@ -From e4445a2b37176bea76ff6d3d5d163b267558e6c8 Mon Sep 17 00:00:00 2001 +From 4275e603190101519730f94c48896e18798bcb3c Mon Sep 17 00:00:00 2001 From: Akhil P Oommen <akhilpo@codeaurora.org> Date: Fri, 10 Jul 2020 02:01:55 +0530 Subject: [PATCH] drm/msm: Fix a null pointer access in @@ -59,6 +59,7 @@ This patch fixes the below error: Signed-off-by: Akhil P Oommen <akhilpo@codeaurora.org> Signed-off-by: Rob Clark <robdclark@chromium.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 49a019939ccd..bba6291b58a2 100644 diff --git a/queue/drm-msm-a6xx-fix-gpu-failure-after-system-resume.patch b/queue/drm-msm-a6xx-fix-gpu-failure-after-system-resume.patch index b28cdcf4..573a3ba7 100644 --- a/queue/drm-msm-a6xx-fix-gpu-failure-after-system-resume.patch +++ b/queue/drm-msm-a6xx-fix-gpu-failure-after-system-resume.patch @@ -1,4 +1,4 @@ -From 05310b390a31ae2e11fb06b3deda30d1328a69f1 Mon Sep 17 00:00:00 2001 +From b1127aac93966b34fe7cf8c7f8cd158c31d0489a Mon Sep 17 00:00:00 2001 From: Akhil P Oommen <akhilpo@codeaurora.org> Date: Fri, 17 Jul 2020 20:04:18 +0530 Subject: [PATCH] drm: msm: a6xx: fix gpu failure after system resume @@ -16,6 +16,7 @@ Signed-off-by: Akhil P Oommen <akhilpo@codeaurora.org> Tested-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org> Signed-off-by: Rob Clark <robdclark@chromium.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index 8026e4035e17..862ec6a96406 100644 diff --git a/queue/drm-msm-ratelimit-crtc-event-overflow-error.patch b/queue/drm-msm-ratelimit-crtc-event-overflow-error.patch index fb274071..0e64a8c5 100644 --- a/queue/drm-msm-ratelimit-crtc-event-overflow-error.patch +++ b/queue/drm-msm-ratelimit-crtc-event-overflow-error.patch @@ -1,4 +1,4 @@ -From 5e16372b5940b1fecc3cc887fc02a50ba148d373 Mon Sep 17 00:00:00 2001 +From 6f52189f57fd35c4b3f7cd3789ee61423d62fcce Mon Sep 17 00:00:00 2001 From: Rob Clark <robdclark@chromium.org> Date: Wed, 1 Jul 2020 13:36:00 -0700 Subject: [PATCH] drm/msm: ratelimit crtc event overflow error @@ -11,12 +11,13 @@ when this happens. Signed-off-by: Rob Clark <robdclark@chromium.org> Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org> Signed-off-by: Rob Clark <robdclark@chromium.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c -index e15b42a780e0..969d95aa873c 100644 +index ccc298711bae..b97a541079ec 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c -@@ -389,7 +389,7 @@ static void dpu_crtc_frame_event_cb(void *data, u32 event) +@@ -397,7 +397,7 @@ static void dpu_crtc_frame_event_cb(void *data, u32 event) spin_unlock_irqrestore(&dpu_crtc->spin_lock, flags); if (!fevent) { diff --git a/queue/drm-nouveau-fix-multiple-instances-of-reference-coun.patch b/queue/drm-nouveau-fix-multiple-instances-of-reference-coun.patch index 46eccde6..8ac84d50 100644 --- a/queue/drm-nouveau-fix-multiple-instances-of-reference-coun.patch +++ b/queue/drm-nouveau-fix-multiple-instances-of-reference-coun.patch @@ -1,4 +1,4 @@ -From 659fb5f154c3434c90a34586f3b7aa1c39cf6062 Mon Sep 17 00:00:00 2001 +From e5c1ad41962db0da9f494dbca05e437cb1e54f4b Mon Sep 17 00:00:00 2001 From: Aditya Pakki <pakki001@umn.edu> Date: Sat, 13 Jun 2020 20:41:56 -0500 Subject: [PATCH] drm/nouveau: fix multiple instances of reference count leaks @@ -11,12 +11,13 @@ ref count before returning the error. Signed-off-by: Aditya Pakki <pakki001@umn.edu> Signed-off-by: Ben Skeggs <bskeggs@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c -index ac93d12201dc..880d962c1b19 100644 +index e6b2cd082544..425fe54da1f5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c -@@ -1026,8 +1026,10 @@ nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv) +@@ -1050,8 +1050,10 @@ nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv) /* need to bring up power immediately if opening device */ ret = pm_runtime_get_sync(dev->dev); @@ -28,7 +29,7 @@ index ac93d12201dc..880d962c1b19 100644 get_task_comm(tmpname, current); snprintf(name, sizeof(name), "%s[%d]", tmpname, pid_nr(fpriv->pid)); -@@ -1109,8 +1111,10 @@ nouveau_drm_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +@@ -1133,8 +1135,10 @@ nouveau_drm_ioctl(struct file *file, unsigned int cmd, unsigned long arg) long ret; ret = pm_runtime_get_sync(dev->dev); @@ -41,7 +42,7 @@ index ac93d12201dc..880d962c1b19 100644 switch (_IOC_NR(cmd) - DRM_COMMAND_BASE) { case DRM_NOUVEAU_NVIF: diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c -index 63b832585390..133ab6fb7798 100644 +index b4bda716564d..0f96beec66ac 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -45,8 +45,10 @@ nouveau_gem_object_del(struct drm_gem_object *gem) diff --git a/queue/drm-nouveau-fix-reference-count-leak-in-nouveau_debu.patch b/queue/drm-nouveau-fix-reference-count-leak-in-nouveau_debu.patch index e2863e3e..98746251 100644 --- a/queue/drm-nouveau-fix-reference-count-leak-in-nouveau_debu.patch +++ b/queue/drm-nouveau-fix-reference-count-leak-in-nouveau_debu.patch @@ -1,4 +1,4 @@ -From 8f29432417b11039ef960ab18987c7d61b2b5396 Mon Sep 17 00:00:00 2001 +From 6a4c8bb71518a0ac5f2341aaef3f0cf765632907 Mon Sep 17 00:00:00 2001 From: Aditya Pakki <pakki001@umn.edu> Date: Sat, 13 Jun 2020 20:48:37 -0500 Subject: [PATCH] drm/nouveau: fix reference count leak in @@ -12,9 +12,10 @@ ref count before returning the error. Signed-off-by: Aditya Pakki <pakki001@umn.edu> Signed-off-by: Ben Skeggs <bskeggs@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c -index 63b5c8cf9ae4..8f63cda3db17 100644 +index 7dfbbbc1beea..5c314f135dd1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c @@ -54,8 +54,10 @@ nouveau_debugfs_strap_peek(struct seq_file *m, void *data) diff --git a/queue/drm-nouveau-kms-nv50-Fix-disabling-dithering.patch b/queue/drm-nouveau-kms-nv50-Fix-disabling-dithering.patch index 32cecd50..6e3cad12 100644 --- a/queue/drm-nouveau-kms-nv50-Fix-disabling-dithering.patch +++ b/queue/drm-nouveau-kms-nv50-Fix-disabling-dithering.patch @@ -1,4 +1,4 @@ -From fb2420b701edbf96c2b6d557f0139902f455dc2b Mon Sep 17 00:00:00 2001 +From a08c50f6f5d9e1b3c6e78a488e2c666751a20a07 Mon Sep 17 00:00:00 2001 From: Lyude Paul <lyude@redhat.com> Date: Tue, 17 Mar 2020 14:54:06 -0400 Subject: [PATCH] drm/nouveau/kms/nv50-: Fix disabling dithering @@ -16,12 +16,13 @@ Signed-off-by: Lyude Paul <lyude@redhat.com> Reviewed-by: Ben Skeggs <bskeggs@redhat.com> Acked-by: Dave Airlie <airlied@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200627194657.156514-6-lyude@redhat.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c b/drivers/gpu/drm/nouveau/dispnv50/head.c -index 8f6455697ba7..ed6819519f6d 100644 +index 4497f07935cd..ec639d055595 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/head.c +++ b/drivers/gpu/drm/nouveau/dispnv50/head.c -@@ -84,18 +84,20 @@ nv50_head_atomic_check_dither(struct nv50_head_atom *armh, +@@ -83,18 +83,20 @@ nv50_head_atomic_check_dither(struct nv50_head_atom *armh, { u32 mode = 0x00; diff --git a/queue/drm-panel-simple-Fix-bpc-for-LG-LB070WV8-panel.patch b/queue/drm-panel-simple-Fix-bpc-for-LG-LB070WV8-panel.patch index b130363b..fdfdd171 100644 --- a/queue/drm-panel-simple-Fix-bpc-for-LG-LB070WV8-panel.patch +++ b/queue/drm-panel-simple-Fix-bpc-for-LG-LB070WV8-panel.patch @@ -1,4 +1,4 @@ -From a6ae2fe5c9f9fd355a48fb7d21c863e5b20d6c9c Mon Sep 17 00:00:00 2001 +From 46544cd54d4030a1a8eefef66a20e2009ac9fe14 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Date: Sun, 12 Jul 2020 01:53:17 +0300 Subject: [PATCH] drm: panel: simple: Fix bpc for LG LB070WV8 panel @@ -12,12 +12,13 @@ Fixes: dd0150026901 ("drm/panel: simple: Add support for LG LB070WV8 800x480 7" Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Link: https://patchwork.freedesktop.org/patch/msgid/20200711225317.28476-1-laurent.pinchart+renesas@ideasonboard.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c -index cbd26adf3a3b..f42249b72548 100644 +index 70844fab052f..3a7410057c92 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c -@@ -2372,7 +2372,7 @@ static const struct drm_display_mode lg_lb070wv8_mode = { +@@ -1663,7 +1663,7 @@ static const struct drm_display_mode lg_lb070wv8_mode = { static const struct panel_desc lg_lb070wv8 = { .modes = &lg_lb070wv8_mode, .num_modes = 1, diff --git a/queue/drm-radeon-Fix-reference-count-leaks-caused-by-pm_ru.patch b/queue/drm-radeon-Fix-reference-count-leaks-caused-by-pm_ru.patch index 58d613a2..97192178 100644 --- a/queue/drm-radeon-Fix-reference-count-leaks-caused-by-pm_ru.patch +++ b/queue/drm-radeon-Fix-reference-count-leaks-caused-by-pm_ru.patch @@ -1,4 +1,4 @@ -From 9fb10671011143d15b6b40d6d5fa9c52c57e9d63 Mon Sep 17 00:00:00 2001 +From 34c73bdbbcc4b11b45e52d50f86d620dc31b7cfc Mon Sep 17 00:00:00 2001 From: Aditya Pakki <pakki001@umn.edu> Date: Sat, 13 Jun 2020 21:21:22 -0500 Subject: [PATCH] drm/radeon: Fix reference count leaks caused by @@ -13,12 +13,13 @@ reference count before returning the error. Acked-by: Evan Quan <evan.quan@amd.com> Signed-off-by: Aditya Pakki <pakki001@umn.edu> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c -index 35db79a168bf..df1a7eb73651 100644 +index 68743c78b486..b1efbef8107f 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c -@@ -635,8 +635,10 @@ radeon_crtc_set_config(struct drm_mode_set *set, +@@ -626,8 +626,10 @@ radeon_crtc_set_config(struct drm_mode_set *set, dev = set->crtc->dev; ret = pm_runtime_get_sync(dev->dev); @@ -31,10 +32,10 @@ index 35db79a168bf..df1a7eb73651 100644 ret = drm_crtc_helper_set_config(set, ctx); diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c -index a71f13116d6b..4cd30613fa1d 100644 +index c7f208d1be08..2403f82d0a19 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c -@@ -544,8 +544,10 @@ long radeon_drm_ioctl(struct file *filp, +@@ -542,8 +542,10 @@ long radeon_drm_ioctl(struct file *filp, long ret; dev = file_priv->minor->dev; ret = pm_runtime_get_sync(dev->dev); @@ -47,10 +48,10 @@ index a71f13116d6b..4cd30613fa1d 100644 ret = drm_ioctl(filp, cmd, arg); diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c -index 95006cbf42c3..c76955228731 100644 +index 250e8495970e..44901fba0dbf 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c -@@ -638,8 +638,10 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) +@@ -633,8 +633,10 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) file_priv->driver_priv = NULL; r = pm_runtime_get_sync(dev->dev); diff --git a/queue/drm-radeon-disable-AGP-by-default.patch b/queue/drm-radeon-disable-AGP-by-default.patch index 14e8dd6d..27bd9ab2 100644 --- a/queue/drm-radeon-disable-AGP-by-default.patch +++ b/queue/drm-radeon-disable-AGP-by-default.patch @@ -1,4 +1,4 @@ -From ba806f98f868ce107aa9c453fef751de9980e4af Mon Sep 17 00:00:00 2001 +From 406b014439606bf0e51748140fe02301f1d60cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> Date: Tue, 12 May 2020 10:55:58 +0200 Subject: [PATCH] drm/radeon: disable AGP by default @@ -15,12 +15,13 @@ regression for some GPUs, but also a bug fix for some others. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@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/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c -index bbb0883e8ce6..a71f13116d6b 100644 +index 2403f82d0a19..ab1bc6fcfd0b 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c -@@ -171,12 +171,7 @@ int radeon_no_wb; +@@ -170,12 +170,7 @@ int radeon_no_wb; int radeon_modeset = -1; int radeon_dynclks = -1; int radeon_r4xx_atom = 0; diff --git a/queue/drm-radeon-fix-array-out-of-bounds-read-and-write-is.patch b/queue/drm-radeon-fix-array-out-of-bounds-read-and-write-is.patch index 8dd6d2cd..000916d4 100644 --- a/queue/drm-radeon-fix-array-out-of-bounds-read-and-write-is.patch +++ b/queue/drm-radeon-fix-array-out-of-bounds-read-and-write-is.patch @@ -1,4 +1,4 @@ -From 7ee78aff9de13d5dccba133f4a0de5367194b243 Mon Sep 17 00:00:00 2001 +From d5dfdab7d8581c5a552d5d4a374558e67b8e63a4 Mon Sep 17 00:00:00 2001 From: Colin Ian King <colin.king@canonical.com> Date: Wed, 24 Jun 2020 13:07:10 +0100 Subject: [PATCH] drm/radeon: fix array out-of-bounds read and write issues @@ -14,12 +14,13 @@ Addresses-Coverity: ("Out-of-bounds read/write") Fixes: cc8dbbb4f62a ("drm/radeon: add dpm support for CI dGPUs (v2)") Signed-off-by: Colin Ian King <colin.king@canonical.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/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c -index 134aa2b01f90..86ac032275bb 100644 +index b1ff1de6fa7c..0f9d7945ae09 100644 --- a/drivers/gpu/drm/radeon/ci_dpm.c +++ b/drivers/gpu/drm/radeon/ci_dpm.c -@@ -4351,7 +4351,7 @@ static int ci_set_mc_special_registers(struct radeon_device *rdev, +@@ -4364,7 +4364,7 @@ static int ci_set_mc_special_registers(struct radeon_device *rdev, table->mc_reg_table_entry[k].mc_data[j] |= 0x100; } j++; diff --git a/queue/drm-tilcdc-fix-leak-null-ref-in-panel_connector_get_.patch b/queue/drm-tilcdc-fix-leak-null-ref-in-panel_connector_get_.patch index 040ae77a..70dc5d15 100644 --- a/queue/drm-tilcdc-fix-leak-null-ref-in-panel_connector_get_.patch +++ b/queue/drm-tilcdc-fix-leak-null-ref-in-panel_connector_get_.patch @@ -1,4 +1,4 @@ -From 3f9c1c872cc97875ddc8d63bc9fe6ee13652b933 Mon Sep 17 00:00:00 2001 +From e77c4582976bf6b606031cc2f1234893bbd7ea94 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@ti.com> Date: Wed, 29 Apr 2020 13:42:32 +0300 Subject: [PATCH] drm/tilcdc: fix leak & null ref in panel_connector_get_modes @@ -17,12 +17,13 @@ Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200429104234.18910-1-tomi.valkeinen@ti.com Reviewed-by: Jyri Sarha <jsarha@ti.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c -index b207b2f19d42..1c9fa8cfcd49 100644 +index 22b100d2e174..199fc2ecbb19 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c -@@ -139,12 +139,16 @@ static int panel_connector_get_modes(struct drm_connector *connector) +@@ -140,12 +140,16 @@ static int panel_connector_get_modes(struct drm_connector *connector) int i; for (i = 0; i < timings->num_timings; i++) { diff --git a/queue/drm-ttm-nouveau-don-t-call-tt-destroy-callback-on-al.patch b/queue/drm-ttm-nouveau-don-t-call-tt-destroy-callback-on-al.patch index d49da839..aa1fec63 100644 --- a/queue/drm-ttm-nouveau-don-t-call-tt-destroy-callback-on-al.patch +++ b/queue/drm-ttm-nouveau-don-t-call-tt-destroy-callback-on-al.patch @@ -1,4 +1,4 @@ -From 5de5b6ecf97a021f29403aa272cb4e03318ef586 Mon Sep 17 00:00:00 2001 +From 2edb57634530d47799766dad4961edfbb68b92ba Mon Sep 17 00:00:00 2001 From: Dave Airlie <airlied@redhat.com> Date: Tue, 28 Jul 2020 14:17:36 +1000 Subject: [PATCH] drm/ttm/nouveau: don't call tt destroy callback on alloc @@ -22,12 +22,13 @@ review deeply). Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200728041736.20689-1-airlied@gmail.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c -index 20b6d0b3de5c..c3ccf661b7a6 100644 +index 8ebdc74cc0ad..326948b65542 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c -@@ -95,12 +95,9 @@ nouveau_sgdma_create_ttm(struct ttm_buffer_object *bo, uint32_t page_flags) +@@ -96,12 +96,9 @@ nouveau_sgdma_create_ttm(struct ttm_buffer_object *bo, uint32_t page_flags) else nvbe->ttm.ttm.func = &nv50_sgdma_backend; @@ -44,10 +45,10 @@ index 20b6d0b3de5c..c3ccf661b7a6 100644 return &nvbe->ttm.ttm; } diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c -index bab67873cfd4..9d1c7177384c 100644 +index e3a0691582ff..68cfa25674e5 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c -@@ -244,7 +244,6 @@ int ttm_tt_init(struct ttm_tt *ttm, struct ttm_buffer_object *bo, +@@ -241,7 +241,6 @@ int ttm_tt_init(struct ttm_tt *ttm, struct ttm_buffer_object *bo, ttm_tt_init_fields(ttm, bo, page_flags); if (ttm_tt_alloc_page_directory(ttm)) { @@ -55,7 +56,7 @@ index bab67873cfd4..9d1c7177384c 100644 pr_err("Failed allocating page table\n"); return -ENOMEM; } -@@ -268,7 +267,6 @@ int ttm_dma_tt_init(struct ttm_dma_tt *ttm_dma, struct ttm_buffer_object *bo, +@@ -265,7 +264,6 @@ int ttm_dma_tt_init(struct ttm_dma_tt *ttm_dma, struct ttm_buffer_object *bo, INIT_LIST_HEAD(&ttm_dma->pages_list); if (ttm_dma_tt_alloc_page_directory(ttm_dma)) { @@ -63,7 +64,7 @@ index bab67873cfd4..9d1c7177384c 100644 pr_err("Failed allocating page table\n"); return -ENOMEM; } -@@ -290,7 +288,6 @@ int ttm_sg_tt_init(struct ttm_dma_tt *ttm_dma, struct ttm_buffer_object *bo, +@@ -287,7 +285,6 @@ int ttm_sg_tt_init(struct ttm_dma_tt *ttm_dma, struct ttm_buffer_object *bo, else ret = ttm_dma_tt_alloc_page_directory(ttm_dma); if (ret) { diff --git a/queue/dyndbg-fix-a-BUG_ON-in-ddebug_describe_flags.patch b/queue/dyndbg-fix-a-BUG_ON-in-ddebug_describe_flags.patch index f91280f5..c8dcb7ad 100644 --- a/queue/dyndbg-fix-a-BUG_ON-in-ddebug_describe_flags.patch +++ b/queue/dyndbg-fix-a-BUG_ON-in-ddebug_describe_flags.patch @@ -1,4 +1,4 @@ -From db2f459dc56906da4cdae0a3b89bd2f98456a746 Mon Sep 17 00:00:00 2001 +From 5d1f9b23d6e6c5c94277ecbcc3ab563a88cdf8f4 Mon Sep 17 00:00:00 2001 From: Jim Cromie <jim.cromie@gmail.com> Date: Sun, 19 Jul 2020 17:10:47 -0600 Subject: [PATCH] dyndbg: fix a BUG_ON in ddebug_describe_flags @@ -18,6 +18,7 @@ Acked-by: <jbaron@akamai.com> Signed-off-by: Jim Cromie <jim.cromie@gmail.com> Link: https://lore.kernel.org/r/20200719231058.1586423-8-jim.cromie@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 8a16c2d498e9..af9aba06c59f 100644 diff --git a/queue/ext4-fix-checking-of-directory-entry-validity-for-in.patch b/queue/ext4-fix-checking-of-directory-entry-validity-for-in.patch index 06faa017..7f615b1f 100644 --- a/queue/ext4-fix-checking-of-directory-entry-validity-for-in.patch +++ b/queue/ext4-fix-checking-of-directory-entry-validity-for-in.patch @@ -1,4 +1,4 @@ -From 7303cb5bfe845f7d43cd9b2dbd37dbb266efda9b Mon Sep 17 00:00:00 2001 +From 1dda402eead66cfbbe5f9bd50f16109f73a32cfe Mon Sep 17 00:00:00 2001 From: Jan Kara <jack@suse.cz> Date: Fri, 31 Jul 2020 18:21:35 +0200 Subject: [PATCH] ext4: fix checking of directory entry validity for inline @@ -25,12 +25,13 @@ CC: stable@vger.kernel.org Signed-off-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/20200731162135.8080-1-jack@suse.cz Signed-off-by: Theodore Ts'o <tytso@mit.edu> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c -index cb2eb1967e73..b92571beab72 100644 +index 1901f683404a..7f1cb46f4f0d 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c -@@ -1396,8 +1396,8 @@ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size, +@@ -1391,8 +1391,8 @@ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size, ext4_match(dir, fname, de)) { /* found a match - just to be sure, do * a full check */ @@ -41,7 +42,7 @@ index cb2eb1967e73..b92571beab72 100644 return -1; *res_dir = de; return 1; -@@ -2482,7 +2482,7 @@ int ext4_generic_delete_entry(handle_t *handle, +@@ -2473,7 +2473,7 @@ int ext4_generic_delete_entry(handle_t *handle, de = (struct ext4_dir_entry_2 *)entry_buf; while (i < buf_size - csum_size) { if (ext4_check_dir_entry(dir, NULL, de, bh, diff --git a/queue/firmware-arm_scmi-Fix-SCMI-genpd-domain-probing.patch b/queue/firmware-arm_scmi-Fix-SCMI-genpd-domain-probing.patch index 143f6e95..7b750d66 100644 --- a/queue/firmware-arm_scmi-Fix-SCMI-genpd-domain-probing.patch +++ b/queue/firmware-arm_scmi-Fix-SCMI-genpd-domain-probing.patch @@ -1,4 +1,4 @@ -From e0f1a30cf184821499eeb67daedd7a3f21bbcb0b Mon Sep 17 00:00:00 2001 +From 0ee39d481283289144e1154bb19ee2a7297ddc8e Mon Sep 17 00:00:00 2001 From: Cristian Marussi <cristian.marussi@arm.com> Date: Fri, 19 Jun 2020 23:03:30 +0100 Subject: [PATCH] firmware: arm_scmi: Fix SCMI genpd domain probing @@ -57,9 +57,10 @@ Fixes: 898216c97ed2 ("firmware: arm_scmi: add device power domain support using Link: https://lore.kernel.org/r/20200619220330.12217-1-cristian.marussi@arm.com Signed-off-by: Cristian Marussi <cristian.marussi@arm.com> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/firmware/arm_scmi/scmi_pm_domain.c b/drivers/firmware/arm_scmi/scmi_pm_domain.c -index bafbfe358f97..9e44479f0284 100644 +index 87f737e01473..041f8152272b 100644 --- a/drivers/firmware/arm_scmi/scmi_pm_domain.c +++ b/drivers/firmware/arm_scmi/scmi_pm_domain.c @@ -85,7 +85,10 @@ static int scmi_pm_domain_probe(struct scmi_device *sdev) diff --git a/queue/fs-btrfs-Add-cond_resched-for-try_release_extent_map.patch b/queue/fs-btrfs-Add-cond_resched-for-try_release_extent_map.patch index 978cce2b..638dc739 100644 --- a/queue/fs-btrfs-Add-cond_resched-for-try_release_extent_map.patch +++ b/queue/fs-btrfs-Add-cond_resched-for-try_release_extent_map.patch @@ -1,4 +1,4 @@ -From 9f47eb5461aaeb6cb8696f9d11503ae90e4d5cb0 Mon Sep 17 00:00:00 2001 +From 837e60d3dee2edc4064dee98ee9e96952e91d743 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" <paulmck@kernel.org> Date: Fri, 8 May 2020 14:15:37 -0700 Subject: [PATCH] fs/btrfs: Add cond_resched() for try_release_extent_mapping() @@ -38,12 +38,13 @@ therefore adds a cond_resched() to this loop, providing RCU any needed quiescent states. Signed-off-by: Paul E. McKenney <paulmck@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c -index 68c96057ad2d..704239546093 100644 +index 854bc56abd86..38ac638665a6 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c -@@ -4515,6 +4515,8 @@ int try_release_extent_mapping(struct page *page, gfp_t mask) +@@ -4449,6 +4449,8 @@ int try_release_extent_mapping(struct page *page, gfp_t mask) /* once for us */ free_extent_map(em); diff --git a/queue/fs-minix-check-return-value-of-sb_getblk.patch b/queue/fs-minix-check-return-value-of-sb_getblk.patch index b50645b7..4ef1b671 100644 --- a/queue/fs-minix-check-return-value-of-sb_getblk.patch +++ b/queue/fs-minix-check-return-value-of-sb_getblk.patch @@ -1,4 +1,4 @@ -From da27e0a0e5f655f0d58d4e153c3182bb2b290f64 Mon Sep 17 00:00:00 2001 +From cfda1e36725407169509879f8e4994807b9751e3 Mon Sep 17 00:00:00 2001 From: Eric Biggers <ebiggers@google.com> Date: Tue, 11 Aug 2020 18:35:24 -0700 Subject: [PATCH] fs/minix: check return value of sb_getblk() @@ -37,6 +37,7 @@ Cc: <stable@vger.kernel.org> Link: http://lkml.kernel.org/r/20200628060846.682158-1-ebiggers@kernel.org Link: http://lkml.kernel.org/r/20200628060846.682158-2-ebiggers@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/minix/itree_common.c b/fs/minix/itree_common.c index 043c3fdbc8e7..446148792f41 100644 diff --git a/queue/fs-minix-don-t-allow-getting-deleted-inodes.patch b/queue/fs-minix-don-t-allow-getting-deleted-inodes.patch index 3fe39b40..8d55c70e 100644 --- a/queue/fs-minix-don-t-allow-getting-deleted-inodes.patch +++ b/queue/fs-minix-don-t-allow-getting-deleted-inodes.patch @@ -1,4 +1,4 @@ -From facb03dddec04e4aac1bb2139accdceb04deb1f3 Mon Sep 17 00:00:00 2001 +From 7f8e0540f85ec7d452d0a00ba75019786ea3e5d7 Mon Sep 17 00:00:00 2001 From: Eric Biggers <ebiggers@google.com> Date: Tue, 11 Aug 2020 18:35:27 -0700 Subject: [PATCH] fs/minix: don't allow getting deleted inodes @@ -19,12 +19,13 @@ Cc: Qiujun Huang <anenbupt@gmail.com> Cc: <stable@vger.kernel.org> Link: http://lkml.kernel.org/r/20200628060846.682158-3-ebiggers@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/minix/inode.c b/fs/minix/inode.c -index 7cb5fd38eb14..2bca95abe8f4 100644 +index f96073f25432..e8e549024c06 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c -@@ -468,6 +468,13 @@ static struct inode *V1_minix_iget(struct inode *inode) +@@ -466,6 +466,13 @@ static struct inode *V1_minix_iget(struct inode *inode) iget_failed(inode); return ERR_PTR(-EIO); } @@ -38,7 +39,7 @@ index 7cb5fd38eb14..2bca95abe8f4 100644 inode->i_mode = raw_inode->i_mode; i_uid_write(inode, raw_inode->i_uid); i_gid_write(inode, raw_inode->i_gid); -@@ -501,6 +508,13 @@ static struct inode *V2_minix_iget(struct inode *inode) +@@ -499,6 +506,13 @@ static struct inode *V2_minix_iget(struct inode *inode) iget_failed(inode); return ERR_PTR(-EIO); } diff --git a/queue/fs-minix-reject-too-large-maximum-file-size.patch b/queue/fs-minix-reject-too-large-maximum-file-size.patch index 507669d8..51e19754 100644 --- a/queue/fs-minix-reject-too-large-maximum-file-size.patch +++ b/queue/fs-minix-reject-too-large-maximum-file-size.patch @@ -1,4 +1,4 @@ -From 270ef41094e9fa95273f288d7d785313ceab2ff3 Mon Sep 17 00:00:00 2001 +From 94fea4b9d8b1437d84774bab5bfbaf0ccfb70232 Mon Sep 17 00:00:00 2001 From: Eric Biggers <ebiggers@google.com> Date: Tue, 11 Aug 2020 18:35:30 -0700 Subject: [PATCH] fs/minix: reject too-large maximum file size @@ -25,9 +25,10 @@ Cc: Qiujun Huang <anenbupt@gmail.com> Cc: <stable@vger.kernel.org> Link: http://lkml.kernel.org/r/20200628060846.682158-4-ebiggers@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/minix/inode.c b/fs/minix/inode.c -index 2bca95abe8f4..0dd929346f3f 100644 +index e8e549024c06..6aa51afe2f1a 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c @@ -150,6 +150,23 @@ static int minix_remount (struct super_block * sb, int * flags, char * data) diff --git a/queue/fsl-fman-check-dereferencing-null-pointer.patch b/queue/fsl-fman-check-dereferencing-null-pointer.patch index 70c59b02..475f9753 100644 --- a/queue/fsl-fman-check-dereferencing-null-pointer.patch +++ b/queue/fsl-fman-check-dereferencing-null-pointer.patch @@ -1,4 +1,4 @@ -From cc5d229a122106733a85c279d89d7703f21e4d4f Mon Sep 17 00:00:00 2001 +From f349405f44f38e27e81145018b6bb113d8bfe500 Mon Sep 17 00:00:00 2001 From: Florinel Iordache <florinel.iordache@nxp.com> Date: Mon, 3 Aug 2020 10:07:33 +0300 Subject: [PATCH] fsl/fman: check dereferencing null pointer @@ -10,12 +10,13 @@ Add a safe check to avoid dereferencing null pointer Fixes: 57ba4c9b56d8 ("fsl/fman: Add FMan MAC support") Signed-off-by: Florinel Iordache <florinel.iordache@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/fman/fman_dtsec.c b/drivers/net/ethernet/freescale/fman/fman_dtsec.c -index 004c266802a8..bce3c9398887 100644 +index 1ca543ac8f2c..d2de9ea80c43 100644 --- a/drivers/net/ethernet/freescale/fman/fman_dtsec.c +++ b/drivers/net/ethernet/freescale/fman/fman_dtsec.c -@@ -1200,7 +1200,7 @@ int dtsec_del_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr) +@@ -1205,7 +1205,7 @@ int dtsec_del_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr) list_for_each(pos, &dtsec->multicast_addr_hash->lsts[bucket]) { hash_entry = ETH_HASH_ENTRY_OBJ(pos); @@ -24,7 +25,7 @@ index 004c266802a8..bce3c9398887 100644 list_del_init(&hash_entry->node); kfree(hash_entry); break; -@@ -1213,7 +1213,7 @@ int dtsec_del_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr) +@@ -1218,7 +1218,7 @@ int dtsec_del_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr) list_for_each(pos, &dtsec->unicast_addr_hash->lsts[bucket]) { hash_entry = ETH_HASH_ENTRY_OBJ(pos); @@ -34,10 +35,10 @@ index 004c266802a8..bce3c9398887 100644 kfree(hash_entry); break; diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c -index bb02b37422cc..645764abdaae 100644 +index 08f8b36779ea..9088b4f4b4b8 100644 --- a/drivers/net/ethernet/freescale/fman/fman_memac.c +++ b/drivers/net/ethernet/freescale/fman/fman_memac.c -@@ -981,7 +981,7 @@ int memac_del_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr) +@@ -985,7 +985,7 @@ int memac_del_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr) list_for_each(pos, &memac->multicast_addr_hash->lsts[hash]) { hash_entry = ETH_HASH_ENTRY_OBJ(pos); @@ -47,10 +48,10 @@ index bb02b37422cc..645764abdaae 100644 kfree(hash_entry); break; diff --git a/drivers/net/ethernet/freescale/fman/fman_tgec.c b/drivers/net/ethernet/freescale/fman/fman_tgec.c -index 8c7eb878d5b4..41946b16f6c7 100644 +index f75b9c11b2d2..ac5a281e0ec3 100644 --- a/drivers/net/ethernet/freescale/fman/fman_tgec.c +++ b/drivers/net/ethernet/freescale/fman/fman_tgec.c -@@ -626,7 +626,7 @@ int tgec_del_hash_mac_address(struct fman_mac *tgec, enet_addr_t *eth_addr) +@@ -630,7 +630,7 @@ int tgec_del_hash_mac_address(struct fman_mac *tgec, enet_addr_t *eth_addr) list_for_each(pos, &tgec->multicast_addr_hash->lsts[hash]) { hash_entry = ETH_HASH_ENTRY_OBJ(pos); diff --git a/queue/fsl-fman-fix-dereference-null-return-value.patch b/queue/fsl-fman-fix-dereference-null-return-value.patch index e326af58..eba738e0 100644 --- a/queue/fsl-fman-fix-dereference-null-return-value.patch +++ b/queue/fsl-fman-fix-dereference-null-return-value.patch @@ -1,4 +1,4 @@ -From 0572054617f32670abab4b4e89a876954d54b704 Mon Sep 17 00:00:00 2001 +From 237d96d2a89cfe0fcf0fe29153d6d687ba7ba41c Mon Sep 17 00:00:00 2001 From: Florinel Iordache <florinel.iordache@nxp.com> Date: Mon, 3 Aug 2020 10:07:31 +0300 Subject: [PATCH] fsl/fman: fix dereference null return value @@ -10,12 +10,13 @@ Check before using returned value to avoid dereferencing null pointer. Fixes: 18a6c85fcc78 ("fsl/fman: Add FMan Port Support") Signed-off-by: Florinel Iordache <florinel.iordache@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/fman/fman_port.c b/drivers/net/ethernet/freescale/fman/fman_port.c -index 87b26f063cc8..c27df153f895 100644 +index ee82ee1384eb..47f6fee1f396 100644 --- a/drivers/net/ethernet/freescale/fman/fman_port.c +++ b/drivers/net/ethernet/freescale/fman/fman_port.c -@@ -1767,6 +1767,7 @@ static int fman_port_probe(struct platform_device *of_dev) +@@ -1756,6 +1756,7 @@ static int fman_port_probe(struct platform_device *of_dev) struct fman_port *port; struct fman *fman; struct device_node *fm_node, *port_node; @@ -23,7 +24,7 @@ index 87b26f063cc8..c27df153f895 100644 struct resource res; struct resource *dev_res; u32 val; -@@ -1791,8 +1792,14 @@ static int fman_port_probe(struct platform_device *of_dev) +@@ -1780,8 +1781,14 @@ static int fman_port_probe(struct platform_device *of_dev) goto return_err; } diff --git a/queue/fsl-fman-fix-eth-hash-table-allocation.patch b/queue/fsl-fman-fix-eth-hash-table-allocation.patch index 2f5d3374..35e13e95 100644 --- a/queue/fsl-fman-fix-eth-hash-table-allocation.patch +++ b/queue/fsl-fman-fix-eth-hash-table-allocation.patch @@ -1,4 +1,4 @@ -From 3207f715c34317d08e798e11a10ce816feb53c0f Mon Sep 17 00:00:00 2001 +From aa648859e6236da1216fcbb5e0cdbcbaaa43aeb6 Mon Sep 17 00:00:00 2001 From: Florinel Iordache <florinel.iordache@nxp.com> Date: Mon, 3 Aug 2020 10:07:34 +0300 Subject: [PATCH] fsl/fman: fix eth hash table allocation @@ -13,6 +13,7 @@ is incorrect because this is the main structure for eth hash table Fixes: 57ba4c9b56d8 ("fsl/fman: Add FMan MAC support") Signed-off-by: Florinel Iordache <florinel.iordache@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/fman/fman_mac.h b/drivers/net/ethernet/freescale/fman/fman_mac.h index dd6d0526f6c1..19f327efdaff 100644 diff --git a/queue/fsl-fman-fix-unreachable-code.patch b/queue/fsl-fman-fix-unreachable-code.patch index cd537813..e44284c4 100644 --- a/queue/fsl-fman-fix-unreachable-code.patch +++ b/queue/fsl-fman-fix-unreachable-code.patch @@ -1,4 +1,4 @@ -From cc79fd8f557767de90ff199d3b6fb911df43160a Mon Sep 17 00:00:00 2001 +From 5e136557fdbb9fb844b3d5a4a753b6932c920feb Mon Sep 17 00:00:00 2001 From: Florinel Iordache <florinel.iordache@nxp.com> Date: Mon, 3 Aug 2020 10:07:32 +0300 Subject: [PATCH] fsl/fman: fix unreachable code @@ -11,12 +11,13 @@ induces logically dead code in the subsequent lines. Fixes: 57ba4c9b56d8 ("fsl/fman: Add FMan MAC support") Signed-off-by: Florinel Iordache <florinel.iordache@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/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c -index a5500ede4070..bb02b37422cc 100644 +index e1901874c19f..08f8b36779ea 100644 --- a/drivers/net/ethernet/freescale/fman/fman_memac.c +++ b/drivers/net/ethernet/freescale/fman/fman_memac.c -@@ -852,7 +852,6 @@ int memac_set_tx_pause_frames(struct fman_mac *memac, u8 priority, +@@ -856,7 +856,6 @@ int memac_set_tx_pause_frames(struct fman_mac *memac, u8 priority, tmp = ioread32be(®s->command_config); tmp &= ~CMD_CFG_PFC_MODE; diff --git a/queue/fsl-fman-use-32-bit-unsigned-integer.patch b/queue/fsl-fman-use-32-bit-unsigned-integer.patch index 7d2b9815..f08bdcd9 100644 --- a/queue/fsl-fman-use-32-bit-unsigned-integer.patch +++ b/queue/fsl-fman-use-32-bit-unsigned-integer.patch @@ -1,4 +1,4 @@ -From 99f47abd9f7bf6e365820d355dc98f6955a562df Mon Sep 17 00:00:00 2001 +From 0a0d9ba061f4fdb18096392d5416c05adf956b78 Mon Sep 17 00:00:00 2001 From: Florinel Iordache <florinel.iordache@nxp.com> Date: Mon, 3 Aug 2020 10:07:30 +0300 Subject: [PATCH] fsl/fman: use 32-bit unsigned integer @@ -15,12 +15,13 @@ integer since the value is truncated anyway in the end. Fixes: 414fd46e7762 ("fsl/fman: Add FMan support") Signed-off-by: Florinel Iordache <florinel.iordache@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/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c -index f151d6e111dd..ef67e8599b39 100644 +index 21d8023535ae..eba7e54ecf85 100644 --- a/drivers/net/ethernet/freescale/fman/fman.c +++ b/drivers/net/ethernet/freescale/fman/fman.c -@@ -1398,8 +1398,7 @@ static void enable_time_stamp(struct fman *fman) +@@ -1396,8 +1396,7 @@ static void enable_time_stamp(struct fman *fman) { struct fman_fpm_regs __iomem *fpm_rg = fman->fpm_regs; u16 fm_clk_freq = fman->state->fm_clk_freq; diff --git a/queue/gpu-host1x-debug-Fix-multiple-channels-emitting-mess.patch b/queue/gpu-host1x-debug-Fix-multiple-channels-emitting-mess.patch index 8c9399b8..25d8b59b 100644 --- a/queue/gpu-host1x-debug-Fix-multiple-channels-emitting-mess.patch +++ b/queue/gpu-host1x-debug-Fix-multiple-channels-emitting-mess.patch @@ -1,4 +1,4 @@ -From 35681862808472a0a4b9a8817ae2789c0b5b3edc Mon Sep 17 00:00:00 2001 +From 66b4b36524790144698bb4189f38852118701975 Mon Sep 17 00:00:00 2001 From: Dmitry Osipenko <digetx@gmail.com> Date: Mon, 29 Jun 2020 06:18:41 +0300 Subject: [PATCH] gpu: host1x: debug: Fix multiple channels emitting messages @@ -14,9 +14,10 @@ debug messages at a time. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/host1x/debug.c b/drivers/gpu/host1x/debug.c -index c0392672a842..1b4997bda1c7 100644 +index 070b30f72947..277696029f3e 100644 --- a/drivers/gpu/host1x/debug.c +++ b/drivers/gpu/host1x/debug.c @@ -16,6 +16,8 @@ diff --git a/queue/iio-improve-IIO_CONCENTRATION-channel-type-descripti.patch b/queue/iio-improve-IIO_CONCENTRATION-channel-type-descripti.patch index e327aff5..26d69ea6 100644 --- a/queue/iio-improve-IIO_CONCENTRATION-channel-type-descripti.patch +++ b/queue/iio-improve-IIO_CONCENTRATION-channel-type-descripti.patch @@ -1,4 +1,4 @@ -From df16c33a4028159d1ba8a7061c9fa950b58d1a61 Mon Sep 17 00:00:00 2001 +From 02677e303f189c4e0bffbf5f6ee616556d1a9cab Mon Sep 17 00:00:00 2001 From: Tomasz Duszynski <tomasz.duszynski@octakon.com> Date: Mon, 1 Jun 2020 18:15:52 +0200 Subject: [PATCH] iio: improve IIO_CONCENTRATION channel type description @@ -17,12 +17,13 @@ Fixes: 8ff6b3bc94930 ("iio: chemical: Add IIO_CONCENTRATION channel type") Signed-off-by: Tomasz Duszynski <tomasz.duszynski@octakon.com> Acked-by: Matt Ranostay <matt.ranostay@konsulko.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio -index d3e53a6d8331..5c62bfb0f3f5 100644 +index 6aef7dbbde44..b97fde757bfe 100644 --- a/Documentation/ABI/testing/sysfs-bus-iio +++ b/Documentation/ABI/testing/sysfs-bus-iio -@@ -1569,7 +1569,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw +@@ -1563,7 +1563,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw KernelVersion: 4.3 Contact: linux-iio@vger.kernel.org Description: diff --git a/queue/include-asm-generic-vmlinux.lds.h-align-ro_after_ini.patch b/queue/include-asm-generic-vmlinux.lds.h-align-ro_after_ini.patch index 80321f4d..65fe2dd0 100644 --- a/queue/include-asm-generic-vmlinux.lds.h-align-ro_after_ini.patch +++ b/queue/include-asm-generic-vmlinux.lds.h-align-ro_after_ini.patch @@ -1,4 +1,4 @@ -From 7f897acbe5d57995438c831670b7c400e9c0dc00 Mon Sep 17 00:00:00 2001 +From 9eaff5473556d40a906110b80468838460c9806b Mon Sep 17 00:00:00 2001 From: Romain Naour <romain.naour@gmail.com> Date: Fri, 14 Aug 2020 17:31:57 -0700 Subject: [PATCH] include/asm-generic/vmlinux.lds.h: align ro_after_init @@ -28,12 +28,13 @@ Cc: Arnd Bergmann <arnd@arndb.de> Cc: <stable@vger.kernel.org> Link: https://marc.info/?l=linux-sh&m=158429470221261 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h -index 7616ff0b96ec..5430febd34be 100644 +index e88463e53504..6def18cb8238 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h -@@ -394,6 +394,7 @@ +@@ -318,6 +318,7 @@ */ #ifndef RO_AFTER_INIT_DATA #define RO_AFTER_INIT_DATA \ diff --git a/queue/ipvs-allow-connection-reuse-for-unconfirmed-conntrac.patch b/queue/ipvs-allow-connection-reuse-for-unconfirmed-conntrac.patch index e92a1cb6..5322507b 100644 --- a/queue/ipvs-allow-connection-reuse-for-unconfirmed-conntrac.patch +++ b/queue/ipvs-allow-connection-reuse-for-unconfirmed-conntrac.patch @@ -1,4 +1,4 @@ -From f0a5e4d7a594e0fe237d3dfafb069bb82f80f42f Mon Sep 17 00:00:00 2001 +From fb49f67d21b8eb1a652ef4473c03510a0ffe9442 Mon Sep 17 00:00:00 2001 From: Julian Anastasov <ja@ssi.bg> Date: Wed, 1 Jul 2020 18:17:19 +0300 Subject: [PATCH] ipvs: allow connection reuse for unconfirmed conntrack @@ -48,12 +48,13 @@ Signed-off-by: YangYuxi <yx.atom1@gmail.com> Signed-off-by: Julian Anastasov <ja@ssi.bg> Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h -index 0c9881241323..011f407b76fe 100644 +index b71ad28fdc98..01e034774c5b 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h -@@ -1626,18 +1626,16 @@ static inline void ip_vs_conn_drop_conntrack(struct ip_vs_conn *cp) +@@ -1616,18 +1616,16 @@ static inline void ip_vs_conn_drop_conntrack(struct ip_vs_conn *cp) } #endif /* CONFIG_IP_VS_NFCT */ @@ -77,10 +78,10 @@ index 0c9881241323..011f407b76fe 100644 #endif return false; diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c -index ca3670152565..b4a6b7662f3f 100644 +index d5103a9eb302..c85752f8bd1a 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c -@@ -2066,14 +2066,14 @@ ip_vs_in(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, int +@@ -1955,14 +1955,14 @@ ip_vs_in(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, int conn_reuse_mode = sysctl_conn_reuse_mode(ipvs); if (conn_reuse_mode && !iph.fragoffs && is_new_conn(skb, &iph) && cp) { @@ -98,7 +99,7 @@ index ca3670152565..b4a6b7662f3f 100644 if (!atomic_read(&cp->n_control)) { resched = true; } else { -@@ -2081,15 +2081,17 @@ ip_vs_in(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, int +@@ -1970,15 +1970,17 @@ ip_vs_in(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, int * that uses conntrack while it is still * referenced by controlled connection(s). */ diff --git a/queue/irqchip-irq-mtk-sysirq-Replace-spinlock-with-raw_spi.patch b/queue/irqchip-irq-mtk-sysirq-Replace-spinlock-with-raw_spi.patch index e03a2939..1b2efe53 100644 --- a/queue/irqchip-irq-mtk-sysirq-Replace-spinlock-with-raw_spi.patch +++ b/queue/irqchip-irq-mtk-sysirq-Replace-spinlock-with-raw_spi.patch @@ -1,4 +1,4 @@ -From 6eeb997ab5075e770a002c51351fa4ec2c6b5c39 Mon Sep 17 00:00:00 2001 +From 70bb4c892d6da57ed1de1d04a7dcfeb8780e7e44 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski <bgolaszewski@baylibre.com> Date: Mon, 15 Jun 2020 09:44:45 +0200 Subject: [PATCH] irqchip/irq-mtk-sysirq: Replace spinlock with raw_spinlock @@ -45,6 +45,7 @@ Replace the spinlock_t with raw_spinlock_t to avoid this warning. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20200615074445.3579-1-brgl@bgdev.pl +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/irqchip/irq-mtk-sysirq.c b/drivers/irqchip/irq-mtk-sysirq.c index 73eae5966a40..6ff98b87e5c0 100644 diff --git a/queue/irqchip-ti-sci-inta-Fix-return-value-about-devm_iore.patch b/queue/irqchip-ti-sci-inta-Fix-return-value-about-devm_iore.patch index de9c29c8..703fceb4 100644 --- a/queue/irqchip-ti-sci-inta-Fix-return-value-about-devm_iore.patch +++ b/queue/irqchip-ti-sci-inta-Fix-return-value-about-devm_iore.patch @@ -1,4 +1,4 @@ -From 4b127a14cb1385dd355c7673d975258d5d668922 Mon Sep 17 00:00:00 2001 +From 4e5b59b0c6bb6581d9784e53cd25ea221cf7e7dc Mon Sep 17 00:00:00 2001 From: Tiezhu Yang <yangtiezhu@loongson.cn> Date: Sat, 6 Jun 2020 17:50:16 +0800 Subject: [PATCH] irqchip/ti-sci-inta: Fix return value about @@ -14,12 +14,13 @@ Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> Signed-off-by: Marc Zyngier <maz@kernel.org> Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com> Link: https://lore.kernel.org/r/1591437017-5295-2-git-send-email-yangtiezhu@loongson.cn +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/irqchip/irq-ti-sci-inta.c b/drivers/irqchip/irq-ti-sci-inta.c -index c20c9f7f06e0..df1f7fe66d1b 100644 +index fa7488863bd0..0a35499c4672 100644 --- a/drivers/irqchip/irq-ti-sci-inta.c +++ b/drivers/irqchip/irq-ti-sci-inta.c -@@ -570,7 +570,7 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev) +@@ -571,7 +571,7 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); inta->base = devm_ioremap_resource(dev, res); if (IS_ERR(inta->base)) diff --git a/queue/iwlegacy-Check-the-return-value-of-pcie_capability_r.patch b/queue/iwlegacy-Check-the-return-value-of-pcie_capability_r.patch index 3458850f..f0e4e3c2 100644 --- a/queue/iwlegacy-Check-the-return-value-of-pcie_capability_r.patch +++ b/queue/iwlegacy-Check-the-return-value-of-pcie_capability_r.patch @@ -1,4 +1,4 @@ -From 9018fd7f2a73e9b290f48a56b421558fa31e8b75 Mon Sep 17 00:00:00 2001 +From afdf5045aeb79404998109cb1ca192970b01cf91 Mon Sep 17 00:00:00 2001 From: Bolarinwa Olayemi Saheed <refactormyself@gmail.com> Date: Mon, 13 Jul 2020 19:55:27 +0200 Subject: [PATCH] iwlegacy: Check the return value of pcie_capability_read_*() @@ -18,9 +18,10 @@ Suggested-by: Bjorn Helgaas <bjorn@helgaas.com> Signed-off-by: Bolarinwa Olayemi Saheed <refactormyself@gmail.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20200713175529.29715-3-refactormyself@gmail.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/intel/iwlegacy/common.c b/drivers/net/wireless/intel/iwlegacy/common.c -index 348c17ce72f5..f78e062df572 100644 +index 4f0bdf152938..ba005a13b923 100644 --- a/drivers/net/wireless/intel/iwlegacy/common.c +++ b/drivers/net/wireless/intel/iwlegacy/common.c @@ -4286,8 +4286,8 @@ il_apm_init(struct il_priv *il) diff --git a/queue/kernfs-do-not-call-fsnotify-with-name-without-a-pare.patch b/queue/kernfs-do-not-call-fsnotify-with-name-without-a-pare.patch index ef7664a6..50a86612 100644 --- a/queue/kernfs-do-not-call-fsnotify-with-name-without-a-pare.patch +++ b/queue/kernfs-do-not-call-fsnotify-with-name-without-a-pare.patch @@ -1,4 +1,4 @@ -From 9991bb84b27a2594187898f261866cfc50255454 Mon Sep 17 00:00:00 2001 +From 532e434e61c4ce6d7e49de961bb17f5d5576162b Mon Sep 17 00:00:00 2001 From: Amir Goldstein <amir73il@gmail.com> Date: Wed, 8 Jul 2020 14:11:40 +0300 Subject: [PATCH] kernfs: do not call fsnotify() with name without a parent @@ -23,9 +23,10 @@ Acked-by: Tejun Heo <tj@kernel.org> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c -index 06b342d8462b..e23b3f62483c 100644 +index e8c792b49616..c35bbaa19486 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -912,7 +912,7 @@ static void kernfs_notify_workfn(struct work_struct *work) diff --git a/queue/leds-core-Flush-scheduled-work-for-system-suspend.patch b/queue/leds-core-Flush-scheduled-work-for-system-suspend.patch index 903c1020..c8b78bb0 100644 --- a/queue/leds-core-Flush-scheduled-work-for-system-suspend.patch +++ b/queue/leds-core-Flush-scheduled-work-for-system-suspend.patch @@ -1,4 +1,4 @@ -From 302a085c20194bfa7df52e0fe684ee0c41da02e6 Mon Sep 17 00:00:00 2001 +From 80aa8d1aa0ea356b74d866e25585600eb7300d95 Mon Sep 17 00:00:00 2001 From: Kai-Heng Feng <kai.heng.feng@canonical.com> Date: Thu, 2 Jul 2020 13:45:00 +0800 Subject: [PATCH] leds: core: Flush scheduled work for system suspend @@ -18,12 +18,13 @@ Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Acked-by: Jacek Anaszewski <jacek.anaszewski@gmail.com> Fixes: 81fe8e5b73e3 ("leds: core: Add led_set_brightness_nosleep{nopm} functions") Signed-off-by: Pavel Machek <pavel@ucw.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c -index 3363a6551a70..cc3929f858b6 100644 +index 4793e77808e2..930158dcfb6e 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c -@@ -173,6 +173,7 @@ void led_classdev_suspend(struct led_classdev *led_cdev) +@@ -171,6 +171,7 @@ void led_classdev_suspend(struct led_classdev *led_cdev) { led_cdev->flags |= LED_SUSPENDED; led_set_brightness_nopm(led_cdev, 0); diff --git a/queue/leds-lm355x-avoid-enum-conversion-warning.patch b/queue/leds-lm355x-avoid-enum-conversion-warning.patch index eb24392e..955436e0 100644 --- a/queue/leds-lm355x-avoid-enum-conversion-warning.patch +++ b/queue/leds-lm355x-avoid-enum-conversion-warning.patch @@ -1,4 +1,4 @@ -From 985b1f596f9ed56f42b8c2280005f943e1434c06 Mon Sep 17 00:00:00 2001 +From a2b12489deef6de3f1f65b2805222953f4fcf5a8 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd@arndb.de> Date: Tue, 5 May 2020 16:19:17 +0200 Subject: [PATCH] leds: lm355x: avoid enum conversion warning @@ -21,12 +21,13 @@ warning. It appears to be the only instance of this warning at the moment. Fixes: b98d13c72592 ("leds: Add new LED driver for lm355x chips") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Pavel Machek <pavel@ucw.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/leds/leds-lm355x.c b/drivers/leds/leds-lm355x.c -index 11ce05249751..b2eb2e1e9c04 100644 +index a5abb499574b..129f475aebf2 100644 --- a/drivers/leds/leds-lm355x.c +++ b/drivers/leds/leds-lm355x.c -@@ -164,18 +164,19 @@ static int lm355x_chip_init(struct lm355x_chip_data *chip) +@@ -165,18 +165,19 @@ static int lm355x_chip_init(struct lm355x_chip_data *chip) /* input and output pins configuration */ switch (chip->type) { case CHIP_LM3554: diff --git a/queue/liquidio-Fix-wrong-return-value-in-cn23xx_get_pf_num.patch b/queue/liquidio-Fix-wrong-return-value-in-cn23xx_get_pf_num.patch index 1d3d9445..c633a2a9 100644 --- a/queue/liquidio-Fix-wrong-return-value-in-cn23xx_get_pf_num.patch +++ b/queue/liquidio-Fix-wrong-return-value-in-cn23xx_get_pf_num.patch @@ -1,4 +1,4 @@ -From aa027850a292ea65524b8fab83eb91a124ad362c Mon Sep 17 00:00:00 2001 +From 2183c9f482b49e9d692bfa24e49bdde1a0e01e33 Mon Sep 17 00:00:00 2001 From: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> Date: Sun, 2 Aug 2020 19:15:44 +0800 Subject: [PATCH] liquidio: Fix wrong return value in cn23xx_get_pf_num() @@ -12,6 +12,7 @@ Fixes: 0c45d7fe12c7e ("liquidio: fix use of pf in pass-through mode in a virtual Cc: Rick Farrington <ricardo.farrington@cavium.com> Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.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/cavium/liquidio/cn23xx_pf_device.c b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c index 43d11c38b38a..4cddd628d41b 100644 diff --git a/queue/loop-be-paranoid-on-exit-and-prevent-new-additions-r.patch b/queue/loop-be-paranoid-on-exit-and-prevent-new-additions-r.patch index c3f10d42..9ee16fa1 100644 --- a/queue/loop-be-paranoid-on-exit-and-prevent-new-additions-r.patch +++ b/queue/loop-be-paranoid-on-exit-and-prevent-new-additions-r.patch @@ -1,4 +1,4 @@ -From 200f93377220504c5e56754823e7adfea6037f1a Mon Sep 17 00:00:00 2001 +From 4e061d6d2f5cc794aa34321629425ea6de341c84 Mon Sep 17 00:00:00 2001 From: Luis Chamberlain <mcgrof@kernel.org> Date: Fri, 19 Jun 2020 20:47:27 +0000 Subject: [PATCH] loop: be paranoid on exit and prevent new additions / @@ -13,12 +13,13 @@ Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> Reviewed-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/block/loop.c b/drivers/block/loop.c -index 4acae248790c..a943207705dd 100644 +index 62ef4a2e0983..80f1a5555e82 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c -@@ -2404,6 +2404,8 @@ static void __exit loop_exit(void) +@@ -2333,6 +2333,8 @@ static void __exit loop_exit(void) range = max_loop ? max_loop << part_shift : 1UL << MINORBITS; @@ -27,7 +28,7 @@ index 4acae248790c..a943207705dd 100644 idr_for_each(&loop_index_idr, &loop_exit_cb, NULL); idr_destroy(&loop_index_idr); -@@ -2411,6 +2413,8 @@ static void __exit loop_exit(void) +@@ -2340,6 +2342,8 @@ static void __exit loop_exit(void) unregister_blkdev(LOOP_MAJOR, "loop"); misc_deregister(&loop_misc); diff --git a/queue/m68k-mac-Don-t-send-IOP-message-until-channel-is-idl.patch b/queue/m68k-mac-Don-t-send-IOP-message-until-channel-is-idl.patch index c5b223b4..4f890c01 100644 --- a/queue/m68k-mac-Don-t-send-IOP-message-until-channel-is-idl.patch +++ b/queue/m68k-mac-Don-t-send-IOP-message-until-channel-is-idl.patch @@ -1,4 +1,4 @@ -From aeb445bf2194d83e12e85bf5c65baaf1f093bd8f Mon Sep 17 00:00:00 2001 +From 63a6fee776c6c313bd7764c0f6ebafb38b358422 Mon Sep 17 00:00:00 2001 From: Finn Thain <fthain@telegraphics.com.au> Date: Sun, 31 May 2020 09:12:13 +1000 Subject: [PATCH] m68k: mac: Don't send IOP message until channel is idle @@ -26,12 +26,13 @@ Tested-by: Stan Johnson <userm57@yahoo.com> Cc: Joshua Thompson <funaho@jurai.org> Link: https://lore.kernel.org/r/6d667c39e53865661fa5a48f16829d18ed8abe54.1590880333.git.fthain@telegraphics.com.au Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c -index d3775afb0f07..754f6478c30d 100644 +index 9bfa17015768..d8f2282978f9 100644 --- a/arch/m68k/mac/iop.c +++ b/arch/m68k/mac/iop.c -@@ -415,7 +415,8 @@ static void iop_handle_send(uint iop_num, uint chan) +@@ -416,7 +416,8 @@ static void iop_handle_send(uint iop_num, uint chan) msg->status = IOP_MSGSTATUS_UNUSED; msg = msg->next; iop_send_queue[iop_num][chan] = msg; @@ -41,7 +42,7 @@ index d3775afb0f07..754f6478c30d 100644 } /* -@@ -489,16 +490,12 @@ int iop_send_message(uint iop_num, uint chan, void *privdata, +@@ -490,16 +491,12 @@ int iop_send_message(uint iop_num, uint chan, void *privdata, if (!(q = iop_send_queue[iop_num][chan])) { iop_send_queue[iop_num][chan] = msg; diff --git a/queue/m68k-mac-Fix-IOP-status-control-register-writes.patch b/queue/m68k-mac-Fix-IOP-status-control-register-writes.patch index db8f232b..5f1b139c 100644 --- a/queue/m68k-mac-Fix-IOP-status-control-register-writes.patch +++ b/queue/m68k-mac-Fix-IOP-status-control-register-writes.patch @@ -1,4 +1,4 @@ -From 931fc82a6aaf4e2e4a5490addaa6a090d78c24a7 Mon Sep 17 00:00:00 2001 +From 87eaf74b65204e09f63501af15b3b54a3648bfcc Mon Sep 17 00:00:00 2001 From: Finn Thain <fthain@telegraphics.com.au> Date: Sun, 31 May 2020 09:12:13 +1000 Subject: [PATCH] m68k: mac: Fix IOP status/control register writes @@ -21,9 +21,10 @@ Tested-by: Stan Johnson <userm57@yahoo.com> Cc: Joshua Thompson <funaho@jurai.org> Link: https://lore.kernel.org/r/09bcb7359a1719a18b551ee515da3c4c3cf709e6.1590880333.git.fthain@telegraphics.com.au Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c -index 754f6478c30d..bfc8daf50744 100644 +index d8f2282978f9..c432bfafe63e 100644 --- a/arch/m68k/mac/iop.c +++ b/arch/m68k/mac/iop.c @@ -183,7 +183,7 @@ static __inline__ void iop_writeb(volatile struct mac_iop *iop, __u16 addr, __u8 diff --git a/queue/macintosh-via-macii-Access-autopoll_devs-when-inside.patch b/queue/macintosh-via-macii-Access-autopoll_devs-when-inside.patch index e484cec5..78e7ac54 100644 --- a/queue/macintosh-via-macii-Access-autopoll_devs-when-inside.patch +++ b/queue/macintosh-via-macii-Access-autopoll_devs-when-inside.patch @@ -1,4 +1,4 @@ -From 59ea38f6b3af5636edf541768a1ed721eeaca99e Mon Sep 17 00:00:00 2001 +From c11a52b38ae668691e3029787d4a31abf79343ec Mon Sep 17 00:00:00 2001 From: Finn Thain <fthain@telegraphics.com.au> Date: Sun, 28 Jun 2020 14:23:12 +1000 Subject: [PATCH] macintosh/via-macii: Access autopoll_devs when inside lock @@ -13,6 +13,7 @@ Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Tested-by: Stan Johnson <userm57@yahoo.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/5952dd8a9bc9de90f1acc4790c51dd42b4c98065.1593318192.git.fthain@telegraphics.com.au +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c index ac824d7b2dcf..6aa903529570 100644 diff --git a/queue/md-cluster-fix-wild-pointer-of-unlock_all_bitmaps.patch b/queue/md-cluster-fix-wild-pointer-of-unlock_all_bitmaps.patch index 46cbd0f3..bca2b693 100644 --- a/queue/md-cluster-fix-wild-pointer-of-unlock_all_bitmaps.patch +++ b/queue/md-cluster-fix-wild-pointer-of-unlock_all_bitmaps.patch @@ -1,4 +1,4 @@ -From 60f80d6f2d07a6d8aee485a1d1252327eeee0c81 Mon Sep 17 00:00:00 2001 +From b37649298dd7a16d7d036fd39d978384e4653ecb Mon Sep 17 00:00:00 2001 From: Zhao Heming <heming.zhao@suse.com> Date: Thu, 9 Jul 2020 11:29:29 +0800 Subject: [PATCH] md-cluster: fix wild pointer of unlock_all_bitmaps() @@ -48,6 +48,7 @@ kernel stack: Signed-off-by: Zhao Heming <heming.zhao@suse.com> Signed-off-by: Song Liu <songliubraving@fb.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c index 813a99ffa86f..73fd50e77975 100644 diff --git a/queue/media-cros-ec-cec-do-not-bail-on-device_init_wakeup-.patch b/queue/media-cros-ec-cec-do-not-bail-on-device_init_wakeup-.patch index 8a4a86c3..48e5bc8a 100644 --- a/queue/media-cros-ec-cec-do-not-bail-on-device_init_wakeup-.patch +++ b/queue/media-cros-ec-cec-do-not-bail-on-device_init_wakeup-.patch @@ -1,4 +1,4 @@ -From fcde9959b8890f42df3e104e660ee5fb020cb67c Mon Sep 17 00:00:00 2001 +From 2ad29364df26b8ea0c3fa4aa87096d5e8ce2ea53 Mon Sep 17 00:00:00 2001 From: Dariusz Marcinkiewicz <darekm@google.com> Date: Mon, 22 Jun 2020 13:46:36 +0200 Subject: [PATCH] media: cros-ec-cec: do not bail on device_init_wakeup failure @@ -21,6 +21,7 @@ Fixes: cd70de2d356ee ("media: platform: Add ChromeOS EC CEC driver") Signed-off-by: Dariusz Marcinkiewicz <darekm@google.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/media/platform/cros-ec-cec/cros-ec-cec.c b/drivers/media/platform/cros-ec-cec/cros-ec-cec.c index 068df9888dbf..e49ca6e726e1 100644 diff --git a/queue/media-exynos4-is-Add-missed-check-for-pinctrl_lookup.patch b/queue/media-exynos4-is-Add-missed-check-for-pinctrl_lookup.patch index f847a298..724f7d0f 100644 --- a/queue/media-exynos4-is-Add-missed-check-for-pinctrl_lookup.patch +++ b/queue/media-exynos4-is-Add-missed-check-for-pinctrl_lookup.patch @@ -1,4 +1,4 @@ -From 18ffec750578f7447c288647d7282c7d12b1d969 Mon Sep 17 00:00:00 2001 +From ef1222aadbbb6e760d016ac40575c0729ab348f8 Mon Sep 17 00:00:00 2001 From: Chuhong Yuan <hslester96@gmail.com> Date: Thu, 28 May 2020 08:41:47 +0200 Subject: [PATCH] media: exynos4-is: Add missed check for @@ -13,12 +13,13 @@ Fixes: 4163851f7b99 ("[media] s5p-fimc: Use pinctrl API for camera ports configu Signed-off-by: Chuhong Yuan <hslester96@gmail.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c -index 96e336b19cc3..16dd660137a8 100644 +index 594e4807e45b..0ed62d11389a 100644 --- a/drivers/media/platform/exynos4-is/media-dev.c +++ b/drivers/media/platform/exynos4-is/media-dev.c -@@ -1270,6 +1270,9 @@ static int fimc_md_get_pinctrl(struct fimc_md *fmd) +@@ -1266,6 +1266,9 @@ static int fimc_md_get_pinctrl(struct fimc_md *fmd) pctl->state_idle = pinctrl_lookup_state(pctl->pinctrl, PINCTRL_STATE_IDLE); diff --git a/queue/media-firewire-Using-uninitialized-values-in-node_pr.patch b/queue/media-firewire-Using-uninitialized-values-in-node_pr.patch index 9536f00f..51c437f3 100644 --- a/queue/media-firewire-Using-uninitialized-values-in-node_pr.patch +++ b/queue/media-firewire-Using-uninitialized-values-in-node_pr.patch @@ -1,4 +1,4 @@ -From 2505a210fc126599013aec2be741df20aaacc490 Mon Sep 17 00:00:00 2001 +From 1038e01ebecf0ec062f8c34c34dc95b53c710495 Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter@oracle.com> Date: Fri, 8 May 2020 16:40:22 +0200 Subject: [PATCH] media: firewire: Using uninitialized values in node_probe() @@ -15,6 +15,7 @@ Fixes: 92374e886c75 ("[media] firedtv: drop obsolete backend abstraction") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/media/firewire/firedtv-fw.c b/drivers/media/firewire/firedtv-fw.c index 97144734eb05..3f1ca40b9b98 100644 diff --git a/queue/media-media-request-Fix-crash-if-memory-allocation-f.patch b/queue/media-media-request-Fix-crash-if-memory-allocation-f.patch index b37d17d1..cd927f94 100644 --- a/queue/media-media-request-Fix-crash-if-memory-allocation-f.patch +++ b/queue/media-media-request-Fix-crash-if-memory-allocation-f.patch @@ -1,4 +1,4 @@ -From 51d66a1e67628519ca0a4902306d07c1a2f9650d Mon Sep 17 00:00:00 2001 +From 81a46df7759a5d3dc4996bdb690e1dee0b4ce2d5 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> Date: Sun, 21 Jun 2020 13:30:40 +0200 Subject: [PATCH] media: media-request: Fix crash if memory allocation fails @@ -50,6 +50,7 @@ Fixes: 10905d70d788 ("media: media-request: implement media requests") Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/media/media-request.c b/drivers/media/media-request.c index e3fca436c75b..c0782fd96c59 100644 diff --git a/queue/media-omap3isp-Add-missed-v4l2_ctrl_handler_free-for.patch b/queue/media-omap3isp-Add-missed-v4l2_ctrl_handler_free-for.patch index 2b99b681..6078a61f 100644 --- a/queue/media-omap3isp-Add-missed-v4l2_ctrl_handler_free-for.patch +++ b/queue/media-omap3isp-Add-missed-v4l2_ctrl_handler_free-for.patch @@ -1,4 +1,4 @@ -From dc7690a73017e1236202022e26a6aa133f239c8c Mon Sep 17 00:00:00 2001 +From 85e6dd0f42eb008aec7e72440d746318f2697124 Mon Sep 17 00:00:00 2001 From: Chuhong Yuan <hslester96@gmail.com> Date: Wed, 3 Jun 2020 18:41:22 +0200 Subject: [PATCH] media: omap3isp: Add missed v4l2_ctrl_handler_free() for @@ -15,9 +15,10 @@ Signed-off-by: Chuhong Yuan <hslester96@gmail.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/media/platform/omap3isp/isppreview.c b/drivers/media/platform/omap3isp/isppreview.c -index 4dbdf3180d10..607b7685c982 100644 +index 97d660606d98..b8c2b8bba826 100644 --- a/drivers/media/platform/omap3isp/isppreview.c +++ b/drivers/media/platform/omap3isp/isppreview.c @@ -2287,7 +2287,7 @@ static int preview_init_entities(struct isp_prev_device *prev) diff --git a/queue/mm-mmap.c-Add-cond_resched-for-exit_mmap-CPU-stalls.patch b/queue/mm-mmap.c-Add-cond_resched-for-exit_mmap-CPU-stalls.patch index 3e8d37d6..11fa1dc2 100644 --- a/queue/mm-mmap.c-Add-cond_resched-for-exit_mmap-CPU-stalls.patch +++ b/queue/mm-mmap.c-Add-cond_resched-for-exit_mmap-CPU-stalls.patch @@ -1,4 +1,4 @@ -From 0a3b3c253a1eb2c7fe7f34086d46660c909abeb3 Mon Sep 17 00:00:00 2001 +From 5dac80ce391b1e7a72bf2d4ea789a17ceb385efe Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" <paulmck@kernel.org> Date: Thu, 16 Apr 2020 16:46:10 -0700 Subject: [PATCH] mm/mmap.c: Add cond_resched() for exit_mmap() CPU stalls @@ -59,12 +59,13 @@ Cc: <linux-mm@kvack.org> Reviewed-by: Shakeel Butt <shakeelb@google.com> Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org> Signed-off-by: Paul E. McKenney <paulmck@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/mmap.c b/mm/mmap.c -index 59a4682ebf3f..972f839c6ec8 100644 +index 0b083bf96ff5..2f82149669ac 100644 --- a/mm/mmap.c +++ b/mm/mmap.c -@@ -3159,6 +3159,7 @@ void exit_mmap(struct mm_struct *mm) +@@ -3160,6 +3160,7 @@ void exit_mmap(struct mm_struct *mm) if (vma->vm_flags & VM_ACCOUNT) nr_accounted += vma_pages(vma); vma = remove_vma(vma); diff --git a/queue/mmc-core-Allow-host-controllers-to-require-R1B-for-C.patch b/queue/mmc-core-Allow-host-controllers-to-require-R1B-for-C.patch index 7b11b06d..49643e40 100644 --- a/queue/mmc-core-Allow-host-controllers-to-require-R1B-for-C.patch +++ b/queue/mmc-core-Allow-host-controllers-to-require-R1B-for-C.patch @@ -1,4 +1,4 @@ -From c46b13a62d98e254ec16c72d18d7825368e5afec Mon Sep 17 00:00:00 2001 +From d587c60ea833a0440f23bcade5c064b29c15e91f Mon Sep 17 00:00:00 2001 From: Ulf Hansson <ulf.hansson@linaro.org> Date: Tue, 24 Mar 2020 19:07:34 +0100 Subject: [PATCH] mmc: core: Allow host controllers to require R1B for CMD6 diff --git a/queue/mmc-sdhci-cadence-do-not-use-hardware-tuning-for-SD-.patch b/queue/mmc-sdhci-cadence-do-not-use-hardware-tuning-for-SD-.patch index 08a70b5e..1ccc70f1 100644 --- a/queue/mmc-sdhci-cadence-do-not-use-hardware-tuning-for-SD-.patch +++ b/queue/mmc-sdhci-cadence-do-not-use-hardware-tuning-for-SD-.patch @@ -1,4 +1,4 @@ -From adc40a5179df30421a5537bfeb4545100ab97d5e Mon Sep 17 00:00:00 2001 +From 65da35c84cb63bfe95da8d3108f8a2e1ffa08cdd Mon Sep 17 00:00:00 2001 From: Masahiro Yamada <yamada.masahiro@socionext.com> Date: Mon, 20 Jul 2020 15:11:41 +0900 Subject: [PATCH] mmc: sdhci-cadence: do not use hardware tuning for SD mode @@ -20,12 +20,13 @@ mmc_host_ops::execute_tuning. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Link: https://lore.kernel.org/r/20200720061141.172944-1-yamada.masahiro@socionext.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c -index 4a6c9ba82538..4d9f7681817c 100644 +index b6bcc8ab2b53..58d2fdd6155f 100644 --- a/drivers/mmc/host/sdhci-cadence.c +++ b/drivers/mmc/host/sdhci-cadence.c -@@ -202,57 +202,6 @@ static u32 sdhci_cdns_get_emmc_mode(struct sdhci_cdns_priv *priv) +@@ -194,57 +194,6 @@ static u32 sdhci_cdns_get_emmc_mode(struct sdhci_cdns_priv *priv) return FIELD_GET(SDHCI_CDNS_HRS06_MODE, tmp); } @@ -83,7 +84,7 @@ index 4a6c9ba82538..4d9f7681817c 100644 static int sdhci_cdns_set_tune_val(struct sdhci_host *host, unsigned int val) { struct sdhci_cdns_priv *priv = sdhci_cdns_priv(host); -@@ -286,23 +235,24 @@ static int sdhci_cdns_set_tune_val(struct sdhci_host *host, unsigned int val) +@@ -278,23 +227,24 @@ static int sdhci_cdns_set_tune_val(struct sdhci_host *host, unsigned int val) return 0; } @@ -117,7 +118,7 @@ index 4a6c9ba82538..4d9f7681817c 100644 for (i = 0; i < SDHCI_CDNS_MAX_TUNING_LOOP; i++) { if (sdhci_cdns_set_tune_val(host, i) || -@@ -325,6 +275,58 @@ static int sdhci_cdns_execute_tuning(struct mmc_host *mmc, u32 opcode) +@@ -317,6 +267,58 @@ static int sdhci_cdns_execute_tuning(struct mmc_host *mmc, u32 opcode) return sdhci_cdns_set_tune_val(host, end_of_streak - max_streak / 2); } @@ -176,7 +177,7 @@ index 4a6c9ba82538..4d9f7681817c 100644 static void sdhci_cdns_hs400_enhanced_strobe(struct mmc_host *mmc, struct mmc_ios *ios) { -@@ -385,7 +387,6 @@ static int sdhci_cdns_probe(struct platform_device *pdev) +@@ -377,7 +379,6 @@ static int sdhci_cdns_probe(struct platform_device *pdev) priv->hrs_addr = host->ioaddr; priv->enhanced_strobe = false; host->ioaddr += SDHCI_CDNS_SRS_BASE; diff --git a/queue/mmc-sdhci-cadence-set-SDHCI_QUIRK2_PRESET_VALUE_BROK.patch b/queue/mmc-sdhci-cadence-set-SDHCI_QUIRK2_PRESET_VALUE_BROK.patch index 67d8468b..e522c51f 100644 --- a/queue/mmc-sdhci-cadence-set-SDHCI_QUIRK2_PRESET_VALUE_BROK.patch +++ b/queue/mmc-sdhci-cadence-set-SDHCI_QUIRK2_PRESET_VALUE_BROK.patch @@ -1,4 +1,4 @@ -From bd4076bda8ca1255974d3e571b8079f0260d866f Mon Sep 17 00:00:00 2001 +From 10b979899630793a064f1f40f55a4c9f786a1f75 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada <yamada.masahiro@socionext.com> Date: Thu, 12 Mar 2020 19:42:57 +0900 Subject: [PATCH] mmc: sdhci-cadence: set SDHCI_QUIRK2_PRESET_VALUE_BROKEN for @@ -24,6 +24,7 @@ Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20200312104257.21017-1-yamada.masahiro@socionext.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c index 44139fceac24..b6bcc8ab2b53 100644 diff --git a/queue/mmc-sdhci-pci-o2micro-Bug-fix-for-O2-host-controller.patch b/queue/mmc-sdhci-pci-o2micro-Bug-fix-for-O2-host-controller.patch index 8b62c517..97e48a11 100644 --- a/queue/mmc-sdhci-pci-o2micro-Bug-fix-for-O2-host-controller.patch +++ b/queue/mmc-sdhci-pci-o2micro-Bug-fix-for-O2-host-controller.patch @@ -1,4 +1,4 @@ -From cdd2b769789ae1a030e1a26f6c37c5833cabcb34 Mon Sep 17 00:00:00 2001 +From 93a2e39fd2017ad605d1249e0359422a0ac1cbbd Mon Sep 17 00:00:00 2001 From: shirley her <shirley.her@bayhubtech.com> Date: Mon, 20 Jul 2020 18:17:33 -0700 Subject: [PATCH] mmc: sdhci-pci-o2micro: Bug fix for O2 host controller @@ -14,12 +14,13 @@ Signed-off-by: Shirley Her <shirley.her@bayhubtech.com> Link: https://lore.kernel.org/r/20200721011733.8416-1-shirley.her@bayhubtech.com [Ulf: Updated the commit message] Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c -index e2a846885902..ed3c605fcf0c 100644 +index 19944b0049db..7b3c9e6dab65 100644 --- a/drivers/mmc/host/sdhci-pci-o2micro.c +++ b/drivers/mmc/host/sdhci-pci-o2micro.c -@@ -561,6 +561,12 @@ static int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot) +@@ -441,6 +441,12 @@ int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot) slot->host->mmc_host_ops.get_cd = sdhci_o2_get_cd; } diff --git a/queue/mtd-rawnand-qcom-avoid-write-to-unavailable-register.patch b/queue/mtd-rawnand-qcom-avoid-write-to-unavailable-register.patch index 56d49707..50e28da4 100644 --- a/queue/mtd-rawnand-qcom-avoid-write-to-unavailable-register.patch +++ b/queue/mtd-rawnand-qcom-avoid-write-to-unavailable-register.patch @@ -1,4 +1,4 @@ -From 443440cc4a901af462239d286cd10721aa1c7dfc Mon Sep 17 00:00:00 2001 +From 478be127899a46063f1018e2f11f51e59df3f1b7 Mon Sep 17 00:00:00 2001 From: Sivaprakash Murugesan <sivaprak@codeaurora.org> Date: Fri, 12 Jun 2020 13:28:15 +0530 Subject: [PATCH] mtd: rawnand: qcom: avoid write to unavailable register @@ -17,9 +17,10 @@ Cc: stable@vger.kernel.org Signed-off-by: Sivaprakash Murugesan <sivaprak@codeaurora.org> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/1591948696-16015-2-git-send-email-sivaprak@codeaurora.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c -index f1daf330951b..78b5f211598c 100644 +index 7bb9a7e8e1e7..c1c53b02b35f 100644 --- a/drivers/mtd/nand/raw/qcom_nandc.c +++ b/drivers/mtd/nand/raw/qcom_nandc.c @@ -459,11 +459,13 @@ struct qcom_nand_host { @@ -36,7 +37,7 @@ index f1daf330951b..78b5f211598c 100644 u32 dev_cmd_reg_start; }; -@@ -2774,7 +2776,8 @@ static int qcom_nandc_setup(struct qcom_nand_controller *nandc) +@@ -2751,7 +2753,8 @@ static int qcom_nandc_setup(struct qcom_nand_controller *nandc) u32 nand_ctrl; /* kill onenand */ @@ -46,7 +47,7 @@ index f1daf330951b..78b5f211598c 100644 nandc_write(nandc, dev_cmd_reg_addr(nandc, NAND_DEV_CMD_VLD), NAND_DEV_CMD_VLD_VAL); -@@ -3035,12 +3038,14 @@ static const struct qcom_nandc_props ipq806x_nandc_props = { +@@ -3007,12 +3010,14 @@ static const struct qcom_nandc_props ipq806x_nandc_props = { static const struct qcom_nandc_props ipq4019_nandc_props = { .ecc_modes = (ECC_BCH_4BIT | ECC_BCH_8BIT), .is_bam = true, diff --git a/queue/mwifiex-Fix-firmware-filename-for-sd8977-chipset.patch b/queue/mwifiex-Fix-firmware-filename-for-sd8977-chipset.patch index 7f64c004..ea4562bc 100644 --- a/queue/mwifiex-Fix-firmware-filename-for-sd8977-chipset.patch +++ b/queue/mwifiex-Fix-firmware-filename-for-sd8977-chipset.patch @@ -1,4 +1,4 @@ -From 47fd3ee25e13cc5add48ba2ed71f7ee964b9c3a4 Mon Sep 17 00:00:00 2001 +From 19c7a5c0332ebf93019c8f4e8400ead7cbf6ee70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org> Date: Wed, 3 Jun 2020 10:22:26 +0200 Subject: [PATCH] mwifiex: Fix firmware filename for sd8977 chipset @@ -17,9 +17,10 @@ Fixes: 1a0f547831dce ("mwifiex: add support for sd8977 chipset") Signed-off-by: Pali Rohár <pali@kernel.org> Acked-by: Ganapathi Bhat <ganapathi.bhat@nxp.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h -index 71cd8629b28e..0cac2296ed53 100644 +index f672bdf52cc1..9364e2c267f7 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.h +++ b/drivers/net/wireless/marvell/mwifiex/sdio.h @@ -36,7 +36,7 @@ diff --git a/queue/mwifiex-Fix-firmware-filename-for-sd8997-chipset.patch b/queue/mwifiex-Fix-firmware-filename-for-sd8997-chipset.patch index b12041f4..ca77f9e5 100644 --- a/queue/mwifiex-Fix-firmware-filename-for-sd8997-chipset.patch +++ b/queue/mwifiex-Fix-firmware-filename-for-sd8997-chipset.patch @@ -1,4 +1,4 @@ -From 2e1fcac52a9ea53e5a13a585d48a29a0fb4a9daf Mon Sep 17 00:00:00 2001 +From abbc4281c847d57888e2048bb17d1c53b679ef31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org> Date: Wed, 3 Jun 2020 10:22:27 +0200 Subject: [PATCH] mwifiex: Fix firmware filename for sd8997 chipset @@ -17,9 +17,10 @@ Fixes: 6d85ef00d9dfe ("mwifiex: add support for 8997 chipset") Signed-off-by: Pali Rohár <pali@kernel.org> Acked-by: Ganapathi Bhat <ganapathi.bhat@nxp.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h -index 0cac2296ed53..8b476b007c5e 100644 +index 9364e2c267f7..2d9ec225aead 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.h +++ b/drivers/net/wireless/marvell/mwifiex/sdio.h @@ -38,7 +38,7 @@ diff --git a/queue/mwifiex-Prevent-memory-corruption-handling-keys.patch b/queue/mwifiex-Prevent-memory-corruption-handling-keys.patch index 2b1ca139..7b5ce755 100644 --- a/queue/mwifiex-Prevent-memory-corruption-handling-keys.patch +++ b/queue/mwifiex-Prevent-memory-corruption-handling-keys.patch @@ -1,4 +1,4 @@ -From e18696786548244914f36ec3c46ac99c53df99c3 Mon Sep 17 00:00:00 2001 +From bd0a0aec6dcafa309abd2aa55597b0ea669c1b80 Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter@oracle.com> Date: Wed, 8 Jul 2020 14:58:57 +0300 Subject: [PATCH] mwifiex: Prevent memory corruption handling keys @@ -13,12 +13,13 @@ Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Ganapathi Bhat <ganapathi.bhat@nxp.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20200708115857.GA13729@mwanda +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c -index f21660149f58..962d8bfe6f10 100644 +index 24b33e20e7a9..ec34a429a97f 100644 --- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c +++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c -@@ -580,6 +580,11 @@ static int mwifiex_ret_802_11_key_material_v1(struct mwifiex_private *priv, +@@ -581,6 +581,11 @@ static int mwifiex_ret_802_11_key_material_v1(struct mwifiex_private *priv, { struct host_cmd_ds_802_11_key_material *key = &resp->params.key_material; @@ -30,7 +31,7 @@ index f21660149f58..962d8bfe6f10 100644 if (le16_to_cpu(key->action) == HostCmd_ACT_GEN_SET) { if ((le16_to_cpu(key->key_param_set.key_info) & KEY_MCAST)) { -@@ -593,9 +598,8 @@ static int mwifiex_ret_802_11_key_material_v1(struct mwifiex_private *priv, +@@ -594,9 +599,8 @@ static int mwifiex_ret_802_11_key_material_v1(struct mwifiex_private *priv, memset(priv->aes_key.key_param_set.key, 0, sizeof(key->key_param_set.key)); @@ -42,7 +43,7 @@ index f21660149f58..962d8bfe6f10 100644 return 0; } -@@ -610,9 +614,14 @@ static int mwifiex_ret_802_11_key_material_v2(struct mwifiex_private *priv, +@@ -611,9 +615,14 @@ static int mwifiex_ret_802_11_key_material_v2(struct mwifiex_private *priv, struct host_cmd_ds_command *resp) { struct host_cmd_ds_802_11_key_material_v2 *key_v2; @@ -58,7 +59,7 @@ index f21660149f58..962d8bfe6f10 100644 if (le16_to_cpu(key_v2->action) == HostCmd_ACT_GEN_SET) { if ((le16_to_cpu(key_v2->key_param_set.key_info) & KEY_MCAST)) { mwifiex_dbg(priv->adapter, INFO, "info: key: GTK is set\n"); -@@ -628,10 +637,9 @@ static int mwifiex_ret_802_11_key_material_v2(struct mwifiex_private *priv, +@@ -629,10 +638,9 @@ static int mwifiex_ret_802_11_key_material_v2(struct mwifiex_private *priv, memset(priv->aes_key_v2.key_param_set.key_params.aes.key, 0, WLAN_KEY_LEN_CCMP); priv->aes_key_v2.key_param_set.key_params.aes.key_len = diff --git a/queue/net-Set-fput_needed-iff-FDPUT_FPUT-is-set.patch b/queue/net-Set-fput_needed-iff-FDPUT_FPUT-is-set.patch index 47f1052f..9fedecf6 100644 --- a/queue/net-Set-fput_needed-iff-FDPUT_FPUT-is-set.patch +++ b/queue/net-Set-fput_needed-iff-FDPUT_FPUT-is-set.patch @@ -1,4 +1,4 @@ -From ce787a5a074a86f76f5d3fd804fa78e01bfb9e89 Mon Sep 17 00:00:00 2001 +From 4089998ea32403b52bce04dcba36807bb1710794 Mon Sep 17 00:00:00 2001 From: Miaohe Lin <linmiaohe@huawei.com> Date: Thu, 6 Aug 2020 19:53:16 +0800 Subject: [PATCH] net: Set fput_needed iff FDPUT_FPUT is set @@ -11,12 +11,13 @@ accordingly. Fixes: 00e188ef6a7e ("sockfd_lookup_light(): switch to fdget^W^Waway from fget_light") Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/socket.c b/net/socket.c -index 3c3d6abe4c1e..e08415b4f939 100644 +index fd8679682dfb..81ee3118dfa1 100644 --- a/net/socket.c +++ b/net/socket.c -@@ -500,7 +500,7 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed) +@@ -496,7 +496,7 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed) if (f.file) { sock = sock_from_file(f.file, err); if (likely(sock)) { diff --git a/queue/net-dsa-mv88e6xxx-MV88E6097-does-not-support-jumbo-c.patch b/queue/net-dsa-mv88e6xxx-MV88E6097-does-not-support-jumbo-c.patch index c2069350..3d638a81 100644 --- a/queue/net-dsa-mv88e6xxx-MV88E6097-does-not-support-jumbo-c.patch +++ b/queue/net-dsa-mv88e6xxx-MV88E6097-does-not-support-jumbo-c.patch @@ -1,4 +1,4 @@ -From 0f3c66a3c7b4e8b9f654b3c998e9674376a51b0f Mon Sep 17 00:00:00 2001 +From 36ae7255e807e58ac7754205116cd0b5d1ec17cc Mon Sep 17 00:00:00 2001 From: Chris Packham <chris.packham@alliedtelesis.co.nz> Date: Fri, 24 Jul 2020 11:21:20 +1200 Subject: [PATCH] net: dsa: mv88e6xxx: MV88E6097 does not support jumbo @@ -15,12 +15,13 @@ Fixes: 5f4366660d65 ("net: dsa: mv88e6xxx: Refactor setting of jumbo frames") Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> 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/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 6f019955ae42..4ddb6f3035c9 100644 +index 2e8b1ab2c6f7..d8b2d1310029 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -3494,7 +3494,6 @@ static const struct mv88e6xxx_ops mv88e6097_ops = { +@@ -2844,7 +2844,6 @@ static const struct mv88e6xxx_ops mv88e6097_ops = { .port_set_frame_mode = mv88e6351_port_set_frame_mode, .port_set_egress_floods = mv88e6352_port_set_egress_floods, .port_set_ether_type = mv88e6351_port_set_ether_type, diff --git a/queue/net-dsa-rtl8366-Fix-VLAN-semantics.patch b/queue/net-dsa-rtl8366-Fix-VLAN-semantics.patch index 1557b645..fcf90b7b 100644 --- a/queue/net-dsa-rtl8366-Fix-VLAN-semantics.patch +++ b/queue/net-dsa-rtl8366-Fix-VLAN-semantics.patch @@ -1,4 +1,4 @@ -From 15ab7906cc9290afb006df1bb1074907fbcc7061 Mon Sep 17 00:00:00 2001 +From 6fbe94e0f9232af07e0d605b47368cef3b023be1 Mon Sep 17 00:00:00 2001 From: Linus Walleij <linus.walleij@linaro.org> Date: Mon, 27 Jul 2020 01:34:39 +0200 Subject: [PATCH] net: dsa: rtl8366: Fix VLAN semantics @@ -27,9 +27,10 @@ Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Fixes: d8652956cf37 ("net: dsa: realtek-smi: Add Realtek SMI driver") Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366.c -index 993cf3ac59d9..2997abeecc4a 100644 +index ac88caca5ad4..a75dcd6698b8 100644 --- a/drivers/net/dsa/rtl8366.c +++ b/drivers/net/dsa/rtl8366.c @@ -43,18 +43,26 @@ int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member, diff --git a/queue/net-dsa-rtl8366-Fix-VLAN-set-up.patch b/queue/net-dsa-rtl8366-Fix-VLAN-set-up.patch index e9e5043f..6328ee32 100644 --- a/queue/net-dsa-rtl8366-Fix-VLAN-set-up.patch +++ b/queue/net-dsa-rtl8366-Fix-VLAN-set-up.patch @@ -1,4 +1,4 @@ -From 788abc6d9d278ed6fa1fa94db2098481a04152b7 Mon Sep 17 00:00:00 2001 +From ed104c4b6b8aba1a8a999a3e6bfa4803b95a94ae Mon Sep 17 00:00:00 2001 From: Linus Walleij <linus.walleij@linaro.org> Date: Mon, 27 Jul 2020 01:34:40 +0200 Subject: [PATCH] net: dsa: rtl8366: Fix VLAN set-up @@ -22,9 +22,10 @@ Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Fixes: d8652956cf37 ("net: dsa: realtek-smi: Add Realtek SMI driver") Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366.c -index 2997abeecc4a..8f40fbf70a82 100644 +index a75dcd6698b8..1368816abaed 100644 --- a/drivers/net/dsa/rtl8366.c +++ b/drivers/net/dsa/rtl8366.c @@ -397,7 +397,7 @@ void rtl8366_vlan_add(struct dsa_switch *ds, int port, diff --git a/queue/net-ethernet-aquantia-Fix-wrong-return-value.patch b/queue/net-ethernet-aquantia-Fix-wrong-return-value.patch index 29684ffd..04d75757 100644 --- a/queue/net-ethernet-aquantia-Fix-wrong-return-value.patch +++ b/queue/net-ethernet-aquantia-Fix-wrong-return-value.patch @@ -1,4 +1,4 @@ -From 8b3304077694ac9f81839d7b611c92aba13643d9 Mon Sep 17 00:00:00 2001 +From ff22bc49b804e64cf45b0ee5d0937d2ec29697ee Mon Sep 17 00:00:00 2001 From: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> Date: Sun, 2 Aug 2020 19:15:37 +0800 Subject: [PATCH] net: ethernet: aquantia: Fix wrong return value @@ -12,6 +12,7 @@ Fixes: bab6de8fd180b ("net: ethernet: aquantia: Atlantic A0 and B0 specific func Cc: David VomLehn <vomlehn@texas.net> Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.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/aquantia/atlantic/hw_atl/hw_atl_a0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c index 0f140a9fe404..9cf8add34e6c 100644 diff --git a/queue/net-initialize-fastreuse-on-inet_inherit_port.patch b/queue/net-initialize-fastreuse-on-inet_inherit_port.patch index 98ade422..ff497ad4 100644 --- a/queue/net-initialize-fastreuse-on-inet_inherit_port.patch +++ b/queue/net-initialize-fastreuse-on-inet_inherit_port.patch @@ -1,4 +1,4 @@ -From d76f3351cea2d927fdf70dd7c06898235035e84e Mon Sep 17 00:00:00 2001 +From 9a4b3867ee8348a7cb32ca3168be678a243a1dbd Mon Sep 17 00:00:00 2001 From: Tim Froidcoeur <tim.froidcoeur@tessares.net> Date: Tue, 11 Aug 2020 20:33:24 +0200 Subject: [PATCH] net: initialize fastreuse on inet_inherit_port @@ -41,9 +41,10 @@ Fixes: 093d282321da ("tproxy: fix hash locking issue when using port redirection Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net> Signed-off-by: Tim Froidcoeur <tim.froidcoeur@tessares.net> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c -index 4eb4cd8d20dd..239e54474b65 100644 +index 9a02663f1ef6..7a4e50f060ae 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -163,6 +163,7 @@ int __inet_inherit_port(const struct sock *sk, struct sock *child) diff --git a/queue/net-mlx5-Delete-extra-dump-stack-that-gives-nothing.patch b/queue/net-mlx5-Delete-extra-dump-stack-that-gives-nothing.patch index ff5939a8..ad55f135 100644 --- a/queue/net-mlx5-Delete-extra-dump-stack-that-gives-nothing.patch +++ b/queue/net-mlx5-Delete-extra-dump-stack-that-gives-nothing.patch @@ -1,4 +1,4 @@ -From 6c4e9bcfb48933d533ff975e152757991556294a Mon Sep 17 00:00:00 2001 +From c96d71f13d5d3f56c9f89e53c6debfe7413f4ee2 Mon Sep 17 00:00:00 2001 From: Leon Romanovsky <leonro@mellanox.com> Date: Sun, 19 Jul 2020 11:04:30 +0300 Subject: [PATCH] net/mlx5: Delete extra dump stack that gives nothing @@ -79,12 +79,13 @@ Fixes: f90edfd279f3 ("net/mlx5_core: Connect flow tables") Reviewed-by: Maor Gottlieb <maorg@mellanox.com> Reviewed-by: Mark Bloch <markb@mellanox.com> Signed-off-by: Leon Romanovsky <leonro@mellanox.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c -index a10814814856..7e70a8178a46 100644 +index 7ec97307c214..53f43c576d56 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c -@@ -846,18 +846,15 @@ static int connect_fts_in_prio(struct mlx5_core_dev *dev, +@@ -778,18 +778,15 @@ static int connect_fts_in_prio(struct mlx5_core_dev *dev, { struct mlx5_flow_root_namespace *root = find_root(&prio->node); struct mlx5_flow_table *iter; diff --git a/queue/net-nfc-rawsock.c-add-CAP_NET_RAW-check.patch b/queue/net-nfc-rawsock.c-add-CAP_NET_RAW-check.patch index d1d2a5c8..d17f76ab 100644 --- a/queue/net-nfc-rawsock.c-add-CAP_NET_RAW-check.patch +++ b/queue/net-nfc-rawsock.c-add-CAP_NET_RAW-check.patch @@ -1,4 +1,4 @@ -From 26896f01467a28651f7a536143fe5ac8449d4041 Mon Sep 17 00:00:00 2001 +From 3532101fa63e21cc08fdd2788b4c20e1cbb60d6c Mon Sep 17 00:00:00 2001 From: Qingyu Li <ieatmuttonchuan@gmail.com> Date: Mon, 10 Aug 2020 09:51:00 +0800 Subject: [PATCH] net/nfc/rawsock.c: add CAP_NET_RAW check. @@ -9,12 +9,13 @@ When creating a raw AF_NFC socket, CAP_NET_RAW needs to be checked first. Signed-off-by: Qingyu Li <ieatmuttonchuan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/nfc/rawsock.c b/net/nfc/rawsock.c -index b2061b6746ea..955c195ae14b 100644 +index ba5ffd3badd3..b5c867fe3232 100644 --- a/net/nfc/rawsock.c +++ b/net/nfc/rawsock.c -@@ -328,10 +328,13 @@ static int rawsock_create(struct net *net, struct socket *sock, +@@ -332,10 +332,13 @@ static int rawsock_create(struct net *net, struct socket *sock, if ((sock->type != SOCK_SEQPACKET) && (sock->type != SOCK_RAW)) return -ESOCKTNOSUPPORT; diff --git a/queue/net-phy-fix-memory-leak-in-device-create-error-path.patch b/queue/net-phy-fix-memory-leak-in-device-create-error-path.patch index 4349a002..65d4ce1d 100644 --- a/queue/net-phy-fix-memory-leak-in-device-create-error-path.patch +++ b/queue/net-phy-fix-memory-leak-in-device-create-error-path.patch @@ -1,4 +1,4 @@ -From d02cbc46136105cf86f84ac355e16f04696f538d Mon Sep 17 00:00:00 2001 +From 62a51e61d623a6c0e6d0b2d6948da68c95a7427d Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Thu, 6 Aug 2020 17:37:53 +0200 Subject: [PATCH] net: phy: fix memory leak in device-create error path @@ -12,9 +12,10 @@ Fixes: 13d0ab6750b2 ("net: phy: check return code when requesting PHY driver mod Cc: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Johan Hovold <johan@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/phy/phy_device.c b/drivers/net/phy/phy_device.c -index 1b9523595839..57d44648c8dd 100644 +index 4882f43b83d0..2ea37519c56b 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -615,7 +615,9 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, u32 phy_id, diff --git a/queue/net-refactor-bind_bucket-fastreuse-into-helper.patch b/queue/net-refactor-bind_bucket-fastreuse-into-helper.patch index ded86cf5..04809049 100644 --- a/queue/net-refactor-bind_bucket-fastreuse-into-helper.patch +++ b/queue/net-refactor-bind_bucket-fastreuse-into-helper.patch @@ -1,4 +1,4 @@ -From fef0107b568cfc97dcef86cfa66b310324ec62cf Mon Sep 17 00:00:00 2001 +From 0c30d60a1d8beb477a383984c222957ac472c817 Mon Sep 17 00:00:00 2001 From: Tim Froidcoeur <tim.froidcoeur@tessares.net> Date: Tue, 11 Aug 2020 20:33:23 +0200 Subject: [PATCH] net: refactor bind_bucket fastreuse into helper @@ -11,6 +11,7 @@ helper function that can be called from other places. Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net> Signed-off-by: Tim Froidcoeur <tim.froidcoeur@tessares.net> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h index c57d53e7e02c..1ba40380b4df 100644 diff --git a/queue/net-spider_net-Fix-the-size-used-in-a-dma_free_coher.patch b/queue/net-spider_net-Fix-the-size-used-in-a-dma_free_coher.patch index 2dc756ab..7f735dca 100644 --- a/queue/net-spider_net-Fix-the-size-used-in-a-dma_free_coher.patch +++ b/queue/net-spider_net-Fix-the-size-used-in-a-dma_free_coher.patch @@ -1,4 +1,4 @@ -From 36f28f7687a9ce665479cce5d64ce7afaa9e77ae Mon Sep 17 00:00:00 2001 +From f3bf40121f4261b5e954012c79ba23612e87da05 Mon Sep 17 00:00:00 2001 From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Date: Sun, 2 Aug 2020 15:53:33 +0200 Subject: [PATCH] net: spider_net: Fix the size used in a 'dma_free_coherent()' @@ -13,9 +13,10 @@ used in the corresponding 'dma_alloc_coherent()', in Fixes: d4ed8f8d1fb7 ("Spidernet DMA coalescing") 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/ethernet/toshiba/spider_net.c b/drivers/net/ethernet/toshiba/spider_net.c -index 3902b3aeb0c2..94267e1f5d30 100644 +index 5b196ebfed49..d75892169737 100644 --- a/drivers/net/ethernet/toshiba/spider_net.c +++ b/drivers/net/ethernet/toshiba/spider_net.c @@ -283,8 +283,8 @@ spider_net_free_chain(struct spider_net_card *card, diff --git a/queue/net-thunderx-initialize-VF-s-mailbox-mutex-before-fi.patch b/queue/net-thunderx-initialize-VF-s-mailbox-mutex-before-fi.patch index f5e9863e..73a3448d 100644 --- a/queue/net-thunderx-initialize-VF-s-mailbox-mutex-before-fi.patch +++ b/queue/net-thunderx-initialize-VF-s-mailbox-mutex-before-fi.patch @@ -1,4 +1,4 @@ -From c1055b76ad00aed0e8b79417080f212d736246b6 Mon Sep 17 00:00:00 2001 +From 7392be4dffcf138bf9c9eff36b889e260b2a62c7 Mon Sep 17 00:00:00 2001 From: Dean Nelson <dnelson@redhat.com> Date: Wed, 5 Aug 2020 13:18:48 -0500 Subject: [PATCH] net: thunderx: initialize VF's mailbox mutex before first @@ -71,12 +71,13 @@ in nicvf_probe(). Fixes: 609ea65c65a0 ("net: thunderx: add mutex to protect mailbox from concurrent calls for same VF") Signed-off-by: Dean Nelson <dnelson@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c -index d22c9d350355..c1378b5c780c 100644 +index f414f5651dbd..5c45c0c6dd23 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c -@@ -2177,6 +2177,9 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) +@@ -2185,6 +2185,9 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) nic->max_queues *= 2; nic->ptp_clock = ptp_clock; @@ -86,7 +87,7 @@ index d22c9d350355..c1378b5c780c 100644 /* MAP VF's configuration registers */ nic->reg_base = pcim_iomap(pdev, PCI_CFG_REG_BAR_NUM, 0); if (!nic->reg_base) { -@@ -2253,7 +2256,6 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) +@@ -2261,7 +2264,6 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) INIT_WORK(&nic->rx_mode_work.work, nicvf_set_rx_mode_task); spin_lock_init(&nic->rx_mode_wq_lock); diff --git a/queue/net-tls-Fix-kmap-usage.patch b/queue/net-tls-Fix-kmap-usage.patch index 8dfb8772..aa4ee6bf 100644 --- a/queue/net-tls-Fix-kmap-usage.patch +++ b/queue/net-tls-Fix-kmap-usage.patch @@ -1,4 +1,4 @@ -From b06c19d9f827f6743122795570bfc0c72db482b0 Mon Sep 17 00:00:00 2001 +From 39cce9d414d3c0f5e068b22fd46aab2bb8a493b4 Mon Sep 17 00:00:00 2001 From: Ira Weiny <ira.weiny@intel.com> Date: Mon, 10 Aug 2020 17:02:58 -0700 Subject: [PATCH] net/tls: Fix kmap usage @@ -15,12 +15,13 @@ Fixes: e8f69799810c ("net/tls: Add generic NIC offload infrastructure") Signed-off-by: Ira Weiny <ira.weiny@intel.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/net/tls/tls_device.c b/net/tls/tls_device.c -index 18fa6067bb7f..b74e2741f74f 100644 +index 3b850a02ca00..3b0c363e7f83 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c -@@ -561,7 +561,7 @@ int tls_device_sendpage(struct sock *sk, struct page *page, +@@ -477,7 +477,7 @@ int tls_device_sendpage(struct sock *sk, struct page *page, { struct tls_context *tls_ctx = tls_get_ctx(sk); struct iov_iter msg_iter; @@ -29,7 +30,7 @@ index 18fa6067bb7f..b74e2741f74f 100644 struct kvec iov; int rc; -@@ -576,6 +576,7 @@ int tls_device_sendpage(struct sock *sk, struct page *page, +@@ -492,6 +492,7 @@ int tls_device_sendpage(struct sock *sk, struct page *page, goto out; } diff --git a/queue/nvme-multipath-do-not-fall-back-to-__nvme_find_path-.patch b/queue/nvme-multipath-do-not-fall-back-to-__nvme_find_path-.patch index 90e35abd..139a0304 100644 --- a/queue/nvme-multipath-do-not-fall-back-to-__nvme_find_path-.patch +++ b/queue/nvme-multipath-do-not-fall-back-to-__nvme_find_path-.patch @@ -1,4 +1,4 @@ -From fbd6a42d8932e172921c7de10468a2e12c34846b Mon Sep 17 00:00:00 2001 +From 7e00a655caccd82c8f414bf8a10577bb44b06899 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke <hare@suse.de> Date: Mon, 27 Jul 2020 18:08:03 +0200 Subject: [PATCH] nvme-multipath: do not fall back to __nvme_find_path() for @@ -15,12 +15,13 @@ Signed-off-by: Martin Wilck <mwilck@suse.com> Signed-off-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Christoph Hellwig <hch@lst.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index 93c70e1591de..3ded54d2c9c6 100644 +index 4f2327499e3f..be4117f35962 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c -@@ -281,10 +281,13 @@ inline struct nvme_ns *nvme_find_path(struct nvme_ns_head *head) +@@ -270,10 +270,13 @@ inline struct nvme_ns *nvme_find_path(struct nvme_ns_head *head) struct nvme_ns *ns; ns = srcu_dereference(head->current_path[node], &head->srcu); diff --git a/queue/nvme-multipath-factor-out-a-nvme_path_is_disabled-he.patch b/queue/nvme-multipath-factor-out-a-nvme_path_is_disabled-he.patch index 81748bcb..f6b39002 100644 --- a/queue/nvme-multipath-factor-out-a-nvme_path_is_disabled-he.patch +++ b/queue/nvme-multipath-factor-out-a-nvme_path_is_disabled-he.patch @@ -1,4 +1,4 @@ -From 06f964f9e31e06c0c606181c611868825553a901 Mon Sep 17 00:00:00 2001 +From 7135296e2172e3427b9ab38e617b8ad60b167db6 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke <hare@suse.de> Date: Thu, 4 Jul 2019 08:10:46 +0200 Subject: [PATCH] nvme-multipath: factor out a nvme_path_is_disabled helper @@ -11,6 +11,7 @@ by something other than the per-namespace ANA state. Signed-off-by: Hannes Reinecke <hare@suse.com> [hch: split from a bigger patch] Signed-off-by: Christoph Hellwig <hch@lst.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index 0a93a480c4f2..b160fc5448e2 100644 diff --git a/queue/nvme-multipath-fix-logic-for-non-optimized-paths.patch b/queue/nvme-multipath-fix-logic-for-non-optimized-paths.patch index e364664b..d886871c 100644 --- a/queue/nvme-multipath-fix-logic-for-non-optimized-paths.patch +++ b/queue/nvme-multipath-fix-logic-for-non-optimized-paths.patch @@ -1,4 +1,4 @@ -From 3f6e3246db0e6f92e784965d9d0edb8abe6c6b74 Mon Sep 17 00:00:00 2001 +From 928255f84c2a0e3e77e2e7c6ca470dc1b8b4785d Mon Sep 17 00:00:00 2001 From: Martin Wilck <mwilck@suse.com> Date: Mon, 27 Jul 2020 18:08:02 +0200 Subject: [PATCH] nvme-multipath: fix logic for non-optimized paths @@ -13,12 +13,13 @@ Signed off-by: Martin Wilck <mwilck@suse.com> Signed-off-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Christoph Hellwig <hch@lst.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index 900b35d47ec7..93c70e1591de 100644 +index b160fc5448e2..4f2327499e3f 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c -@@ -255,6 +255,12 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, +@@ -244,6 +244,12 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, fallback = ns; } diff --git a/queue/nvme-multipath-round-robin-fix-single-non-optimized-.patch b/queue/nvme-multipath-round-robin-fix-single-non-optimized-.patch index 514a431a..0b4513f3 100644 --- a/queue/nvme-multipath-round-robin-fix-single-non-optimized-.patch +++ b/queue/nvme-multipath-round-robin-fix-single-non-optimized-.patch @@ -1,4 +1,4 @@ -From 93eb0381e13d249a18ed4aae203291ff977e7ffb Mon Sep 17 00:00:00 2001 +From 695199a24fa9e10e735b4f474ad590e126a5e23f Mon Sep 17 00:00:00 2001 From: Martin Wilck <mwilck@suse.com> Date: Thu, 6 Aug 2020 15:19:31 +0200 Subject: [PATCH] nvme: multipath: round-robin: fix single non-optimized path @@ -17,12 +17,13 @@ Signed-off-by: Martin George <marting@netapp.com> Reviewed-by: Keith Busch <kbusch@kernel.org> Signed-off-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index 3ded54d2c9c6..a64dfff0d0ce 100644 +index be4117f35962..ec3c0f2ba405 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c -@@ -255,12 +255,17 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, +@@ -244,12 +244,17 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, fallback = ns; } diff --git a/queue/parisc-Do-not-use-an-ordered-store-in-pa_tlb_lock.patch b/queue/parisc-Do-not-use-an-ordered-store-in-pa_tlb_lock.patch index 482f7146..d99d2cce 100644 --- a/queue/parisc-Do-not-use-an-ordered-store-in-pa_tlb_lock.patch +++ b/queue/parisc-Do-not-use-an-ordered-store-in-pa_tlb_lock.patch @@ -1,4 +1,4 @@ -From e72b23dec1da5e62a0090c5da1d926778284e230 Mon Sep 17 00:00:00 2001 +From e4245174b8c2caeff695633c065a95e8d2d6282c Mon Sep 17 00:00:00 2001 From: John David Anglin <dave.anglin@bell.net> Date: Tue, 28 Jul 2020 19:13:20 +0200 Subject: [PATCH] parisc: Do not use an ordered store in pa_tlb_lock() @@ -12,9 +12,10 @@ tlb_unlock0(). Signed-off-by: John David Anglin <dave.anglin@bell.net> Signed-off-by: Helge Deller <deller@gmx.de> Cc: <stable@vger.kernel.org> # v5.0+ +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S -index 06455f1a40f5..519f9056fd00 100644 +index 562dbf4252a7..d4acd0fce6f9 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S @@ -455,7 +455,7 @@ diff --git a/queue/parisc-Implement-__smp_store_release-and-__smp_load_.patch b/queue/parisc-Implement-__smp_store_release-and-__smp_load_.patch index e7c30092..99e4e849 100644 --- a/queue/parisc-Implement-__smp_store_release-and-__smp_load_.patch +++ b/queue/parisc-Implement-__smp_store_release-and-__smp_load_.patch @@ -1,4 +1,4 @@ -From e96ebd589debd9a6a793608c4ec7019c38785dea Mon Sep 17 00:00:00 2001 +From 0c7741c74e34a983cb42058bcdef90d49a2c30ef Mon Sep 17 00:00:00 2001 From: John David Anglin <dave.anglin@bell.net> Date: Thu, 30 Jul 2020 08:59:12 -0400 Subject: [PATCH] parisc: Implement __smp_store_release and __smp_load_acquire @@ -13,6 +13,7 @@ the generic implementation. Cc: <stable@vger.kernel.org> # 4.14+ Signed-off-by: Dave Anglin <dave.anglin@bell.net> Signed-off-by: Helge Deller <deller@gmx.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/parisc/include/asm/barrier.h b/arch/parisc/include/asm/barrier.h index dbaaca84f27f..640d46edf32e 100644 diff --git a/queue/parisc-mask-out-enable-and-reserved-bits-from-sba-im.patch b/queue/parisc-mask-out-enable-and-reserved-bits-from-sba-im.patch index bcbfce6b..1a5ac22b 100644 --- a/queue/parisc-mask-out-enable-and-reserved-bits-from-sba-im.patch +++ b/queue/parisc-mask-out-enable-and-reserved-bits-from-sba-im.patch @@ -1,4 +1,4 @@ -From 5b24993c21cbf2de11aff077a48c5cb0505a0450 Mon Sep 17 00:00:00 2001 +From 8f54b062fac1ae1949c53de1456d7b18b768fade Mon Sep 17 00:00:00 2001 From: Sven Schnelle <svens@stackframe.org> Date: Tue, 11 Aug 2020 18:19:19 +0200 Subject: [PATCH] parisc: mask out enable and reserved bits from sba imask @@ -12,12 +12,13 @@ IBASE register later, and it also makes some mask calculations fail. Cc: <stable@vger.kernel.org> Signed-off-by: Sven Schnelle <svens@stackframe.org> Signed-off-by: Helge Deller <deller@gmx.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c -index 7e112829d250..00785fa81ff7 100644 +index 296668caf7e5..c18541db7c20 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c -@@ -1270,7 +1270,7 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num) +@@ -1277,7 +1277,7 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num) ** (one that doesn't overlap memory or LMMIO space) in the ** IBASE and IMASK registers. */ diff --git a/queue/phy-armada-38x-fix-NETA-lockup-when-repeatedly-switc.patch b/queue/phy-armada-38x-fix-NETA-lockup-when-repeatedly-switc.patch index 0e65a44f..1bc3b4df 100644 --- a/queue/phy-armada-38x-fix-NETA-lockup-when-repeatedly-switc.patch +++ b/queue/phy-armada-38x-fix-NETA-lockup-when-repeatedly-switc.patch @@ -1,4 +1,4 @@ -From 1dea06cd643da38931382ebdc151efced201ffad Mon Sep 17 00:00:00 2001 +From 4056d114e26337724c2003cc3e3e4ae2ddf6f29d Mon Sep 17 00:00:00 2001 From: Russell King <rmk+kernel@armlinux.org.uk> Date: Tue, 21 Jul 2020 15:40:43 +0100 Subject: [PATCH] phy: armada-38x: fix NETA lockup when repeatedly switching @@ -38,9 +38,10 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Link: https://lore.kernel.org/r/E1jxtRj-0003Tz-CG@rmk-PC.armlinux.org.uk Signed-off-by: Vinod Koul <vkoul@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/phy/marvell/phy-armada38x-comphy.c b/drivers/phy/marvell/phy-armada38x-comphy.c -index 6960dfd8ad8c..0fe408964334 100644 +index 3e00bc679d4e..10169b2a5968 100644 --- a/drivers/phy/marvell/phy-armada38x-comphy.c +++ b/drivers/phy/marvell/phy-armada38x-comphy.c @@ -41,6 +41,7 @@ struct a38x_comphy_lane { diff --git a/queue/phy-exynos5-usbdrd-Calibrating-makes-sense-only-for-.patch b/queue/phy-exynos5-usbdrd-Calibrating-makes-sense-only-for-.patch index bd6e9469..cc0fc708 100644 --- a/queue/phy-exynos5-usbdrd-Calibrating-makes-sense-only-for-.patch +++ b/queue/phy-exynos5-usbdrd-Calibrating-makes-sense-only-for-.patch @@ -1,4 +1,4 @@ -From dcbabfeb17c3c2fdb6bc92a3031ecd37df1834a8 Mon Sep 17 00:00:00 2001 +From fb49988f239e011090b54f720c2dfd709a767b3e Mon Sep 17 00:00:00 2001 From: Marek Szyprowski <m.szyprowski@samsung.com> Date: Wed, 8 Jul 2020 15:38:00 +0200 Subject: [PATCH] phy: exynos5-usbdrd: Calibrating makes sense only for USB2.0 @@ -14,9 +14,10 @@ Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Acked-by: Krzysztof Kozlowski <krzk@kernel.org> Link: https://lore.kernel.org/r/20200708133800.3336-1-m.szyprowski@samsung.com Signed-off-by: Vinod Koul <vkoul@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/phy/samsung/phy-exynos5-usbdrd.c b/drivers/phy/samsung/phy-exynos5-usbdrd.c -index eb06ce9f748f..9930d2027e94 100644 +index 646259bee909..f07edd80d2f3 100644 --- a/drivers/phy/samsung/phy-exynos5-usbdrd.c +++ b/drivers/phy/samsung/phy-exynos5-usbdrd.c @@ -714,7 +714,9 @@ static int exynos5_usbdrd_phy_calibrate(struct phy *phy) diff --git a/queue/phy-renesas-rcar-gen3-usb2-move-irq-registration-to-.patch b/queue/phy-renesas-rcar-gen3-usb2-move-irq-registration-to-.patch index f935f0dc..00e8db60 100644 --- a/queue/phy-renesas-rcar-gen3-usb2-move-irq-registration-to-.patch +++ b/queue/phy-renesas-rcar-gen3-usb2-move-irq-registration-to-.patch @@ -1,4 +1,4 @@ -From 08b0ad375ca66181faee725b1b358bcae8d592ee Mon Sep 17 00:00:00 2001 +From b7863709a25d4ec14a2a22dc138c25b2cf349bd9 Mon Sep 17 00:00:00 2001 From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Date: Fri, 17 Jul 2020 20:44:56 +0900 Subject: [PATCH] phy: renesas: rcar-gen3-usb2: move irq registration to init @@ -34,6 +34,7 @@ Fixes: 9f391c574efc ("phy: rcar-gen3-usb2: add runtime ID/VBUS pin detection") Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Link: https://lore.kernel.org/r/1594986297-12434-2-git-send-email-yoshihiro.shimoda.uh@renesas.com Signed-off-by: Vinod Koul <vkoul@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c index bfb22f868857..5087b7c44d55 100644 diff --git a/queue/pinctrl-single-fix-pcs_parse_pinconf-return-value.patch b/queue/pinctrl-single-fix-pcs_parse_pinconf-return-value.patch index 0e8f0c8d..effbacaf 100644 --- a/queue/pinctrl-single-fix-pcs_parse_pinconf-return-value.patch +++ b/queue/pinctrl-single-fix-pcs_parse_pinconf-return-value.patch @@ -1,4 +1,4 @@ -From f46fe79ff1b65692a65266a5bec6dbe2bf7fc70f Mon Sep 17 00:00:00 2001 +From bb9ad9a1271be885400e9746254602aaa405730c Mon Sep 17 00:00:00 2001 From: Drew Fustini <drew@beagleboard.org> Date: Mon, 8 Jun 2020 14:51:43 +0200 Subject: [PATCH] pinctrl-single: fix pcs_parse_pinconf() return value @@ -94,6 +94,7 @@ Signed-off-by: Drew Fustini <drew@beagleboard.org> Acked-by: Tony Lindgren <tony@atomide.com> Link: https://lore.kernel.org/r/20200608125143.GA2789203@x1 Signed-off-by: Linus Walleij <linus.walleij@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index 1e0614daee9b..a9d511982780 100644 diff --git a/queue/platform-x86-asus-nb-wmi-add-support-for-ASUS-ROG-Ze.patch b/queue/platform-x86-asus-nb-wmi-add-support-for-ASUS-ROG-Ze.patch index 7f9f09d9..d511264a 100644 --- a/queue/platform-x86-asus-nb-wmi-add-support-for-ASUS-ROG-Ze.patch +++ b/queue/platform-x86-asus-nb-wmi-add-support-for-ASUS-ROG-Ze.patch @@ -1,4 +1,4 @@ -From 13bceda68fb9ef388ad40d355ab8d03ee64d14c2 Mon Sep 17 00:00:00 2001 +From 7d8ed2ec4c7679ae5c68c22c727a1fdb622c0d21 Mon Sep 17 00:00:00 2001 From: Armas Spann <zappel@retarded.farm> Date: Sat, 11 Jul 2020 11:43:21 +0200 Subject: [PATCH] platform/x86: asus-nb-wmi: add support for ASUS ROG Zephyrus @@ -15,9 +15,10 @@ the corresponding devices. Signed-off-by: Armas Spann <zappel@retarded.farm> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c -index 8c4d00482ef0..6c42f73c1dfd 100644 +index 76f77b06b63f..fec5a1e544e4 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c @@ -110,6 +110,16 @@ static struct quirk_entry quirk_asus_forceals = { @@ -37,7 +38,7 @@ index 8c4d00482ef0..6c42f73c1dfd 100644 static int dmi_matched(const struct dmi_system_id *dmi) { pr_info("Identified laptop model '%s'\n", dmi->ident); -@@ -411,6 +421,78 @@ static const struct dmi_system_id asus_quirks[] = { +@@ -402,6 +412,78 @@ static const struct dmi_system_id asus_quirks[] = { }, .driver_data = &quirk_asus_forceals, }, diff --git a/queue/platform-x86-intel-hid-Fix-return-value-check-in-che.patch b/queue/platform-x86-intel-hid-Fix-return-value-check-in-che.patch index a94fa1fa..989253a4 100644 --- a/queue/platform-x86-intel-hid-Fix-return-value-check-in-che.patch +++ b/queue/platform-x86-intel-hid-Fix-return-value-check-in-che.patch @@ -1,4 +1,4 @@ -From 71fbe886ce6dd0be17f20aded9c63fe58edd2806 Mon Sep 17 00:00:00 2001 +From 8fec943d435180d5e67b901eafab2e25f984e9b7 Mon Sep 17 00:00:00 2001 From: Lu Wei <luwei32@huawei.com> Date: Fri, 10 Jul 2020 17:30:17 +0800 Subject: [PATCH] platform/x86: intel-hid: Fix return value check in @@ -14,12 +14,13 @@ Fixes: ecc83e52b28c ("intel-hid: new hid event driver for hotkeys") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Lu Wei <luwei32@huawei.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c -index 9ee79b74311c..86261970bd8f 100644 +index 844e562eb4f7..820268cd0c8d 100644 --- a/drivers/platform/x86/intel-hid.c +++ b/drivers/platform/x86/intel-hid.c -@@ -571,7 +571,7 @@ check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv) +@@ -554,7 +554,7 @@ check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv) return AE_OK; if (acpi_match_device_ids(dev, ids) == 0) diff --git a/queue/platform-x86-intel-vbtn-Fix-return-value-check-in-ch.patch b/queue/platform-x86-intel-vbtn-Fix-return-value-check-in-ch.patch index 2b5be556..e968cbd1 100644 --- a/queue/platform-x86-intel-vbtn-Fix-return-value-check-in-ch.patch +++ b/queue/platform-x86-intel-vbtn-Fix-return-value-check-in-ch.patch @@ -1,4 +1,4 @@ -From 64dd4a5a7d214a07e3d9f40227ec30ac8ba8796e Mon Sep 17 00:00:00 2001 +From c047bfeb7339a8db4621029e6f59f69ca8328c08 Mon Sep 17 00:00:00 2001 From: Lu Wei <luwei32@huawei.com> Date: Fri, 10 Jul 2020 17:30:18 +0800 Subject: [PATCH] platform/x86: intel-vbtn: Fix return value check in @@ -14,12 +14,13 @@ Fixes: 332e081225fc ("intel-vbtn: new driver for Intel Virtual Button") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Lu Wei <luwei32@huawei.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c -index 0487b606a274..e85d8e58320c 100644 +index d122f33d43ac..c7c8b432c163 100644 --- a/drivers/platform/x86/intel-vbtn.c +++ b/drivers/platform/x86/intel-vbtn.c -@@ -299,7 +299,7 @@ check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv) +@@ -272,7 +272,7 @@ check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv) return AE_OK; if (acpi_match_device_ids(dev, ids) == 0) diff --git a/queue/power-supply-check-if-calc_soc-succeeded-in-pm860x_i.patch b/queue/power-supply-check-if-calc_soc-succeeded-in-pm860x_i.patch index bfc228b4..221827d1 100644 --- a/queue/power-supply-check-if-calc_soc-succeeded-in-pm860x_i.patch +++ b/queue/power-supply-check-if-calc_soc-succeeded-in-pm860x_i.patch @@ -1,4 +1,4 @@ -From ccf193dee1f0fff55b556928591f7818bac1b3b1 Mon Sep 17 00:00:00 2001 +From b195566fd6c70cb87146ed0baaf755ab42fd3f2c Mon Sep 17 00:00:00 2001 From: Tom Rix <trix@redhat.com> Date: Sun, 12 Jul 2020 12:23:51 -0700 Subject: [PATCH] power: supply: check if calc_soc succeeded in @@ -23,9 +23,10 @@ Fixes: a830d28b48bf ("power_supply: Enable battery-charger for 88pm860x") Signed-off-by: Tom Rix <trix@redhat.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/power/supply/88pm860x_battery.c b/drivers/power/supply/88pm860x_battery.c -index 1308f3a185f3..590da88a17a2 100644 +index 5ca047b3f58f..23e7d6447ae9 100644 --- a/drivers/power/supply/88pm860x_battery.c +++ b/drivers/power/supply/88pm860x_battery.c @@ -433,7 +433,7 @@ static void pm860x_init_battery(struct pm860x_battery_info *info) diff --git a/queue/powerpc-book3s64-pkeys-Use-PVR-check-instead-of-cpu-.patch b/queue/powerpc-book3s64-pkeys-Use-PVR-check-instead-of-cpu-.patch index 57193d4e..f0a26034 100644 --- a/queue/powerpc-book3s64-pkeys-Use-PVR-check-instead-of-cpu-.patch +++ b/queue/powerpc-book3s64-pkeys-Use-PVR-check-instead-of-cpu-.patch @@ -1,4 +1,4 @@ -From d79e7a5f26f1d179cbb915a8bf2469b6d7431c29 Mon Sep 17 00:00:00 2001 +From 282f69adbc678d89939dd8b1705cad03600956b6 Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> Date: Thu, 9 Jul 2020 08:59:24 +0530 Subject: [PATCH] powerpc/book3s64/pkeys: Use PVR check instead of cpu feature @@ -14,9 +14,10 @@ Fixes: cf43d3b26452 ("powerpc: Enable pkey subsystem") Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200709032946.881753-2-aneesh.kumar@linux.ibm.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/mm/book3s64/pkeys.c b/arch/powerpc/mm/book3s64/pkeys.c -index d174106bab67..82ace6acb0aa 100644 +index 66f307e873dc..432fd9fa8c3f 100644 --- a/arch/powerpc/mm/book3s64/pkeys.c +++ b/arch/powerpc/mm/book3s64/pkeys.c @@ -83,13 +83,17 @@ static int pkey_initialize(void) diff --git a/queue/powerpc-boot-Fix-CONFIG_PPC_MPC52XX-references.patch b/queue/powerpc-boot-Fix-CONFIG_PPC_MPC52XX-references.patch index d8fa65f5..aba01ee1 100644 --- a/queue/powerpc-boot-Fix-CONFIG_PPC_MPC52XX-references.patch +++ b/queue/powerpc-boot-Fix-CONFIG_PPC_MPC52XX-references.patch @@ -1,4 +1,4 @@ -From e5eff89657e72a9050d95fde146b54c7dc165981 Mon Sep 17 00:00:00 2001 +From f8fea500b438e3cfbcca01f2ac6d879a207bbabb Mon Sep 17 00:00:00 2001 From: Michael Ellerman <mpe@ellerman.id.au> Date: Fri, 24 Jul 2020 23:17:26 +1000 Subject: [PATCH] powerpc/boot: Fix CONFIG_PPC_MPC52XX references @@ -14,12 +14,13 @@ Fix it to use CONFIG_PPC_MPC52xx. Fixes: 866bfc75f40e ("powerpc: conditionally compile platform-specific serial drivers") Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200724131728.1643966-7-mpe@ellerman.id.au +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile -index 4d43cb59b4a4..44af71543380 100644 +index 73d1f3562978..a6fd5d43a9ba 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -117,7 +117,7 @@ src-wlib-y := string.S crt0.S stdio.c decompress.c main.c \ +@@ -122,7 +122,7 @@ src-wlib-y := string.S crt0.S stdio.c decompress.c main.c \ elf_util.c $(zlib-y) devtree.c stdlib.c \ oflib.c ofconsole.c cuboot.c @@ -29,10 +30,10 @@ index 4d43cb59b4a4..44af71543380 100644 ifndef CONFIG_PPC64_BOOT_WRAPPER src-wlib-y += crtsavres.S diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c -index 0bfa7e87e546..9a19e5905485 100644 +index b0491b8c0199..afef4fcdea98 100644 --- a/arch/powerpc/boot/serial.c +++ b/arch/powerpc/boot/serial.c -@@ -128,7 +128,7 @@ int serial_console_init(void) +@@ -129,7 +129,7 @@ int serial_console_init(void) dt_is_compatible(devp, "fsl,cpm2-smc-uart")) rc = cpm_console_init(devp, &serial_cd); #endif diff --git a/queue/powerpc-perf-Fix-missing-is_sier_aviable-during-buil.patch b/queue/powerpc-perf-Fix-missing-is_sier_aviable-during-buil.patch index dbe49652..20d7a164 100644 --- a/queue/powerpc-perf-Fix-missing-is_sier_aviable-during-buil.patch +++ b/queue/powerpc-perf-Fix-missing-is_sier_aviable-during-buil.patch @@ -1,4 +1,4 @@ -From 3c9450c053f88e525b2db1e6990cdf34d14e7696 Mon Sep 17 00:00:00 2001 +From 2f7f93a953164b83bd944521180e089e76af6534 Mon Sep 17 00:00:00 2001 From: Madhavan Srinivasan <maddy@linux.ibm.com> Date: Sun, 14 Jun 2020 14:06:04 +0530 Subject: [PATCH] powerpc/perf: Fix missing is_sier_aviable() during build @@ -27,9 +27,10 @@ Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com> [mpe: Add detail about CONFIG_FSL_SOC_BOOKE] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200614083604.302611-1-maddy@linux.ibm.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/include/asm/perf_event.h b/arch/powerpc/include/asm/perf_event.h -index eed3954082fa..1e8b2e1ec1db 100644 +index 7426d7a90e1e..7aba3c7ea25c 100644 --- a/arch/powerpc/include/asm/perf_event.h +++ b/arch/powerpc/include/asm/perf_event.h @@ -12,6 +12,8 @@ diff --git a/queue/powerpc-rtas-don-t-online-CPUs-for-partition-suspend.patch b/queue/powerpc-rtas-don-t-online-CPUs-for-partition-suspend.patch index 6f5263b9..3ed6e8c0 100644 --- a/queue/powerpc-rtas-don-t-online-CPUs-for-partition-suspend.patch +++ b/queue/powerpc-rtas-don-t-online-CPUs-for-partition-suspend.patch @@ -1,4 +1,4 @@ -From 50037a69c5f20fcc3f9f880dbad374232c1a3345 Mon Sep 17 00:00:00 2001 +From 9139267bb677c35c61601a867676d49df3f9f17e Mon Sep 17 00:00:00 2001 From: Nathan Lynch <nathanl@linux.ibm.com> Date: Fri, 12 Jun 2020 00:12:22 -0500 Subject: [PATCH] powerpc/rtas: don't online CPUs for partition suspend @@ -48,6 +48,7 @@ Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200612051238.1007764-3-nathanl@linux.ibm.com [PG: drop EXPORT_SYMBOL of removed fcns that existed in v5.2.x baseline.] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h index 3c1887351c71..bd227e0eab07 100644 diff --git a/queue/powerpc-vdso-Fix-vdso-cpu-truncation.patch b/queue/powerpc-vdso-Fix-vdso-cpu-truncation.patch index 823b9988..062b020d 100644 --- a/queue/powerpc-vdso-Fix-vdso-cpu-truncation.patch +++ b/queue/powerpc-vdso-Fix-vdso-cpu-truncation.patch @@ -1,4 +1,4 @@ -From a9f675f950a07d5c1dbcbb97aabac56f5ed085e3 Mon Sep 17 00:00:00 2001 +From fb3cc3e62181def5efcc1ce92ef5e10af1e42161 Mon Sep 17 00:00:00 2001 From: Milton Miller <miltonm@us.ibm.com> Date: Thu, 16 Jul 2020 09:37:04 +1000 Subject: [PATCH] powerpc/vdso: Fix vdso cpu truncation @@ -20,12 +20,13 @@ Signed-off-by: Milton Miller <miltonm@us.ibm.com> Signed-off-by: Anton Blanchard <anton@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200715233704.1352257-1-anton@ozlabs.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c -index e0f4ba45b6cc..8dad44262e75 100644 +index d60598113a9f..36849b693d86 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c -@@ -677,7 +677,7 @@ int vdso_getcpu_init(void) +@@ -704,7 +704,7 @@ int vdso_getcpu_init(void) node = cpu_to_node(cpu); WARN_ON_ONCE(node > 0xffff); diff --git a/queue/pstore-Fix-linking-when-crypto-API-disabled.patch b/queue/pstore-Fix-linking-when-crypto-API-disabled.patch index e05e26c9..e986b838 100644 --- a/queue/pstore-Fix-linking-when-crypto-API-disabled.patch +++ b/queue/pstore-Fix-linking-when-crypto-API-disabled.patch @@ -1,4 +1,4 @@ -From fd49e03280e596e54edb93a91bc96170f8e97e4a Mon Sep 17 00:00:00 2001 +From a31243214956d4cd1f86caf81d8bf6d6c2a77fc6 Mon Sep 17 00:00:00 2001 From: Matteo Croce <mcroce@linux.microsoft.com> Date: Mon, 6 Jul 2020 19:37:36 -0700 Subject: [PATCH] pstore: Fix linking when crypto API disabled @@ -22,12 +22,13 @@ Link: https://lore.kernel.org/lkml/20200706234045.9516-1-mcroce@linux.microsoft. Fixes: cb3bee0369bc ("pstore: Use crypto compress API") Cc: stable@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c -index a9e297eefdff..36714df37d5d 100644 +index cdf5b8ae2583..74a60bae2b23 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c -@@ -269,6 +269,9 @@ static int pstore_compress(const void *in, void *out, +@@ -275,6 +275,9 @@ static int pstore_compress(const void *in, void *out, { int ret; @@ -37,7 +38,7 @@ index a9e297eefdff..36714df37d5d 100644 ret = crypto_comp_compress(tfm, in, inlen, out, &outlen); if (ret) { pr_err("crypto_comp_compress failed, ret = %d!\n", ret); -@@ -668,7 +671,7 @@ static void decompress_record(struct pstore_record *record) +@@ -661,7 +664,7 @@ static void decompress_record(struct pstore_record *record) int unzipped_len; char *unzipped, *workspace; diff --git a/queue/recordmcount-Fix-build-failure-on-non-arm64.patch b/queue/recordmcount-Fix-build-failure-on-non-arm64.patch index 10490625..85b9cc6a 100644 --- a/queue/recordmcount-Fix-build-failure-on-non-arm64.patch +++ b/queue/recordmcount-Fix-build-failure-on-non-arm64.patch @@ -1,4 +1,4 @@ -From 3df14264ad9930733a8166e5bd0eccc1727564bb Mon Sep 17 00:00:00 2001 +From 04bdfc8c77b7c33844c654614de3d04b9134845c Mon Sep 17 00:00:00 2001 From: Christophe Leroy <christophe.leroy@csgroup.eu> Date: Mon, 10 Aug 2020 08:48:22 +0000 Subject: [PATCH] recordmcount: Fix build failure on non arm64 @@ -23,12 +23,13 @@ Acked-by: Gregory Herrero <gregory.herrero@oracle.com> Cc: Gregory Herrero <gregory.herrero@oracle.com> Link: https://lore.kernel.org/r/5ca1be21fa6ebf73203b45fd9aadd2bafb5e6b15.1597049145.git.christophe.leroy@csgroup.eu Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c -index e59022b3f125..b9c2ee7ab43f 100644 +index e5c277940c48..5f58c8e7cb59 100644 --- a/scripts/recordmcount.c +++ b/scripts/recordmcount.c -@@ -42,6 +42,8 @@ +@@ -43,6 +43,8 @@ #define R_ARM_THM_CALL 10 #define R_ARM_CALL 28 diff --git a/queue/recordmcount-only-record-relocation-of-type-R_AARCH6.patch b/queue/recordmcount-only-record-relocation-of-type-R_AARCH6.patch index 027a6270..22966e26 100644 --- a/queue/recordmcount-only-record-relocation-of-type-R_AARCH6.patch +++ b/queue/recordmcount-only-record-relocation-of-type-R_AARCH6.patch @@ -1,4 +1,4 @@ -From 65ce03e44cfd2b365300f28c22c239a36633829e Mon Sep 17 00:00:00 2001 +From 896307d592960dc117ac56ab9eed64aa9327d5d9 Mon Sep 17 00:00:00 2001 From: Gregory Herrero <gregory.herrero@oracle.com> Date: Fri, 17 Jul 2020 16:33:38 +0200 Subject: [PATCH] recordmcount: only record relocation of type R_AARCH64_CALL26 @@ -47,6 +47,7 @@ Signed-off-by: Gregory Herrero <gregory.herrero@oracle.com> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Link: https://lore.kernel.org/r/20200717143338.19302-1-gregory.herrero@oracle.com Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c index 9660dc632b54..e5c277940c48 100644 diff --git a/queue/rtw88-fix-LDPC-field-for-RA-info.patch b/queue/rtw88-fix-LDPC-field-for-RA-info.patch index 7e884d68..b7dfc82d 100644 --- a/queue/rtw88-fix-LDPC-field-for-RA-info.patch +++ b/queue/rtw88-fix-LDPC-field-for-RA-info.patch @@ -1,4 +1,4 @@ -From ae44fa993e8e6c1a1d22e5ca03d9eadd53b2745b Mon Sep 17 00:00:00 2001 +From e15ecbda1e4e25a20752cb31acecb0a1e7d2af25 Mon Sep 17 00:00:00 2001 From: Tsang-Shian Lin <thlin@realtek.com> Date: Fri, 17 Jul 2020 14:49:31 +0800 Subject: [PATCH] rtw88: fix LDPC field for RA info @@ -14,12 +14,13 @@ Signed-off-by: Tsang-Shian Lin <thlin@realtek.com> Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20200717064937.27966-2-yhchuang@realtek.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c -index 6478fd7a78f6..13e79482f6d5 100644 +index 2dd5c091b02c..04f6f0bed7fe 100644 --- a/drivers/net/wireless/realtek/rtw88/fw.c +++ b/drivers/net/wireless/realtek/rtw88/fw.c -@@ -456,7 +456,7 @@ void rtw_fw_send_ra_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) +@@ -209,7 +209,7 @@ void rtw_fw_send_ra_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) SET_RA_INFO_INIT_RA_LVL(h2c_pkt, si->init_ra_lv); SET_RA_INFO_SGI_EN(h2c_pkt, si->sgi_enable); SET_RA_INFO_BW_MODE(h2c_pkt, si->bw_mode); diff --git a/queue/rtw88-fix-short-GI-capability-based-on-current-bandw.patch b/queue/rtw88-fix-short-GI-capability-based-on-current-bandw.patch index 36729b12..ee906bbf 100644 --- a/queue/rtw88-fix-short-GI-capability-based-on-current-bandw.patch +++ b/queue/rtw88-fix-short-GI-capability-based-on-current-bandw.patch @@ -1,4 +1,4 @@ -From 4dd86b901d1373ef8446ecb50a7ca009f3475211 Mon Sep 17 00:00:00 2001 +From 26a85ac2eb962ac91dc4d83311c7c968aaf72ea8 Mon Sep 17 00:00:00 2001 From: Tsang-Shian Lin <thlin@realtek.com> Date: Fri, 17 Jul 2020 14:49:32 +0800 Subject: [PATCH] rtw88: fix short GI capability based on current bandwidth @@ -27,12 +27,13 @@ Signed-off-by: Tsang-Shian Lin <thlin@realtek.com> Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20200717064937.27966-3-yhchuang@realtek.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c -index 7304e8bc5e31..54044abf30d7 100644 +index 3f2ab0ed9f43..d72b346d7307 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c -@@ -722,8 +722,6 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) +@@ -505,8 +505,6 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) stbc_en = VHT_STBC_EN; if (sta->vht_cap.cap & IEEE80211_VHT_CAP_RXLDPC) ldpc_en = VHT_LDPC_EN; @@ -41,7 +42,7 @@ index 7304e8bc5e31..54044abf30d7 100644 } else if (sta->ht_cap.ht_supported) { ra_mask |= (sta->ht_cap.mcs.rx_mask[1] << 20) | (sta->ht_cap.mcs.rx_mask[0] << 12); -@@ -731,9 +729,6 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) +@@ -514,9 +512,6 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) stbc_en = HT_STBC_EN; if (sta->ht_cap.cap & IEEE80211_HT_CAP_LDPC_CODING) ldpc_en = HT_LDPC_EN; @@ -51,7 +52,7 @@ index 7304e8bc5e31..54044abf30d7 100644 } if (efuse->hw_cap.nss == 1) -@@ -775,12 +770,18 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) +@@ -558,12 +553,18 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) switch (sta->bandwidth) { case IEEE80211_STA_RX_BW_80: bw_mode = RTW_CHANNEL_WIDTH_80; diff --git a/queue/s390-dasd-fix-inability-to-use-DASD-with-DIAG-driver.patch b/queue/s390-dasd-fix-inability-to-use-DASD-with-DIAG-driver.patch index d93d8ede..847dbe9c 100644 --- a/queue/s390-dasd-fix-inability-to-use-DASD-with-DIAG-driver.patch +++ b/queue/s390-dasd-fix-inability-to-use-DASD-with-DIAG-driver.patch @@ -1,4 +1,4 @@ -From 9f4aa52387c68049403b59939df5c0dd8e3872cc Mon Sep 17 00:00:00 2001 +From 2019f090a14fc45b137a3a6850cff97d925aed59 Mon Sep 17 00:00:00 2001 From: Stefan Haberland <sth@linux.ibm.com> Date: Tue, 14 Jul 2020 22:03:26 +0200 Subject: [PATCH] s390/dasd: fix inability to use DASD with DIAG driver @@ -23,9 +23,10 @@ Signed-off-by: Stefan Haberland <sth@linux.ibm.com> Reviewed-by: Peter Oberparleiter <oberpar@linux.ibm.com> Cc: stable@vger.kernel.org #4.20 Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c -index facb588d09e4..069d6b39cacf 100644 +index e1fe02477ea8..b60f88907269 100644 --- a/drivers/s390/block/dasd_diag.c +++ b/drivers/s390/block/dasd_diag.c @@ -319,7 +319,7 @@ dasd_diag_check_device(struct dasd_device *device) diff --git a/queue/s390-gmap-improve-THP-splitting.patch b/queue/s390-gmap-improve-THP-splitting.patch index 74d34eb6..96edac9a 100644 --- a/queue/s390-gmap-improve-THP-splitting.patch +++ b/queue/s390-gmap-improve-THP-splitting.patch @@ -1,4 +1,4 @@ -From ba925fa35057a062ac98c3e8138b013ce4ce351c Mon Sep 17 00:00:00 2001 +From d1b85aa61975838a141a43fe2fb34537d0522a76 Mon Sep 17 00:00:00 2001 From: Gerald Schaefer <gerald.schaefer@linux.ibm.com> Date: Wed, 29 Jul 2020 22:22:34 +0200 Subject: [PATCH] s390/gmap: improve THP splitting @@ -23,9 +23,10 @@ Tested-by: Ilya Leoshkevich <iii@linux.ibm.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Gerald Schaefer <gerald.schaefer@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c -index 190357ff86b3..46c1bf2a3b4b 100644 +index bc2bde4db8ae..f41053055c6f 100644 --- a/arch/s390/mm/gmap.c +++ b/arch/s390/mm/gmap.c @@ -2485,23 +2485,36 @@ void gmap_sync_dirty_log_pmd(struct gmap *gmap, unsigned long bitmap[4], diff --git a/queue/s390-qeth-don-t-process-empty-bridge-port-events.patch b/queue/s390-qeth-don-t-process-empty-bridge-port-events.patch index 4fb2ee55..ba1035f4 100644 --- a/queue/s390-qeth-don-t-process-empty-bridge-port-events.patch +++ b/queue/s390-qeth-don-t-process-empty-bridge-port-events.patch @@ -1,4 +1,4 @@ -From 02472e28b9a45471c6d8729ff2c7422baa9be46a Mon Sep 17 00:00:00 2001 +From 318e9cf341f1d934aefc06811a79f6aa649e0948 Mon Sep 17 00:00:00 2001 From: Julian Wiedmann <jwi@linux.ibm.com> Date: Thu, 30 Jul 2020 17:01:20 +0200 Subject: [PATCH] s390/qeth: don't process empty bridge port events @@ -13,12 +13,13 @@ Fixes: b4d72c08b358 ("qeth: bridgeport support - basic control") Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com> Reviewed-by: Alexandra Winter <wintera@linux.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c -index 38e97bbde9ed..8b342a88ff5c 100644 +index 19cfeac0e182..2e51675e8d45 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c -@@ -1140,6 +1140,10 @@ static void qeth_bridge_state_change(struct qeth_card *card, +@@ -1255,6 +1255,10 @@ static void qeth_bridge_state_change(struct qeth_card *card, int extrasize; QETH_CARD_TEXT(card, 2, "brstchng"); diff --git a/queue/sched-correct-SD_flags-returned-by-tl-sd_flags.patch b/queue/sched-correct-SD_flags-returned-by-tl-sd_flags.patch index 844fcaf3..746cf39f 100644 --- a/queue/sched-correct-SD_flags-returned-by-tl-sd_flags.patch +++ b/queue/sched-correct-SD_flags-returned-by-tl-sd_flags.patch @@ -1,4 +1,4 @@ -From 9b1b234bb86bcdcdb142e900d39b599185465dbb Mon Sep 17 00:00:00 2001 +From 47d7f66bba84133977268e4aca6af6f81205d3c0 Mon Sep 17 00:00:00 2001 From: Peng Liu <iwtbavbm@gmail.com> Date: Tue, 9 Jun 2020 23:09:36 +0800 Subject: [PATCH] sched: correct SD_flags returned by tl->sd_flags() @@ -15,12 +15,13 @@ Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org> Reviewed-by: Valentin Schneider <valentin.schneider@arm.com> Link: https://lkml.kernel.org/r/20200609150936.GA13060@iZj6chx1xj0e0buvshuecpZ +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c -index ba81187bb7af..9079d865a935 100644 +index a906d2535710..6fb3e636fbe1 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c -@@ -1328,7 +1328,7 @@ sd_init(struct sched_domain_topology_level *tl, +@@ -1332,7 +1332,7 @@ sd_init(struct sched_domain_topology_level *tl, sd_flags = (*tl->sd_flags)(); if (WARN_ONCE(sd_flags & ~TOPOLOGY_SD_FLAGS, "wrong sd_flags in topology description\n")) diff --git a/queue/sched-fair-Fix-NOHZ-next-idle-balance.patch b/queue/sched-fair-Fix-NOHZ-next-idle-balance.patch index 857dc942..944f074c 100644 --- a/queue/sched-fair-Fix-NOHZ-next-idle-balance.patch +++ b/queue/sched-fair-Fix-NOHZ-next-idle-balance.patch @@ -1,4 +1,4 @@ -From 3ea2f097b17e13a8280f1f9386c331b326a3dbef Mon Sep 17 00:00:00 2001 +From 8c602ec8e92abb51f8a47f4086f4d4f08dd529a0 Mon Sep 17 00:00:00 2001 From: Vincent Guittot <vincent.guittot@linaro.org> Date: Tue, 9 Jun 2020 14:37:48 +0200 Subject: [PATCH] sched/fair: Fix NOHZ next idle balance @@ -26,12 +26,13 @@ Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Valentin Schneider <valentin.schneider@arm.com> Acked-by: Mel Gorman <mgorman@suse.de> Link: https://lkml.kernel.org/r/20200609123748.18636-1-vincent.guittot@linaro.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index a785a9b262dd..295c9ffa850b 100644 +index 57e56c8980eb..50f4b19a5387 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -10022,7 +10022,12 @@ static void kick_ilb(unsigned int flags) +@@ -9673,7 +9673,12 @@ static void kick_ilb(unsigned int flags) { int ilb_cpu; @@ -45,7 +46,7 @@ index a785a9b262dd..295c9ffa850b 100644 ilb_cpu = find_new_ilb(); -@@ -10343,6 +10348,14 @@ static bool _nohz_idle_balance(struct rq *this_rq, unsigned int flags, +@@ -9992,6 +9997,14 @@ static bool _nohz_idle_balance(struct rq *this_rq, unsigned int flags, } } @@ -60,7 +61,7 @@ index a785a9b262dd..295c9ffa850b 100644 /* Newly idle CPU doesn't need an update */ if (idle != CPU_NEWLY_IDLE) { update_blocked_averages(this_cpu); -@@ -10363,14 +10376,6 @@ static bool _nohz_idle_balance(struct rq *this_rq, unsigned int flags, +@@ -10012,14 +10025,6 @@ static bool _nohz_idle_balance(struct rq *this_rq, unsigned int flags, if (has_blocked_load) WRITE_ONCE(nohz.has_blocked, 1); diff --git a/queue/scsi-cumana_2-Fix-different-dev_id-between-request_i.patch b/queue/scsi-cumana_2-Fix-different-dev_id-between-request_i.patch index 26ff2462..f70e1396 100644 --- a/queue/scsi-cumana_2-Fix-different-dev_id-between-request_i.patch +++ b/queue/scsi-cumana_2-Fix-different-dev_id-between-request_i.patch @@ -1,4 +1,4 @@ -From 040ab9c4fd0070cd5fa71ba3a7b95b8470db9b4d Mon Sep 17 00:00:00 2001 +From f60938eb60fbad13c9d5ed46fea23d9e8ff5310c Mon Sep 17 00:00:00 2001 From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Date: Thu, 25 Jun 2020 22:47:30 +0200 Subject: [PATCH] scsi: cumana_2: Fix different dev_id between request_irq() @@ -14,9 +14,10 @@ Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c -index 65691c21f133..29294f0ef8a9 100644 +index a1f3e9ee4e63..14e1d001253c 100644 --- a/drivers/scsi/arm/cumana_2.c +++ b/drivers/scsi/arm/cumana_2.c @@ -450,7 +450,7 @@ static int cumanascsi2_probe(struct expansion_card *ec, diff --git a/queue/scsi-eesox-Fix-different-dev_id-between-request_irq-.patch b/queue/scsi-eesox-Fix-different-dev_id-between-request_irq-.patch index 613c12e1..5cd22a23 100644 --- a/queue/scsi-eesox-Fix-different-dev_id-between-request_irq-.patch +++ b/queue/scsi-eesox-Fix-different-dev_id-between-request_irq-.patch @@ -1,4 +1,4 @@ -From 86f2da1112ccf744ad9068b1d5d9843faf8ddee6 Mon Sep 17 00:00:00 2001 +From 571e90bd72c74636b09b9858c875ba0e7103b729 Mon Sep 17 00:00:00 2001 From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Date: Fri, 26 Jun 2020 06:05:53 +0200 Subject: [PATCH] scsi: eesox: Fix different dev_id between request_irq() and @@ -13,9 +13,10 @@ Link: https://lore.kernel.org/r/20200626040553.944352-1-christophe.jaillet@wanad Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c -index 6e204a2e0c8d..591ae2a6dd74 100644 +index 134f040d58e2..f441ec8eb93d 100644 --- a/drivers/scsi/arm/eesox.c +++ b/drivers/scsi/arm/eesox.c @@ -571,7 +571,7 @@ static int eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id) diff --git a/queue/scsi-mesh-Fix-panic-after-host-or-bus-reset.patch b/queue/scsi-mesh-Fix-panic-after-host-or-bus-reset.patch index 7eddba2d..3caf55d4 100644 --- a/queue/scsi-mesh-Fix-panic-after-host-or-bus-reset.patch +++ b/queue/scsi-mesh-Fix-panic-after-host-or-bus-reset.patch @@ -1,4 +1,4 @@ -From edd7dd2292ab9c3628b65c4d04514c3068ad54f6 Mon Sep 17 00:00:00 2001 +From fe6c790b94270befa4cbaeba9fa19d32433ae4da Mon Sep 17 00:00:00 2001 From: Finn Thain <fthain@telegraphics.com.au> Date: Thu, 23 Jul 2020 09:25:51 +1000 Subject: [PATCH] scsi: mesh: Fix panic after host or bus reset @@ -64,9 +64,10 @@ Cc: Paul Mackerras <paulus@ozlabs.org> Reported-and-tested-by: Stan Johnson <userm57@yahoo.com> Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c -index f9f8f4921654..fd1d03064079 100644 +index 74fb50644678..4dd50db90677 100644 --- a/drivers/scsi/mesh.c +++ b/drivers/scsi/mesh.c @@ -1045,6 +1045,8 @@ static void handle_error(struct mesh_state *ms) diff --git a/queue/scsi-powertec-Fix-different-dev_id-between-request_i.patch b/queue/scsi-powertec-Fix-different-dev_id-between-request_i.patch index 6a54ace7..f5a2ef2e 100644 --- a/queue/scsi-powertec-Fix-different-dev_id-between-request_i.patch +++ b/queue/scsi-powertec-Fix-different-dev_id-between-request_i.patch @@ -1,4 +1,4 @@ -From d179f7c763241c1dc5077fca88ddc3c47d21b763 Mon Sep 17 00:00:00 2001 +From 6f3c0b5b4c2051dc233958b99419a3197403ad06 Mon Sep 17 00:00:00 2001 From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Date: Fri, 26 Jun 2020 05:59:48 +0200 Subject: [PATCH] scsi: powertec: Fix different dev_id between request_irq() @@ -13,9 +13,10 @@ Link: https://lore.kernel.org/r/20200626035948.944148-1-christophe.jaillet@wanad Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c -index 772a13e5fd91..d99ef014528e 100644 +index c795537a671c..2dc0df005cb3 100644 --- a/drivers/scsi/arm/powertec.c +++ b/drivers/scsi/arm/powertec.c @@ -378,7 +378,7 @@ static int powertecscsi_probe(struct expansion_card *ec, diff --git a/queue/scsi-scsi_debug-Add-check-for-sdebug_max_queue-durin.patch b/queue/scsi-scsi_debug-Add-check-for-sdebug_max_queue-durin.patch index 795be387..ddbfd64a 100644 --- a/queue/scsi-scsi_debug-Add-check-for-sdebug_max_queue-durin.patch +++ b/queue/scsi-scsi_debug-Add-check-for-sdebug_max_queue-durin.patch @@ -1,4 +1,4 @@ -From c87bf24cfb60bce27b4d2c7e56ebfd86fb9d16bb Mon Sep 17 00:00:00 2001 +From 30571d3a1c752a98985255bc61e10b4c6d19a83f Mon Sep 17 00:00:00 2001 From: John Garry <john.garry@huawei.com> Date: Thu, 9 Jul 2020 20:23:19 +0800 Subject: [PATCH] scsi: scsi_debug: Add check for sdebug_max_queue during @@ -64,12 +64,13 @@ Reviewed-by: Ming Lei <ming.lei@redhat.com> Acked-by: Douglas Gilbert <dgilbert@interlog.com> Signed-off-by: John Garry <john.garry@huawei.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c -index 4692f5b6ad13..dc8fd6400e40 100644 +index 32965ec76965..44181a2cbf18 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c -@@ -6613,6 +6613,12 @@ static int __init scsi_debug_init(void) +@@ -5296,6 +5296,12 @@ static int __init scsi_debug_init(void) pr_err("submit_queues must be 1 or more\n"); return -EINVAL; } diff --git a/queue/seccomp-Fix-ioctl-number-for-SECCOMP_IOCTL_NOTIF_ID_.patch b/queue/seccomp-Fix-ioctl-number-for-SECCOMP_IOCTL_NOTIF_ID_.patch index 0f38ba3f..64faeebe 100644 --- a/queue/seccomp-Fix-ioctl-number-for-SECCOMP_IOCTL_NOTIF_ID_.patch +++ b/queue/seccomp-Fix-ioctl-number-for-SECCOMP_IOCTL_NOTIF_ID_.patch @@ -1,4 +1,4 @@ -From 7aaebc4821ef05de68e19f15f0c438623b72d0ad Mon Sep 17 00:00:00 2001 +From 5d9f4742635e582736df80d180a380719db60d1c Mon Sep 17 00:00:00 2001 From: Kees Cook <keescook@chromium.org> Date: Mon, 15 Jun 2020 15:42:46 -0700 Subject: [PATCH] seccomp: Fix ioctl number for SECCOMP_IOCTL_NOTIF_ID_VALID @@ -13,6 +13,7 @@ needed for backward compatibility. Fixes: 6a21cc50f0c7 ("seccomp: add a return code to trap to userspace") Signed-off-by: Kees Cook <keescook@chromium.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/uapi/linux/seccomp.h b/include/uapi/linux/seccomp.h index 90734aa5aa36..b5f901af79f0 100644 diff --git a/queue/selftests-powerpc-Fix-CPU-affinity-for-child-process.patch b/queue/selftests-powerpc-Fix-CPU-affinity-for-child-process.patch index 6bbf4d34..057b3b29 100644 --- a/queue/selftests-powerpc-Fix-CPU-affinity-for-child-process.patch +++ b/queue/selftests-powerpc-Fix-CPU-affinity-for-child-process.patch @@ -1,4 +1,4 @@ -From 854eb5022be04f81e318765f089f41a57c8e5d83 Mon Sep 17 00:00:00 2001 +From 1fe3e0d89f9a261fdcdbf15642daf82059708920 Mon Sep 17 00:00:00 2001 From: Harish <harish@linux.ibm.com> Date: Tue, 9 Jun 2020 13:44:23 +0530 Subject: [PATCH] selftests/powerpc: Fix CPU affinity for child process @@ -19,6 +19,7 @@ Reviewed-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> Reviewed-by: Satheesh Rajendran <sathnaga@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200609081423.529664-1-harish@linux.ibm.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/tools/testing/selftests/powerpc/benchmarks/context_switch.c b/tools/testing/selftests/powerpc/benchmarks/context_switch.c index a2e8c9da7fa5..d50cc05df495 100644 diff --git a/queue/selftests-powerpc-Fix-online-CPU-selection.patch b/queue/selftests-powerpc-Fix-online-CPU-selection.patch index a07e1141..98d29727 100644 --- a/queue/selftests-powerpc-Fix-online-CPU-selection.patch +++ b/queue/selftests-powerpc-Fix-online-CPU-selection.patch @@ -1,4 +1,4 @@ -From dfa03fff86027e58c8dba5c03ae68150d4e513ad Mon Sep 17 00:00:00 2001 +From 2bc4be42d7b3dcb29a62e45f5e6c892f568b67d9 Mon Sep 17 00:00:00 2001 From: Sandipan Das <sandipan@linux.ibm.com> Date: Thu, 30 Jul 2020 10:38:46 +0530 Subject: [PATCH] selftests/powerpc: Fix online CPU selection @@ -18,9 +18,10 @@ Signed-off-by: Sandipan Das <sandipan@linux.ibm.com> Reviewed-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/a408c4b8e9a23bb39b539417a21eb0ff47bb5127.1596084858.git.sandipan@linux.ibm.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/tools/testing/selftests/powerpc/utils.c b/tools/testing/selftests/powerpc/utils.c -index 933678f1ed0a..18b6a773d5c7 100644 +index c02d24835db4..176102eca994 100644 --- a/tools/testing/selftests/powerpc/utils.c +++ b/tools/testing/selftests/powerpc/utils.c @@ -16,6 +16,7 @@ diff --git a/queue/soc-qcom-rpmh-rsc-Set-suppress_bind_attrs-flag.patch b/queue/soc-qcom-rpmh-rsc-Set-suppress_bind_attrs-flag.patch index cf3a433b..35dbd734 100644 --- a/queue/soc-qcom-rpmh-rsc-Set-suppress_bind_attrs-flag.patch +++ b/queue/soc-qcom-rpmh-rsc-Set-suppress_bind_attrs-flag.patch @@ -1,4 +1,4 @@ -From 1a53ce9ab4faeb841b33d62d23283dc76c0e7c5a Mon Sep 17 00:00:00 2001 +From c87c69fa9fb7fb3663dfc9bc1833f7c0ecae9477 Mon Sep 17 00:00:00 2001 From: Maulik Shah <mkshah@codeaurora.org> Date: Mon, 22 Jun 2020 12:23:25 +0530 Subject: [PATCH] soc: qcom: rpmh-rsc: Set suppress_bind_attrs flag @@ -17,12 +17,13 @@ Reviewed-by: Stephen Boyd <swboyd@chromium.org> Signed-off-by: Maulik Shah <mkshah@codeaurora.org> Link: https://lore.kernel.org/r/1592808805-2437-1-git-send-email-mkshah@codeaurora.org Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c -index 076fd27f3081..752a5619f715 100644 +index 0ba1f465db12..8924fcd9f5f5 100644 --- a/drivers/soc/qcom/rpmh-rsc.c +++ b/drivers/soc/qcom/rpmh-rsc.c -@@ -1023,6 +1023,7 @@ static struct platform_driver rpmh_driver = { +@@ -715,6 +715,7 @@ static struct platform_driver rpmh_driver = { .driver = { .name = "rpmh", .of_match_table = rpmh_drv_match, diff --git a/queue/spi-lantiq-fix-Rx-overflow-error-in-full-duplex-mode.patch b/queue/spi-lantiq-fix-Rx-overflow-error-in-full-duplex-mode.patch index 02adba65..7b01e4cb 100644 --- a/queue/spi-lantiq-fix-Rx-overflow-error-in-full-duplex-mode.patch +++ b/queue/spi-lantiq-fix-Rx-overflow-error-in-full-duplex-mode.patch @@ -1,4 +1,4 @@ -From 661ccf2b3f1360be50242726f7c26ced6a9e7d52 Mon Sep 17 00:00:00 2001 +From 325b7e117b72f04178f642fc895374aca9b708e8 Mon Sep 17 00:00:00 2001 From: Dilip Kota <eswara.kota@linux.intel.com> Date: Fri, 17 Jul 2020 14:27:50 +0800 Subject: [PATCH] spi: lantiq: fix: Rx overflow error in full duplex mode @@ -12,12 +12,13 @@ Fixes: 17f84b793c01 ("spi: lantiq-ssc: add support for Lantiq SSC SPI controller Signed-off-by: Dilip Kota <eswara.kota@linux.intel.com> Link: https://lore.kernel.org/r/efb650b0faa49a00788c4e0ca8ef7196bdba851d.1594957019.git.eswara.kota@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/spi/spi-lantiq-ssc.c b/drivers/spi/spi-lantiq-ssc.c -index 1cf650e25e31..24585890996b 100644 +index 8f01858c0ae6..cdde8f90af35 100644 --- a/drivers/spi/spi-lantiq-ssc.c +++ b/drivers/spi/spi-lantiq-ssc.c -@@ -183,6 +183,7 @@ struct lantiq_ssc_spi { +@@ -184,6 +184,7 @@ struct lantiq_ssc_spi { unsigned int tx_fifo_size; unsigned int rx_fifo_size; unsigned int base_cs; @@ -25,7 +26,7 @@ index 1cf650e25e31..24585890996b 100644 }; static u32 lantiq_ssc_readl(const struct lantiq_ssc_spi *spi, u32 reg) -@@ -480,6 +481,7 @@ static void tx_fifo_write(struct lantiq_ssc_spi *spi) +@@ -481,6 +482,7 @@ static void tx_fifo_write(struct lantiq_ssc_spi *spi) u32 data; unsigned int tx_free = tx_fifo_free(spi); @@ -33,7 +34,7 @@ index 1cf650e25e31..24585890996b 100644 while (spi->tx_todo && tx_free) { switch (spi->bits_per_word) { case 2 ... 8: -@@ -508,6 +510,7 @@ static void tx_fifo_write(struct lantiq_ssc_spi *spi) +@@ -509,6 +511,7 @@ static void tx_fifo_write(struct lantiq_ssc_spi *spi) lantiq_ssc_writel(spi, data, LTQ_SPI_TB); tx_free--; @@ -41,7 +42,7 @@ index 1cf650e25e31..24585890996b 100644 } } -@@ -519,6 +522,13 @@ static void rx_fifo_read_full_duplex(struct lantiq_ssc_spi *spi) +@@ -520,6 +523,13 @@ static void rx_fifo_read_full_duplex(struct lantiq_ssc_spi *spi) u32 data; unsigned int rx_fill = rx_fifo_level(spi); diff --git a/queue/spi-lantiq-ssc-Fix-warning-by-using-WQ_MEM_RECLAIM.patch b/queue/spi-lantiq-ssc-Fix-warning-by-using-WQ_MEM_RECLAIM.patch index 2db17a43..9394a85b 100644 --- a/queue/spi-lantiq-ssc-Fix-warning-by-using-WQ_MEM_RECLAIM.patch +++ b/queue/spi-lantiq-ssc-Fix-warning-by-using-WQ_MEM_RECLAIM.patch @@ -1,4 +1,4 @@ -From ba3548cf29616b58c93bbaffc3d636898d009858 Mon Sep 17 00:00:00 2001 +From dde4356a70cb4ea8f500664d4407993e8f40cf86 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens <hauke@hauke-m.de> Date: Fri, 17 Jul 2020 23:56:48 +0200 Subject: [PATCH] spi: lantiq-ssc: Fix warning by using WQ_MEM_RECLAIM @@ -22,12 +22,13 @@ Fixes: 891b7c5fbf61 ("mtd_blkdevs: convert to blk-mq") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Link: https://lore.kernel.org/r/20200717215648.20522-1-hauke@hauke-m.de Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/spi/spi-lantiq-ssc.c b/drivers/spi/spi-lantiq-ssc.c -index 1fd7ee53d451..a12a5d0cfebf 100644 +index cdde8f90af35..365008d304f5 100644 --- a/drivers/spi/spi-lantiq-ssc.c +++ b/drivers/spi/spi-lantiq-ssc.c -@@ -899,7 +899,7 @@ static int lantiq_ssc_probe(struct platform_device *pdev) +@@ -923,7 +923,7 @@ static int lantiq_ssc_probe(struct platform_device *pdev) master->bits_per_word_mask = SPI_BPW_RANGE_MASK(2, 8) | SPI_BPW_MASK(16) | SPI_BPW_MASK(32); diff --git a/queue/spi-rockchip-Fix-error-in-SPI-slave-pio-read.patch b/queue/spi-rockchip-Fix-error-in-SPI-slave-pio-read.patch index 8a47430a..ac038336 100644 --- a/queue/spi-rockchip-Fix-error-in-SPI-slave-pio-read.patch +++ b/queue/spi-rockchip-Fix-error-in-SPI-slave-pio-read.patch @@ -1,4 +1,4 @@ -From 4294e4accf8d695ea5605f6b189008b692e3e82c Mon Sep 17 00:00:00 2001 +From 814f04439ea5d5923420a1e2618261417b62e803 Mon Sep 17 00:00:00 2001 From: Jon Lin <jon.lin@rock-chips.com> Date: Thu, 23 Jul 2020 08:43:56 +0800 Subject: [PATCH] spi: rockchip: Fix error in SPI slave pio read @@ -14,12 +14,13 @@ Reviewed-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Emil Renner Berthing <kernel@esmil.dk> Link: https://lore.kernel.org/r/20200723004356.6390-3-jon.lin@rock-chips.com Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c -index a451dacab5cf..75a8a9428ff8 100644 +index 2cc6d9951b52..008b64f4e031 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c -@@ -291,7 +291,7 @@ static void rockchip_spi_pio_writer(struct rockchip_spi *rs) +@@ -286,7 +286,7 @@ static void rockchip_spi_pio_writer(struct rockchip_spi *rs) static void rockchip_spi_pio_reader(struct rockchip_spi *rs) { u32 words = readl_relaxed(rs->regs + ROCKCHIP_SPI_RXFLR); diff --git a/queue/spi-spidev-Align-buffers-for-DMA.patch b/queue/spi-spidev-Align-buffers-for-DMA.patch index 1be693e6..ceeb3b4d 100644 --- a/queue/spi-spidev-Align-buffers-for-DMA.patch +++ b/queue/spi-spidev-Align-buffers-for-DMA.patch @@ -1,4 +1,4 @@ -From aa9e862d7d5bcecd4dca9f39e8b684b93dd84ee7 Mon Sep 17 00:00:00 2001 +From ab99e4b2de2efb537f490ef43f896b92dd6be5d2 Mon Sep 17 00:00:00 2001 From: Christian Eggers <ceggers@arri.de> Date: Tue, 28 Jul 2020 12:08:32 +0200 Subject: [PATCH] spi: spidev: Align buffers for DMA @@ -19,12 +19,13 @@ Signed-off-by: Christian Eggers <ceggers@arri.de> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20200728100832.24788-1-ceggers@arri.de Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c -index 59e07675ef86..455e99c4958e 100644 +index 4c13eb715a2b..c62576ce2a88 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -224,6 +224,11 @@ static int spidev_message(struct spidev_data *spidev, +@@ -223,6 +223,11 @@ static int spidev_message(struct spidev_data *spidev, for (n = n_xfers, k_tmp = k_xfers, u_tmp = u_xfers; n; n--, k_tmp++, u_tmp++) { @@ -36,7 +37,7 @@ index 59e07675ef86..455e99c4958e 100644 k_tmp->len = u_tmp->len; total += k_tmp->len; -@@ -239,17 +244,17 @@ static int spidev_message(struct spidev_data *spidev, +@@ -238,17 +243,17 @@ static int spidev_message(struct spidev_data *spidev, if (u_tmp->rx_buf) { /* this transfer needs space in RX bounce buffer */ @@ -57,7 +58,7 @@ index 59e07675ef86..455e99c4958e 100644 if (tx_total > bufsiz) { status = -EMSGSIZE; goto done; -@@ -259,7 +264,7 @@ static int spidev_message(struct spidev_data *spidev, +@@ -258,7 +263,7 @@ static int spidev_message(struct spidev_data *spidev, (uintptr_t) u_tmp->tx_buf, u_tmp->len)) goto done; @@ -66,7 +67,7 @@ index 59e07675ef86..455e99c4958e 100644 } k_tmp->cs_change = !!u_tmp->cs_change; -@@ -293,16 +298,16 @@ static int spidev_message(struct spidev_data *spidev, +@@ -290,16 +295,16 @@ static int spidev_message(struct spidev_data *spidev, goto done; /* copy any rx data out of bounce buffer */ diff --git a/queue/staging-rtl8192u-fix-a-dubious-looking-mask-before-a.patch b/queue/staging-rtl8192u-fix-a-dubious-looking-mask-before-a.patch index b695b407..a1fa4bdf 100644 --- a/queue/staging-rtl8192u-fix-a-dubious-looking-mask-before-a.patch +++ b/queue/staging-rtl8192u-fix-a-dubious-looking-mask-before-a.patch @@ -1,4 +1,4 @@ -From c4283950a9a4d3bf4a3f362e406c80ab14f10714 Mon Sep 17 00:00:00 2001 +From a422c31f3b87681c86c693dd9b3522ed4010a674 Mon Sep 17 00:00:00 2001 From: Colin Ian King <colin.king@canonical.com> Date: Thu, 16 Jul 2020 16:47:20 +0100 Subject: [PATCH] staging: rtl8192u: fix a dubious looking mask before a shift @@ -17,12 +17,13 @@ Fixes: 8fc8598e61f6 ("Staging: Added Realtek rtl8192u driver to staging") Signed-off-by: Colin Ian King <colin.king@canonical.com> Link: https://lore.kernel.org/r/20200716154720.1710252-1-colin.king@canonical.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c -index fcfb9024a83f..6ec65187bef9 100644 +index 309f06439a23..001157e7fa57 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c -@@ -2374,7 +2374,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev) +@@ -2447,7 +2447,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev) ret = eprom_read(dev, (EEPROM_TX_PW_INDEX_CCK >> 1)); if (ret < 0) return ret; diff --git a/queue/staging-vchiq_arm-Add-a-matching-unregister-call.patch b/queue/staging-vchiq_arm-Add-a-matching-unregister-call.patch index a1fb7e9f..c15959da 100644 --- a/queue/staging-vchiq_arm-Add-a-matching-unregister-call.patch +++ b/queue/staging-vchiq_arm-Add-a-matching-unregister-call.patch @@ -1,4 +1,4 @@ -From 5d9272e28a9a6117fb63f5f930991304765caa32 Mon Sep 17 00:00:00 2001 +From 1b95c4b5fbd1b4430be68eedfea4951200e47997 Mon Sep 17 00:00:00 2001 From: Phil Elwell <phil@raspberrypi.com> Date: Mon, 29 Jun 2020 17:09:06 +0200 Subject: [PATCH] staging: vchiq_arm: Add a matching unregister call @@ -15,12 +15,13 @@ Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Link: https://lore.kernel.org/r/20200629150945.10720-9-nsaenzjulienne@suse.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index 28ea8c3a4cba..355590f1e130 100644 +index 6f6388c96bf6..4cf59696ac6f 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -@@ -2805,6 +2805,7 @@ static int vchiq_probe(struct platform_device *pdev) +@@ -3545,6 +3545,7 @@ static int vchiq_probe(struct platform_device *pdev) static int vchiq_remove(struct platform_device *pdev) { diff --git a/queue/svcrdma-Fix-page-leak-in-svc_rdma_recv_read_chunk.patch b/queue/svcrdma-Fix-page-leak-in-svc_rdma_recv_read_chunk.patch index f986479b..9625d31e 100644 --- a/queue/svcrdma-Fix-page-leak-in-svc_rdma_recv_read_chunk.patch +++ b/queue/svcrdma-Fix-page-leak-in-svc_rdma_recv_read_chunk.patch @@ -1,4 +1,4 @@ -From e814eecbe3bbeaa8b004d25a4b8974d232b765a9 Mon Sep 17 00:00:00 2001 +From ecdfc818d193f1967118d0602b6792e4a99185e5 Mon Sep 17 00:00:00 2001 From: Chuck Lever <chuck.lever@oracle.com> Date: Thu, 11 Jun 2020 12:44:56 -0400 Subject: [PATCH] svcrdma: Fix page leak in svc_rdma_recv_read_chunk() @@ -12,12 +12,13 @@ leaked. Errors in this path, however, are quite rare. Fixes: 07d0ff3b0cd2 ("svcrdma: Clean up Read chunk path") Signed-off-by: Chuck Lever <chuck.lever@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/sunrpc/xprtrdma/svc_rdma_rw.c b/net/sunrpc/xprtrdma/svc_rdma_rw.c -index 5eb35309ecef..83806fa94def 100644 +index 3f8b87d35570..04ec2a83af69 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_rw.c +++ b/net/sunrpc/xprtrdma/svc_rdma_rw.c -@@ -684,7 +684,6 @@ static int svc_rdma_build_read_chunk(struct svc_rqst *rqstp, +@@ -676,7 +676,6 @@ static int svc_rdma_build_read_chunk(struct svc_rqst *rqstp, struct svc_rdma_read_info *info, __be32 *p) { @@ -25,7 +26,7 @@ index 5eb35309ecef..83806fa94def 100644 int ret; ret = -EINVAL; -@@ -707,12 +706,6 @@ static int svc_rdma_build_read_chunk(struct svc_rqst *rqstp, +@@ -699,12 +698,6 @@ static int svc_rdma_build_read_chunk(struct svc_rqst *rqstp, info->ri_chunklen += rs_length; } @@ -38,7 +39,7 @@ index 5eb35309ecef..83806fa94def 100644 return ret; } -@@ -807,6 +800,26 @@ static int svc_rdma_build_pz_read_chunk(struct svc_rqst *rqstp, +@@ -799,6 +792,26 @@ static int svc_rdma_build_pz_read_chunk(struct svc_rqst *rqstp, return ret; } @@ -65,7 +66,7 @@ index 5eb35309ecef..83806fa94def 100644 /** * svc_rdma_recv_read_chunk - Pull a Read chunk from the client * @rdma: controlling RDMA transport -@@ -860,6 +873,7 @@ int svc_rdma_recv_read_chunk(struct svcxprt_rdma *rdma, struct svc_rqst *rqstp, +@@ -852,6 +865,7 @@ int svc_rdma_recv_read_chunk(struct svcxprt_rdma *rdma, struct svc_rqst *rqstp, ret = svc_rdma_post_chunk_ctxt(&info->ri_cc); if (ret < 0) goto out_err; diff --git a/queue/tools-bpftool-Fix-wrong-return-value-in-do_dump.patch b/queue/tools-bpftool-Fix-wrong-return-value-in-do_dump.patch index b6447922..271693a7 100644 --- a/queue/tools-bpftool-Fix-wrong-return-value-in-do_dump.patch +++ b/queue/tools-bpftool-Fix-wrong-return-value-in-do_dump.patch @@ -1,4 +1,4 @@ -From 041549b7b2c7811ec40e705c439211f00ade2dda Mon Sep 17 00:00:00 2001 +From f72bc0447702d1acd961cd93dd7d5f80bccafae7 Mon Sep 17 00:00:00 2001 From: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> Date: Sun, 2 Aug 2020 19:15:40 +0800 Subject: [PATCH] tools, bpftool: Fix wrong return value in do_dump() @@ -15,12 +15,13 @@ Reviewed-by: Tobias Klauser <tklauser@distanz.ch> Acked-by: Andrii Nakryiko <andriin@fb.com> Acked-by: John Fastabend <john.fastabend@gmail.com> Link: https://lore.kernel.org/bpf/20200802111540.5384-1-tianjia.zhang@linux.alibaba.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/tools/bpf/bpftool/btf.c b/tools/bpf/bpftool/btf.c -index fc9bc7a23db6..37c091308714 100644 +index 1fbf353364d6..5c67bbcdf914 100644 --- a/tools/bpf/bpftool/btf.c +++ b/tools/bpf/bpftool/btf.c -@@ -596,7 +596,7 @@ static int do_dump(int argc, char **argv) +@@ -539,7 +539,7 @@ static int do_dump(int argc, char **argv) goto done; } if (!btf) { diff --git a/queue/tools-build-Propagate-build-failures-from-tools-buil.patch b/queue/tools-build-Propagate-build-failures-from-tools-buil.patch index f0e69c34..3e7a2dba 100644 --- a/queue/tools-build-Propagate-build-failures-from-tools-buil.patch +++ b/queue/tools-build-Propagate-build-failures-from-tools-buil.patch @@ -1,4 +1,4 @@ -From a278f3d8191228212c553a5d4303fa603214b717 Mon Sep 17 00:00:00 2001 +From 35b82b15bbb5f5a85dafb7cdc4d743711cb2940d Mon Sep 17 00:00:00 2001 From: Andrii Nakryiko <andriin@fb.com> Date: Thu, 30 Jul 2020 19:42:44 -0700 Subject: [PATCH] tools, build: Propagate build failures from @@ -26,6 +26,7 @@ Signed-off-by: Andrii Nakryiko <andriin@fb.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Jiri Olsa <jolsa@redhat.com> Link: https://lore.kernel.org/bpf/20200731024244.872574-1-andriin@fb.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/tools/build/Build.include b/tools/build/Build.include index 9ec01f4454f9..585486e40995 100644 diff --git a/queue/tpm-Unify-the-mismatching-TPM-space-buffer-sizes.patch b/queue/tpm-Unify-the-mismatching-TPM-space-buffer-sizes.patch index a62d9a44..4ce36da8 100644 --- a/queue/tpm-Unify-the-mismatching-TPM-space-buffer-sizes.patch +++ b/queue/tpm-Unify-the-mismatching-TPM-space-buffer-sizes.patch @@ -1,4 +1,4 @@ -From 6501c13c655b4ab6ad5de5ec7e3037ea8b774e2b Mon Sep 17 00:00:00 2001 +From 90afb5601d81cf91ca1cb180b52ededd6cde8ecf Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Date: Fri, 3 Jul 2020 01:55:59 +0300 Subject: [PATCH] tpm: Unify the mismatching TPM space buffer sizes @@ -18,6 +18,7 @@ Fixes: 745b361e989a ("tpm: infrastructure for TPM spaces") Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com> Tested-by: Stefan Berger <stefanb@linux.ibm.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index b12ac1ae107b..61f9acc5d741 100644 diff --git a/queue/tracepoint-Mark-__tracepoint_string-s-__used.patch b/queue/tracepoint-Mark-__tracepoint_string-s-__used.patch index a014ddd4..ee0d563f 100644 --- a/queue/tracepoint-Mark-__tracepoint_string-s-__used.patch +++ b/queue/tracepoint-Mark-__tracepoint_string-s-__used.patch @@ -1,4 +1,4 @@ -From f3751ad0116fb6881f2c3c957d66a9327f69cefb Mon Sep 17 00:00:00 2001 +From 228e70708398c75b864f36c18f4ed0602f7c896b Mon Sep 17 00:00:00 2001 From: Nick Desaulniers <ndesaulniers@google.com> Date: Thu, 30 Jul 2020 15:45:54 -0700 Subject: [PATCH] tracepoint: Mark __tracepoint_string's __used @@ -29,12 +29,13 @@ Reported-by: Simon MacMullen <simonmacm@google.com> Suggested-by: Greg Hackmann <ghackmann@google.com> Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h -index a1fecf311621..3a5b717d92e8 100644 +index 1fb11daa5c53..57ce5af258a3 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h -@@ -361,7 +361,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) +@@ -362,7 +362,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) static const char *___tp_str __tracepoint_string = str; \ ___tp_str; \ }) diff --git a/queue/usb-bdc-Halt-controller-on-suspend.patch b/queue/usb-bdc-Halt-controller-on-suspend.patch index abab56fb..ef1f3397 100644 --- a/queue/usb-bdc-Halt-controller-on-suspend.patch +++ b/queue/usb-bdc-Halt-controller-on-suspend.patch @@ -1,4 +1,4 @@ -From 5fc453d7de3d0c345812453823a3a56783c5f82c Mon Sep 17 00:00:00 2001 +From 2bed8697e2291a614a74a4047932c9acd93c6b6b Mon Sep 17 00:00:00 2001 From: Danesh Petigara <danesh.petigara@broadcom.com> Date: Wed, 22 Jul 2020 13:07:45 -0400 Subject: [PATCH] usb: bdc: Halt controller on suspend @@ -18,12 +18,13 @@ Signed-off-by: Danesh Petigara <danesh.petigara@broadcom.com> Signed-off-by: Al Cooper <alcooperx@gmail.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Felipe Balbi <balbi@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/gadget/udc/bdc/bdc_core.c b/drivers/usb/gadget/udc/bdc/bdc_core.c -index d4ec1e37d50a..0f1617e34f38 100644 +index ed86e7a41276..b157a7abd39f 100644 --- a/drivers/usb/gadget/udc/bdc/bdc_core.c +++ b/drivers/usb/gadget/udc/bdc/bdc_core.c -@@ -603,9 +603,14 @@ static int bdc_remove(struct platform_device *pdev) +@@ -607,9 +607,14 @@ static int bdc_remove(struct platform_device *pdev) static int bdc_suspend(struct device *dev) { struct bdc *bdc = dev_get_drvdata(dev); diff --git a/queue/usb-core-fix-quirks_param_set-writing-to-a-const-poi.patch b/queue/usb-core-fix-quirks_param_set-writing-to-a-const-poi.patch index 3ef32fd6..90315989 100644 --- a/queue/usb-core-fix-quirks_param_set-writing-to-a-const-poi.patch +++ b/queue/usb-core-fix-quirks_param_set-writing-to-a-const-poi.patch @@ -1,4 +1,4 @@ -From b1b6bed3b5036509b449b5965285d5057ba42527 Mon Sep 17 00:00:00 2001 +From 6bae9c74d314f2c2a0515a3ec3a44d75ecf03a4f Mon Sep 17 00:00:00 2001 From: Kars Mulder <kerneldev@karsmulder.nl> Date: Tue, 7 Jul 2020 16:43:50 +0200 Subject: [PATCH] usb: core: fix quirks_param_set() writing to a const pointer @@ -18,9 +18,10 @@ Signed-off-by: Kars Mulder <kerneldev@karsmulder.nl> Link: https://lore.kernel.org/r/5ee2-5f048a00-21-618c5c00@230659773 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index 870df71d1827..7c1198f80c23 100644 +index e0b77674869c..c96c50faccf7 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -25,17 +25,23 @@ static unsigned int quirk_count; diff --git a/queue/usb-gadget-f_uac2-fix-AC-Interface-Header-Descriptor.patch b/queue/usb-gadget-f_uac2-fix-AC-Interface-Header-Descriptor.patch index ad570105..4768264a 100644 --- a/queue/usb-gadget-f_uac2-fix-AC-Interface-Header-Descriptor.patch +++ b/queue/usb-gadget-f_uac2-fix-AC-Interface-Header-Descriptor.patch @@ -1,4 +1,4 @@ -From a9cf8715180b18c62addbfe6f6267b8101903119 Mon Sep 17 00:00:00 2001 +From fa064f450147e063adb1608e94857dc9dba80728 Mon Sep 17 00:00:00 2001 From: Ruslan Bilovol <ruslan.bilovol@gmail.com> Date: Fri, 3 Jul 2020 16:49:03 +0300 Subject: [PATCH] usb: gadget: f_uac2: fix AC Interface Header Descriptor @@ -20,6 +20,7 @@ accordingly Fixes: 132fcb460839 ("usb: gadget: Add Audio Class 2.0 Driver") Signed-off-by: Ruslan Bilovol <ruslan.bilovol@gmail.com> Signed-off-by: Felipe Balbi <balbi@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c index db2d4980cb35..3633df6d7610 100644 diff --git a/queue/usb-gadget-net2280-fix-memory-leak-on-probe-error-ha.patch b/queue/usb-gadget-net2280-fix-memory-leak-on-probe-error-ha.patch index 73cfd429..bcc1c504 100644 --- a/queue/usb-gadget-net2280-fix-memory-leak-on-probe-error-ha.patch +++ b/queue/usb-gadget-net2280-fix-memory-leak-on-probe-error-ha.patch @@ -1,4 +1,4 @@ -From 2468c877da428ebfd701142c4cdfefcfb7d4c00e Mon Sep 17 00:00:00 2001 +From 5f6eb3d5860d65861ac37224901d3a5979c9dbda Mon Sep 17 00:00:00 2001 From: Evgeny Novikov <novikov@ispras.ru> Date: Tue, 21 Jul 2020 23:15:58 +0300 Subject: [PATCH] usb: gadget: net2280: fix memory leak on probe error handling @@ -15,12 +15,13 @@ 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/net2280.c b/drivers/usb/gadget/udc/net2280.c -index 5eff85eeaa5a..7530bd9a08c4 100644 +index b6bbe2e448ba..19de7392e17f 100644 --- a/drivers/usb/gadget/udc/net2280.c +++ b/drivers/usb/gadget/udc/net2280.c -@@ -3781,8 +3781,10 @@ static int net2280_probe(struct pci_dev *pdev, const struct pci_device_id *id) +@@ -3778,8 +3778,10 @@ static int net2280_probe(struct pci_dev *pdev, const struct pci_device_id *id) return 0; done: diff --git a/queue/usb-mtu3-clear-dual-mode-of-u3port-when-disable-devi.patch b/queue/usb-mtu3-clear-dual-mode-of-u3port-when-disable-devi.patch index af193055..cda02694 100644 --- a/queue/usb-mtu3-clear-dual-mode-of-u3port-when-disable-devi.patch +++ b/queue/usb-mtu3-clear-dual-mode-of-u3port-when-disable-devi.patch @@ -1,4 +1,4 @@ -From f1e51e99ed498d4aa9ae5df28e43d558ea627781 Mon Sep 17 00:00:00 2001 +From 2fd08bce1c46242b616d6fc8935dd8dacd27130f Mon Sep 17 00:00:00 2001 From: Chunfeng Yun <chunfeng.yun@mediatek.com> Date: Mon, 27 Jul 2020 15:14:59 +0800 Subject: [PATCH] usb: mtu3: clear dual mode of u3port when disable device @@ -11,12 +11,13 @@ will fail to enter sleep mode when suspend. Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> Link: https://lore.kernel.org/r/1595834101-13094-10-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/mtu3/mtu3_core.c b/drivers/usb/mtu3/mtu3_core.c -index 9e0b68b3920c..b3b459937566 100644 +index f8bd1d57e795..98b6b17fca64 100644 --- a/drivers/usb/mtu3/mtu3_core.c +++ b/drivers/usb/mtu3/mtu3_core.c -@@ -131,8 +131,12 @@ static void mtu3_device_disable(struct mtu3 *mtu) +@@ -130,8 +130,12 @@ static void mtu3_device_disable(struct mtu3 *mtu) mtu3_setbits(ibase, SSUSB_U2_CTRL(0), SSUSB_U2_PORT_DIS | SSUSB_U2_PORT_PDN); diff --git a/queue/video-fbdev-neofb-fix-memory-leak-in-neo_scan_monito.patch b/queue/video-fbdev-neofb-fix-memory-leak-in-neo_scan_monito.patch index e0cebf86..7b6846f3 100644 --- a/queue/video-fbdev-neofb-fix-memory-leak-in-neo_scan_monito.patch +++ b/queue/video-fbdev-neofb-fix-memory-leak-in-neo_scan_monito.patch @@ -1,4 +1,4 @@ -From edcb3895a751c762a18d25c8d9846ce9759ed7e1 Mon Sep 17 00:00:00 2001 +From a36f8e765d2f50b2d24e1f561126069ab3433e66 Mon Sep 17 00:00:00 2001 From: Evgeny Novikov <novikov@ispras.ru> Date: Tue, 30 Jun 2020 22:54:51 +0300 Subject: [PATCH] video: fbdev: neofb: fix memory leak in neo_scan_monitor() @@ -22,12 +22,13 @@ Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200630195451.18675-1-novikov@ispras.ru +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/video/fbdev/neofb.c b/drivers/video/fbdev/neofb.c -index f5a676bfd67a..09a20d4ab35f 100644 +index 5d3a444083f7..2018e1ca33eb 100644 --- a/drivers/video/fbdev/neofb.c +++ b/drivers/video/fbdev/neofb.c -@@ -1819,6 +1819,7 @@ static int neo_scan_monitor(struct fb_info *info) +@@ -1820,6 +1820,7 @@ static int neo_scan_monitor(struct fb_info *info) #else printk(KERN_ERR "neofb: Only 640x480, 800x600/480 and 1024x768 panels are currently supported\n"); diff --git a/queue/video-fbdev-savage-fix-memory-leak-on-error-handling.patch b/queue/video-fbdev-savage-fix-memory-leak-on-error-handling.patch index 07d9f4c4..8f9a8c81 100644 --- a/queue/video-fbdev-savage-fix-memory-leak-on-error-handling.patch +++ b/queue/video-fbdev-savage-fix-memory-leak-on-error-handling.patch @@ -1,4 +1,4 @@ -From e8d35898a78e34fc854ed9680bc3f9caedab08cd Mon Sep 17 00:00:00 2001 +From 9c9f00d836f07eca94911da15fca71c5e608faf9 Mon Sep 17 00:00:00 2001 From: Evgeny Novikov <novikov@ispras.ru> Date: Fri, 19 Jun 2020 19:21:36 +0300 Subject: [PATCH] video: fbdev: savage: fix memory leak on error handling path @@ -20,12 +20,13 @@ Signed-off-by: Evgeny Novikov <novikov@ispras.ru> Cc: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200619162136.9010-1-novikov@ispras.ru +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/video/fbdev/savage/savagefb_driver.c b/drivers/video/fbdev/savage/savagefb_driver.c -index 3c8ae87f0ea7..3fd87aeb6c79 100644 +index 47b78f0138c3..cb608b76cc40 100644 --- a/drivers/video/fbdev/savage/savagefb_driver.c +++ b/drivers/video/fbdev/savage/savagefb_driver.c -@@ -2157,6 +2157,8 @@ static int savage_init_fb_info(struct fb_info *info, struct pci_dev *dev, +@@ -2158,6 +2158,8 @@ static int savage_init_fb_info(struct fb_info *info, struct pci_dev *dev, info->flags |= FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_IMAGEBLIT; diff --git a/queue/video-fbdev-sm712fb-fix-an-issue-about-iounmap-for-a.patch b/queue/video-fbdev-sm712fb-fix-an-issue-about-iounmap-for-a.patch index b8f27f9c..b251c66a 100644 --- a/queue/video-fbdev-sm712fb-fix-an-issue-about-iounmap-for-a.patch +++ b/queue/video-fbdev-sm712fb-fix-an-issue-about-iounmap-for-a.patch @@ -1,4 +1,4 @@ -From 98bd4f72988646c35569e1e838c0ab80d06c77f6 Mon Sep 17 00:00:00 2001 +From 050614c2b2162b1f36b12ff6257b09fd5938fa9c Mon Sep 17 00:00:00 2001 From: Dejin Zheng <zhengdejin5@gmail.com> Date: Thu, 23 Apr 2020 00:07:19 +0800 Subject: [PATCH] video: fbdev: sm712fb: fix an issue about iounmap for a wrong @@ -18,9 +18,10 @@ Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200422160719.27763-1-zhengdejin5@gmail.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/video/fbdev/sm712fb.c b/drivers/video/fbdev/sm712fb.c -index 6a1b4a853d9e..8cd655d6d628 100644 +index f1dcc6766d1e..1781ca697f66 100644 --- a/drivers/video/fbdev/sm712fb.c +++ b/drivers/video/fbdev/sm712fb.c @@ -1429,6 +1429,8 @@ static int smtc_map_smem(struct smtcfb_info *sfb, diff --git a/queue/video-pxafb-Fix-the-function-used-to-balance-a-dma_a.patch b/queue/video-pxafb-Fix-the-function-used-to-balance-a-dma_a.patch index 7a4c9623..f93162c4 100644 --- a/queue/video-pxafb-Fix-the-function-used-to-balance-a-dma_a.patch +++ b/queue/video-pxafb-Fix-the-function-used-to-balance-a-dma_a.patch @@ -1,4 +1,4 @@ -From 499a2c41b954518c372873202d5e7714e22010c4 Mon Sep 17 00:00:00 2001 +From d357f9d777ba4d9e9ce800509bc5e5e07740c393 Mon Sep 17 00:00:00 2001 From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Date: Wed, 29 Apr 2020 10:45:05 +0200 Subject: [PATCH] video: pxafb: Fix the function used to balance a @@ -22,12 +22,13 @@ cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Cc: Eric Miao <eric.miao@marvell.com> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200429084505.108897-1-christophe.jaillet@wanadoo.fr +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c -index 00b96a78676e..6f972bed410a 100644 +index d59c8a59f582..90dee3e6f8bc 100644 --- a/drivers/video/fbdev/pxafb.c +++ b/drivers/video/fbdev/pxafb.c -@@ -2417,8 +2417,8 @@ static int pxafb_remove(struct platform_device *dev) +@@ -2446,8 +2446,8 @@ static int pxafb_remove(struct platform_device *dev) free_pages_exact(fbi->video_mem, fbi->video_mem_size); diff --git a/queue/wl1251-fix-always-return-0-error.patch b/queue/wl1251-fix-always-return-0-error.patch index 19ea9377..402304a2 100644 --- a/queue/wl1251-fix-always-return-0-error.patch +++ b/queue/wl1251-fix-always-return-0-error.patch @@ -1,4 +1,4 @@ -From 20e6421344b5bc2f97b8e2db47b6994368417904 Mon Sep 17 00:00:00 2001 +From 5b50fa87a8226d2885155515585bdbb96713fd71 Mon Sep 17 00:00:00 2001 From: Wang Hai <wanghai38@huawei.com> Date: Thu, 30 Jul 2020 15:39:39 +0800 Subject: [PATCH] wl1251: fix always return 0 error @@ -13,6 +13,7 @@ Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wang Hai <wanghai38@huawei.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20200730073939.33704-1-wanghai38@huawei.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/ti/wl1251/event.c b/drivers/net/wireless/ti/wl1251/event.c index 850864dbafa1..e6d426edab56 100644 diff --git a/queue/x86-fsgsbase-64-Fix-NULL-deref-in-86_fsgsbase_read_t.patch b/queue/x86-fsgsbase-64-Fix-NULL-deref-in-86_fsgsbase_read_t.patch index 16ac1ceb..471be2ef 100644 --- a/queue/x86-fsgsbase-64-Fix-NULL-deref-in-86_fsgsbase_read_t.patch +++ b/queue/x86-fsgsbase-64-Fix-NULL-deref-in-86_fsgsbase_read_t.patch @@ -1,4 +1,4 @@ -From 8ab49526b53d3172d1d8dd03a75c7d1f5bd21239 Mon Sep 17 00:00:00 2001 +From 4e3699b230a99850445dcb5c986890253a048b87 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Fri, 14 Aug 2020 11:16:17 -0700 Subject: [PATCH] x86/fsgsbase/64: Fix NULL deref in 86_fsgsbase_read_task @@ -50,12 +50,13 @@ Cc: Rik van Riel <riel@surriel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@kernel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c -index d6f946707270..9afefe325acb 100644 +index 250e4c4ac6d9..d02874cddda3 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c -@@ -390,7 +390,7 @@ unsigned long x86_fsgsbase_read_task(struct task_struct *task, +@@ -326,7 +326,7 @@ static unsigned long x86_fsgsbase_read_task(struct task_struct *task, */ mutex_lock(&task->mm->context.lock); ldt = task->mm->context.ldt; diff --git a/queue/x86-mce-inject-Fix-a-wrong-assignment-of-i_mce.statu.patch b/queue/x86-mce-inject-Fix-a-wrong-assignment-of-i_mce.statu.patch index 606bbb85..592fd6b4 100644 --- a/queue/x86-mce-inject-Fix-a-wrong-assignment-of-i_mce.statu.patch +++ b/queue/x86-mce-inject-Fix-a-wrong-assignment-of-i_mce.statu.patch @@ -1,4 +1,4 @@ -From 5d7f7d1d5e01c22894dee7c9c9266500478dca99 Mon Sep 17 00:00:00 2001 +From 907558244842eed604353601539fa83ae5631c54 Mon Sep 17 00:00:00 2001 From: Zhenzhong Duan <zhenzhong.duan@gmail.com> Date: Thu, 11 Jun 2020 10:32:38 +0800 Subject: [PATCH] x86/mce/inject: Fix a wrong assignment of i_mce.status @@ -13,9 +13,10 @@ Signed-off-by: Zhenzhong Duan <zhenzhong.duan@gmail.com> Signed-off-by: Borislav Petkov <bp@suse.de> Acked-by: Yazen Ghannam <yazen.ghannam@amd.com> Link: https://lkml.kernel.org/r/20200611023238.3830-1-zhenzhong.duan@gmail.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c -index 0593b192eb8f..7843ab3fde09 100644 +index 5d108f70f315..799b74b1582c 100644 --- a/arch/x86/kernel/cpu/mce/inject.c +++ b/arch/x86/kernel/cpu/mce/inject.c @@ -511,7 +511,7 @@ static void do_inject(void) diff --git a/queue/xen-balloon-fix-accounting-in-alloc_xenballooned_pag.patch b/queue/xen-balloon-fix-accounting-in-alloc_xenballooned_pag.patch index 9942db0b..ac852ab0 100644 --- a/queue/xen-balloon-fix-accounting-in-alloc_xenballooned_pag.patch +++ b/queue/xen-balloon-fix-accounting-in-alloc_xenballooned_pag.patch @@ -1,4 +1,4 @@ -From 1951fa33ec259abdf3497bfee7b63e7ddbb1a394 Mon Sep 17 00:00:00 2001 +From 392c873c5b20feb70f352a81667eb48ad58b000d Mon Sep 17 00:00:00 2001 From: Roger Pau Monne <roger.pau@citrix.com> Date: Mon, 27 Jul 2020 11:13:39 +0200 Subject: [PATCH] xen/balloon: fix accounting in alloc_xenballooned_pages error @@ -19,12 +19,13 @@ Reviewed-by: Juergen Gross <jgross@suse.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20200727091342.52325-2-roger.pau@citrix.com Signed-off-by: Juergen Gross <jgross@suse.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c -index 77c57568e5d7..3cb10ed32557 100644 +index b5c8b70380bd..789cac948ef2 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c -@@ -630,6 +630,12 @@ int alloc_xenballooned_pages(int nr_pages, struct page **pages) +@@ -641,6 +641,12 @@ int alloc_xenballooned_pages(int nr_pages, struct page **pages) out_undo: mutex_unlock(&balloon_mutex); free_xenballooned_pages(pgno, pages); diff --git a/queue/xen-balloon-make-the-balloon-wait-interruptible.patch b/queue/xen-balloon-make-the-balloon-wait-interruptible.patch index d4d45cdd..7064a3bf 100644 --- a/queue/xen-balloon-make-the-balloon-wait-interruptible.patch +++ b/queue/xen-balloon-make-the-balloon-wait-interruptible.patch @@ -1,4 +1,4 @@ -From 88a479ff6ef8af7f07e11593d58befc644244ff7 Mon Sep 17 00:00:00 2001 +From c690df7535d3c783cea245ef85b75ba1082f7365 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne <roger.pau@citrix.com> Date: Mon, 27 Jul 2020 11:13:40 +0200 Subject: [PATCH] xen/balloon: make the balloon wait interruptible @@ -16,12 +16,13 @@ Reviewed-by: Juergen Gross <jgross@suse.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20200727091342.52325-3-roger.pau@citrix.com Signed-off-by: Juergen Gross <jgross@suse.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c -index 3cb10ed32557..292413b27575 100644 +index 789cac948ef2..dcc255226e21 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c -@@ -568,11 +568,13 @@ static int add_ballooned_pages(int nr_pages) +@@ -578,11 +578,13 @@ static int add_ballooned_pages(int nr_pages) if (xen_hotplug_unpopulated) { st = reserve_additional_memory(); if (st != BP_ECANCELED) { diff --git a/queue/xen-gntdev-Fix-dmabuf-import-with-non-zero-sgt-offse.patch b/queue/xen-gntdev-Fix-dmabuf-import-with-non-zero-sgt-offse.patch index 2836ed85..b21adcb8 100644 --- a/queue/xen-gntdev-Fix-dmabuf-import-with-non-zero-sgt-offse.patch +++ b/queue/xen-gntdev-Fix-dmabuf-import-with-non-zero-sgt-offse.patch @@ -1,4 +1,4 @@ -From 5fa4e6f1c2d8c9a4e47e1931b42893172d388f2b Mon Sep 17 00:00:00 2001 +From 81765d028175bba12997d7f74c392f547a930c45 Mon Sep 17 00:00:00 2001 From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> Date: Thu, 13 Aug 2020 09:21:09 +0300 Subject: [PATCH] xen/gntdev: Fix dmabuf import with non-zero sgt offset @@ -16,12 +16,13 @@ Acked-by: Juergen Gross <jgross@suse.com> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200813062113.11030-2-andr2000@gmail.com Signed-off-by: Juergen Gross <jgross@suse.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/xen/gntdev-dmabuf.c b/drivers/xen/gntdev-dmabuf.c -index 75d3bb948bf3..b1b6eebafd5d 100644 +index 2c4f324f8626..da799929087d 100644 --- a/drivers/xen/gntdev-dmabuf.c +++ b/drivers/xen/gntdev-dmabuf.c -@@ -613,6 +613,14 @@ dmabuf_imp_to_refs(struct gntdev_dmabuf_priv *priv, struct device *dev, +@@ -641,6 +641,14 @@ dmabuf_imp_to_refs(struct gntdev_dmabuf_priv *priv, struct device *dev, goto fail_detach; } diff --git a/queue/xfs-don-t-eat-an-EIO-ENOSPC-writeback-error-when-scr.patch b/queue/xfs-don-t-eat-an-EIO-ENOSPC-writeback-error-when-scr.patch index 5c3ad11a..62165ac1 100644 --- a/queue/xfs-don-t-eat-an-EIO-ENOSPC-writeback-error-when-scr.patch +++ b/queue/xfs-don-t-eat-an-EIO-ENOSPC-writeback-error-when-scr.patch @@ -1,4 +1,4 @@ -From eb0efe5063bb10bcb653e4f8e92a74719c03a347 Mon Sep 17 00:00:00 2001 +From cc69d16dbd7b2dc7bc1707bf6f5f11bced5a1042 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" <darrick.wong@oracle.com> Date: Mon, 29 Jun 2020 14:47:17 -0700 Subject: [PATCH] xfs: don't eat an EIO/ENOSPC writeback error when scrubbing @@ -25,12 +25,13 @@ Fixes: 99d9d8d05da2 ("xfs: scrub inode block mappings") Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/xfs/scrub/bmap.c b/fs/xfs/scrub/bmap.c -index 7badd6dfe544..955302e7cdde 100644 +index a703cd58a90e..3fe938968348 100644 --- a/fs/xfs/scrub/bmap.c +++ b/fs/xfs/scrub/bmap.c -@@ -45,9 +45,27 @@ xchk_setup_inode_bmap( +@@ -53,9 +53,27 @@ xchk_setup_inode_bmap( */ if (S_ISREG(VFS_I(sc->ip)->i_mode) && sc->sm->sm_type == XFS_SCRUB_TYPE_BMBTD) { diff --git a/queue/xfs-fix-inode-allocation-block-res-calculation-prece.patch b/queue/xfs-fix-inode-allocation-block-res-calculation-prece.patch index a79a082d..f51da837 100644 --- a/queue/xfs-fix-inode-allocation-block-res-calculation-prece.patch +++ b/queue/xfs-fix-inode-allocation-block-res-calculation-prece.patch @@ -1,4 +1,4 @@ -From 31de777fbcbbb6400fa3bc9df31d2f12f66ec428 Mon Sep 17 00:00:00 2001 +From dac9b35094b2fc001f6a2f41476951781a1ba022 Mon Sep 17 00:00:00 2001 From: Brian Foster <bfoster@redhat.com> Date: Wed, 15 Jul 2020 18:44:50 -0700 Subject: [PATCH] xfs: fix inode allocation block res calculation precedence @@ -21,6 +21,7 @@ Signed-off-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Christoph Hellwig <hch@lst.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/xfs/libxfs/xfs_trans_space.h b/fs/xfs/libxfs/xfs_trans_space.h index a62fb950bef1..0c02d76eeb4d 100644 diff --git a/queue/xfs-fix-reflink-quota-reservation-accounting-error.patch b/queue/xfs-fix-reflink-quota-reservation-accounting-error.patch index 08f75a40..b819eda6 100644 --- a/queue/xfs-fix-reflink-quota-reservation-accounting-error.patch +++ b/queue/xfs-fix-reflink-quota-reservation-accounting-error.patch @@ -1,4 +1,4 @@ -From 83895227aba1ade33e81f586aa7b6b1e143096a5 Mon Sep 17 00:00:00 2001 +From f43ec993794aa5ffbbc3de2860ebc4f622695aa9 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" <darrick.wong@oracle.com> Date: Mon, 29 Jun 2020 14:47:18 -0700 Subject: [PATCH] xfs: fix reflink quota reservation accounting error @@ -13,12 +13,13 @@ rearranging things. Fixes: 862bb360ef56 ("xfs: reflink extents from one file to another") Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Brian Foster <bfoster@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c -index 107bf2a2f344..d89201d40891 100644 +index 96add09582db..5919e1714d5f 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c -@@ -1003,6 +1003,7 @@ xfs_reflink_remap_extent( +@@ -1023,6 +1023,7 @@ xfs_reflink_remap_extent( xfs_filblks_t rlen; xfs_filblks_t unmap_len; xfs_off_t newlen; @@ -26,7 +27,7 @@ index 107bf2a2f344..d89201d40891 100644 int error; unmap_len = irec->br_startoff + irec->br_blockcount - destoff; -@@ -1025,13 +1026,19 @@ xfs_reflink_remap_extent( +@@ -1045,13 +1046,19 @@ xfs_reflink_remap_extent( xfs_ilock(ip, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, ip, 0); |