re-export commits with SOB lines added Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/queue/ACPI-video-Use-native-backlight-on-Acer-Aspire-5783z.patch b/queue/ACPI-video-Use-native-backlight-on-Acer-Aspire-5783z.patch index 7862e7e..7c43aab 100644 --- a/queue/ACPI-video-Use-native-backlight-on-Acer-Aspire-5783z.patch +++ b/queue/ACPI-video-Use-native-backlight-on-Acer-Aspire-5783z.patch
@@ -1,4 +1,4 @@ -From 1c8fbc1f9bfb804ef2f0d4ee9397ab800e33f23a Mon Sep 17 00:00:00 2001 +From 98cb4af5405e279a29d746760b45fe29d73107bc Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede@redhat.com> Date: Tue, 31 Mar 2020 14:36:23 +0200 Subject: [PATCH] ACPI: video: Use native backlight on Acer Aspire 5783z @@ -14,12 +14,13 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.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/video_detect.c b/drivers/acpi/video_detect.c -index 419f814d596a..b4994e50608d 100644 +index e63fd7bfd3a5..8daeeb5e3eb6 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c -@@ -352,6 +352,15 @@ static const struct dmi_system_id video_detect_dmi_table[] = { +@@ -336,6 +336,15 @@ static const struct dmi_system_id video_detect_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Precision 7510"), }, },
diff --git a/queue/ACPI-video-Use-native-backlight-on-Acer-TravelMate-5.patch b/queue/ACPI-video-Use-native-backlight-on-Acer-TravelMate-5.patch index e06159c..56fd020 100644 --- a/queue/ACPI-video-Use-native-backlight-on-Acer-TravelMate-5.patch +++ b/queue/ACPI-video-Use-native-backlight-on-Acer-TravelMate-5.patch
@@ -1,4 +1,4 @@ -From c41c36e900a337b4132b12ccabc97f5578248b44 Mon Sep 17 00:00:00 2001 +From b86464c32e6e9dbb4341da3c7faf4f628cc066ea Mon Sep 17 00:00:00 2001 From: Paul Menzel <pmenzel@molgen.mpg.de> Date: Fri, 22 May 2020 14:22:28 +0200 Subject: [PATCH] ACPI: video: Use native backlight on Acer TravelMate 5735Z @@ -27,12 +27,13 @@ Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de> 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/video_detect.c b/drivers/acpi/video_detect.c -index b4994e50608d..2499d7e3c710 100644 +index 8daeeb5e3eb6..5bcb4c01ec5f 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c -@@ -361,6 +361,16 @@ static const struct dmi_system_id video_detect_dmi_table[] = { +@@ -345,6 +345,16 @@ static const struct dmi_system_id video_detect_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "JV50"), }, },
diff --git a/queue/ALSA-hda-realtek-Enable-Speaker-for-ASUS-UX533-and-U.patch b/queue/ALSA-hda-realtek-Enable-Speaker-for-ASUS-UX533-and-U.patch index 26b2626..c34c876 100644 --- a/queue/ALSA-hda-realtek-Enable-Speaker-for-ASUS-UX533-and-U.patch +++ b/queue/ALSA-hda-realtek-Enable-Speaker-for-ASUS-UX533-and-U.patch
@@ -1,4 +1,4 @@ -From 473fbe13fd6f9082e413aea37e624ecbce5463cc Mon Sep 17 00:00:00 2001 +From 53697f5f0dc46c33bfd18e79af4cc1ec93fa277d Mon Sep 17 00:00:00 2001 From: Kailang Yang <kailang@realtek.com> Date: Thu, 16 Jul 2020 14:42:33 +0800 Subject: [PATCH] ALSA: hda/realtek - Enable Speaker for ASUS UX533 and UX534 @@ -14,12 +14,13 @@ Signed-off-by: Kailang Yang <kailang@realtek.com> Link: https://lore.kernel.org/r/80334402a93b48e385f8f4841b59ae09@realtek.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 66e98a5cfea2..fff56fe8caf1 100644 +index 30d3826d5050..08c95f2eb6cb 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c -@@ -7136,6 +7136,8 @@ static const struct hda_fixup alc269_fixups[] = { +@@ -7082,6 +7082,8 @@ static const struct hda_fixup alc269_fixups[] = { /* Set EAPD high */ { 0x20, AC_VERB_SET_COEF_INDEX, 0x40 }, { 0x20, AC_VERB_SET_PROC_COEF, 0x8800 },
diff --git a/queue/ALSA-hda-realtek-Enable-Speaker-for-ASUS-UX563.patch b/queue/ALSA-hda-realtek-Enable-Speaker-for-ASUS-UX563.patch index 632a314..8a7980d 100644 --- a/queue/ALSA-hda-realtek-Enable-Speaker-for-ASUS-UX563.patch +++ b/queue/ALSA-hda-realtek-Enable-Speaker-for-ASUS-UX563.patch
@@ -1,4 +1,4 @@ -From 158ae2f5e6fead30be1f0c203037f5556871513b Mon Sep 17 00:00:00 2001 +From 559d24346c10f6148982b2c578262605d4543f27 Mon Sep 17 00:00:00 2001 From: Kailang Yang <kailang@realtek.com> Date: Thu, 16 Jul 2020 15:21:59 +0800 Subject: [PATCH] ALSA: hda/realtek - Enable Speaker for ASUS UX563 @@ -13,12 +13,13 @@ Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/96dee3ab01a04c28a7b44061e88009dd@realtek.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 fff56fe8caf1..45df33d1bd1a 100644 +index 08c95f2eb6cb..a110985c9c44 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c -@@ -7551,6 +7551,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -7497,6 +7497,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK), SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC), SND_PCI_QUIRK(0x1043, 0x18f1, "Asus FX505DT", ALC256_FIXUP_ASUS_HEADSET_MIC),
diff --git a/queue/ALSA-hda-realtek-Enable-headset-mic-of-Acer-TravelMa.patch b/queue/ALSA-hda-realtek-Enable-headset-mic-of-Acer-TravelMa.patch index 9d4fd50..36ef198 100644 --- a/queue/ALSA-hda-realtek-Enable-headset-mic-of-Acer-TravelMa.patch +++ b/queue/ALSA-hda-realtek-Enable-headset-mic-of-Acer-TravelMa.patch
@@ -1,4 +1,4 @@ -From f50a121d2f32bccc1d6b94df925a1ce44ea7eff7 Mon Sep 17 00:00:00 2001 +From 3e2cb5a9afbfdcbc6f5a14c68c50416a6976bf8c Mon Sep 17 00:00:00 2001 From: Jian-Hong Pan <jian-hong@endlessm.com> Date: Mon, 13 Jul 2020 14:04:22 +0800 Subject: [PATCH] ALSA: hda/realtek: Enable headset mic of Acer TravelMate @@ -15,12 +15,13 @@ Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200713060421.62435-1-jian-hong@endlessm.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 876d5cb75437..66e98a5cfea2 100644 +index 885661f31cbe..30d3826d5050 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c -@@ -6153,6 +6153,7 @@ enum { +@@ -6115,6 +6115,7 @@ enum { ALC269VC_FIXUP_ACER_HEADSET_MIC, ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE, ALC289_FIXUP_ASUS_G401, @@ -28,7 +29,7 @@ }; static const struct hda_fixup alc269_fixups[] = { -@@ -7367,6 +7368,15 @@ static const struct hda_fixup alc269_fixups[] = { +@@ -7313,6 +7314,15 @@ static const struct hda_fixup alc269_fixups[] = { { } }, }, @@ -44,7 +45,7 @@ }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { -@@ -7395,6 +7405,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -7341,6 +7351,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1025, 0x1308, "Acer Aspire Z24-890", ALC286_FIXUP_ACER_AIO_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x132a, "Acer TravelMate B114-21", ALC233_FIXUP_ACER_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x1330, "Acer TravelMate X514-51T", ALC255_FIXUP_ACER_HEADSET_MIC),
diff --git a/queue/ALSA-hda-realtek-change-to-suitable-link-model-for-A.patch b/queue/ALSA-hda-realtek-change-to-suitable-link-model-for-A.patch index cbd8403..e2923f3 100644 --- a/queue/ALSA-hda-realtek-change-to-suitable-link-model-for-A.patch +++ b/queue/ALSA-hda-realtek-change-to-suitable-link-model-for-A.patch
@@ -1,4 +1,4 @@ -From ef9ddb9dc4f8b1da3b975918cd1fd98ec055b918 Mon Sep 17 00:00:00 2001 +From 6b109fa39a19ff388f881bf5fba8d1de6db86279 Mon Sep 17 00:00:00 2001 From: Kailang Yang <kailang@realtek.com> Date: Fri, 10 Jul 2020 15:31:11 +0800 Subject: [PATCH] ALSA: hda/realtek - change to suitable link model for ASUS @@ -13,12 +13,13 @@ Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/d05bcff170784ec7bb35023407148161@realtek.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 194ffa8c66ce..7aaf248a84c6 100644 +index 8a8da01bb6f4..3f73ba87098b 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c -@@ -7117,7 +7117,7 @@ static const struct hda_fixup alc269_fixups[] = { +@@ -7063,7 +7063,7 @@ static const struct hda_fixup alc269_fixups[] = { { } }, .chained = true, @@ -27,7 +28,7 @@ }, [ALC294_FIXUP_ASUS_HEADSET_MIC] = { .type = HDA_FIXUP_PINS, -@@ -7126,7 +7126,7 @@ static const struct hda_fixup alc269_fixups[] = { +@@ -7072,7 +7072,7 @@ static const struct hda_fixup alc269_fixups[] = { { } }, .chained = true,
diff --git a/queue/ALSA-hda-realtek-enable-headset-mic-of-ASUS-ROG-Zeph-1.patch b/queue/ALSA-hda-realtek-enable-headset-mic-of-ASUS-ROG-Zeph-1.patch index 3d1833f..7e27f6c 100644 --- a/queue/ALSA-hda-realtek-enable-headset-mic-of-ASUS-ROG-Zeph-1.patch +++ b/queue/ALSA-hda-realtek-enable-headset-mic-of-ASUS-ROG-Zeph-1.patch
@@ -1,4 +1,4 @@ -From 4b43d05a1978a93a19374c6e6b817c9c1ff4ba4b Mon Sep 17 00:00:00 2001 +From 8c1d6ffb92ca8b4a966f4bbfd067125149daa130 Mon Sep 17 00:00:00 2001 From: Armas Spann <zappel@retarded.farm> Date: Fri, 24 Jul 2020 16:06:16 +0200 Subject: [PATCH] ALSA: hda/realtek: enable headset mic of ASUS ROG Zephyrus @@ -16,12 +16,13 @@ Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200724140616.298892-1-zappel@retarded.farm 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 1b2d8e56390a..a2c48a7f4594 100644 +index a110985c9c44..e992bde4d87f 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c -@@ -6153,6 +6153,7 @@ enum { +@@ -6115,6 +6115,7 @@ enum { ALC269VC_FIXUP_ACER_HEADSET_MIC, ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE, ALC289_FIXUP_ASUS_G401, @@ -29,7 +30,7 @@ ALC256_FIXUP_ACER_MIC_NO_PRESENCE, }; -@@ -7370,6 +7371,13 @@ static const struct hda_fixup alc269_fixups[] = { +@@ -7316,6 +7317,13 @@ static const struct hda_fixup alc269_fixups[] = { { } }, }, @@ -43,7 +44,7 @@ [ALC256_FIXUP_ACER_MIC_NO_PRESENCE] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl[]) { -@@ -7561,6 +7569,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -7507,6 +7515,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC),
diff --git a/queue/ALSA-hda-realtek-enable-headset-mic-of-ASUS-ROG-Zeph.patch b/queue/ALSA-hda-realtek-enable-headset-mic-of-ASUS-ROG-Zeph.patch index b905c85..e71ba93 100644 --- a/queue/ALSA-hda-realtek-enable-headset-mic-of-ASUS-ROG-Zeph.patch +++ b/queue/ALSA-hda-realtek-enable-headset-mic-of-ASUS-ROG-Zeph.patch
@@ -1,4 +1,4 @@ -From ff53664daff2a65f4bf2479ac56dfb3e908deff0 Mon Sep 17 00:00:00 2001 +From a2a62b045b14ec67b559b155be18b9163f9be92c Mon Sep 17 00:00:00 2001 From: Armas Spann <zappel@retarded.farm> Date: Sat, 11 Jul 2020 13:05:57 +0200 Subject: [PATCH] ALSA: hda/realtek: enable headset mic of ASUS ROG Zephyrus @@ -16,12 +16,13 @@ Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200711110557.18681-1-zappel@retarded.farm 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 7aaf248a84c6..876d5cb75437 100644 +index 3f73ba87098b..885661f31cbe 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c -@@ -6152,6 +6152,7 @@ enum { +@@ -6114,6 +6114,7 @@ enum { ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS, ALC269VC_FIXUP_ACER_HEADSET_MIC, ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE, @@ -29,7 +30,7 @@ }; static const struct hda_fixup alc269_fixups[] = { -@@ -7359,6 +7360,13 @@ static const struct hda_fixup alc269_fixups[] = { +@@ -7305,6 +7306,13 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC269_FIXUP_HEADSET_MIC }, @@ -43,7 +44,7 @@ }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { -@@ -7539,6 +7547,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -7485,6 +7493,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC),
diff --git a/queue/ALSA-hda-realtek-typo_fix-enable-headset-mic-of-ASUS.patch b/queue/ALSA-hda-realtek-typo_fix-enable-headset-mic-of-ASUS.patch index defa27d..8e61c0e 100644 --- a/queue/ALSA-hda-realtek-typo_fix-enable-headset-mic-of-ASUS.patch +++ b/queue/ALSA-hda-realtek-typo_fix-enable-headset-mic-of-ASUS.patch
@@ -1,4 +1,4 @@ -From 293a92c1d9913248b9987b68f3a5d6d2f0aae62b Mon Sep 17 00:00:00 2001 +From 396eb3e76ff753c665b2735a4b656a0e5ea42333 Mon Sep 17 00:00:00 2001 From: Armas Spann <zappel@retarded.farm> Date: Fri, 24 Jul 2020 16:08:37 +0200 Subject: [PATCH] ALSA: hda/realtek: typo_fix: enable headset mic of ASUS ROG @@ -13,12 +13,13 @@ Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200724140837.302763-1-zappel@retarded.farm 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 a2c48a7f4594..3f2512942daf 100644 +index e992bde4d87f..fd92d00aa3b9 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c -@@ -6152,7 +6152,7 @@ enum { +@@ -6114,7 +6114,7 @@ enum { ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS, ALC269VC_FIXUP_ACER_HEADSET_MIC, ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE, @@ -27,7 +28,7 @@ ALC289_FIXUP_ASUS_GA502, ALC256_FIXUP_ACER_MIC_NO_PRESENCE, }; -@@ -7364,7 +7364,7 @@ static const struct hda_fixup alc269_fixups[] = { +@@ -7310,7 +7310,7 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC269_FIXUP_HEADSET_MIC }, @@ -36,7 +37,7 @@ .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl[]) { { 0x19, 0x03a11020 }, /* headset mic with jack detect */ -@@ -7570,7 +7570,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -7516,7 +7516,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC), SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502),
diff --git a/queue/ALSA-line6-Perform-sanity-check-for-each-URB-creatio.patch b/queue/ALSA-line6-Perform-sanity-check-for-each-URB-creatio.patch index 030939d..74c0afd 100644 --- a/queue/ALSA-line6-Perform-sanity-check-for-each-URB-creatio.patch +++ b/queue/ALSA-line6-Perform-sanity-check-for-each-URB-creatio.patch
@@ -1,4 +1,4 @@ -From 6e8a914ad619042c5f25a4feb663357c4170fd8d Mon Sep 17 00:00:00 2001 +From fc0b879aba6b0c16bc593455ba5b4aa1cd0480d4 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai@suse.de> Date: Fri, 10 Jul 2020 15:33:51 +0200 Subject: [PATCH] ALSA: line6: Perform sanity check for each URB creation @@ -16,12 +16,13 @@ Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/s5hv9iv4hq8.wl-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/usb/line6/capture.c b/sound/usb/line6/capture.c -index 663d608c4287..970c9bdce0b2 100644 +index 82abef3fe90d..4b6e99e055dc 100644 --- a/sound/usb/line6/capture.c +++ b/sound/usb/line6/capture.c -@@ -286,6 +286,8 @@ int line6_create_audio_in_urbs(struct snd_line6_pcm *line6pcm) +@@ -287,6 +287,8 @@ int line6_create_audio_in_urbs(struct snd_line6_pcm *line6pcm) urb->interval = LINE6_ISO_INTERVAL; urb->error_count = 0; urb->complete = audio_in_callback; @@ -31,10 +32,10 @@ return 0; diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c -index 01930ce7bd75..8233c61e23f1 100644 +index 2e8ead3f9bc2..797ced329b79 100644 --- a/sound/usb/line6/playback.c +++ b/sound/usb/line6/playback.c -@@ -431,6 +431,8 @@ int line6_create_audio_out_urbs(struct snd_line6_pcm *line6pcm) +@@ -432,6 +432,8 @@ int line6_create_audio_out_urbs(struct snd_line6_pcm *line6pcm) urb->interval = LINE6_ISO_INTERVAL; urb->error_count = 0; urb->complete = audio_out_callback;
diff --git a/queue/ALSA-line6-Sync-the-pending-work-cancel-at-disconnec.patch b/queue/ALSA-line6-Sync-the-pending-work-cancel-at-disconnec.patch index ff3a44b..054d74a 100644 --- a/queue/ALSA-line6-Sync-the-pending-work-cancel-at-disconnec.patch +++ b/queue/ALSA-line6-Sync-the-pending-work-cancel-at-disconnec.patch
@@ -1,4 +1,4 @@ -From 68359a1ad8447c99732ebeab8c169bfed543667a Mon Sep 17 00:00:00 2001 +From 4f466bcf7707c97529e35010c4311f4e2c9a7d4b Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai@suse.de> Date: Fri, 10 Jul 2020 15:59:59 +0200 Subject: [PATCH] ALSA: line6: Sync the pending work cancel at disconnection @@ -15,12 +15,13 @@ Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/s5hlfjr4gio.wl-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c -index 7629116f570e..2746d9698180 100644 +index b52961076659..9eac35587f9d 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c -@@ -840,7 +840,7 @@ void line6_disconnect(struct usb_interface *interface) +@@ -831,7 +831,7 @@ void line6_disconnect(struct usb_interface *interface) if (WARN_ON(usbdev != line6->usbdev)) return;
diff --git a/queue/ALSA-usb-audio-Add-quirk-for-Focusrite-Scarlett-2i2.patch b/queue/ALSA-usb-audio-Add-quirk-for-Focusrite-Scarlett-2i2.patch index ff90e48..91289c6 100644 --- a/queue/ALSA-usb-audio-Add-quirk-for-Focusrite-Scarlett-2i2.patch +++ b/queue/ALSA-usb-audio-Add-quirk-for-Focusrite-Scarlett-2i2.patch
@@ -1,4 +1,4 @@ -From 6f4ea2074ddf689ac6f892afa58515032dabf2e4 Mon Sep 17 00:00:00 2001 +From 84d889552454ca13734182ea75d0155b13428b46 Mon Sep 17 00:00:00 2001 From: Gregor Pintar <grpintar@gmail.com> Date: Mon, 20 Apr 2020 23:40:30 +0200 Subject: [PATCH] ALSA: usb-audio: Add quirk for Focusrite Scarlett 2i2 @@ -20,12 +20,13 @@ Reviewed-by: Alexander Tsoy <alexander@tsoy.me> Link: https://lore.kernel.org/r/20200420214030.2361-1-grpintar@gmail.com 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 7598d6d6740c..a1df4c5b4f8c 100644 +index d561b1c8070f..b7b3eabed366 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h -@@ -2756,90 +2756,6 @@ YAMAHA_DEVICE(0x7010, "UB99"), +@@ -2776,90 +2776,6 @@ YAMAHA_DEVICE(0x7010, "UB99"), .type = QUIRK_MIDI_NOVATION } }, @@ -117,10 +118,10 @@ /* Access Music devices */ { diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c -index a8ece1701068..6c2dfd3bfcbf 100644 +index 6f51cc49ff50..a8bb953cc468 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c -@@ -1806,6 +1806,19 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip, +@@ -1780,6 +1780,19 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip, */ fp->attributes &= ~UAC_EP_CS_ATTR_FILL_MAX; break;
diff --git a/queue/ALSA-usb-audio-Add-registration-quirk-for-Kingston-H-1.patch b/queue/ALSA-usb-audio-Add-registration-quirk-for-Kingston-H-1.patch index 769b119..729dcc1 100644 --- a/queue/ALSA-usb-audio-Add-registration-quirk-for-Kingston-H-1.patch +++ b/queue/ALSA-usb-audio-Add-registration-quirk-for-Kingston-H-1.patch
@@ -1,4 +1,4 @@ -From fd60e0683e8e9107e09cd2e4798f3e27e85d2705 Mon Sep 17 00:00:00 2001 +From 4e29a5c6544dd5356e1eeef49238c81fb790e52c Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com> Date: Sat, 4 Apr 2020 17:38:43 +0200 Subject: [PATCH] ALSA: usb-audio: Add registration quirk for Kingston HyperX @@ -14,12 +14,13 @@ Signed-off-by: Emmanuel Pescosta <emmanuelpescosta099@gmail.com> Link: https://lore.kernel.org/r/20200404153843.9288-1-emmanuelpescosta099@gmail.com Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c -index 86f192a3043d..a8ece1701068 100644 +index ad557ab65e04..5341d045e6a4 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c -@@ -1827,6 +1827,7 @@ struct registration_quirk { +@@ -1801,6 +1801,7 @@ struct registration_quirk { static const struct registration_quirk registration_quirks[] = { REG_QUIRK_ENTRY(0x0951, 0x16d8, 2), /* Kingston HyperX AMP */
diff --git a/queue/ALSA-usb-audio-Add-registration-quirk-for-Kingston-H.patch b/queue/ALSA-usb-audio-Add-registration-quirk-for-Kingston-H.patch index 91db953..cd84470 100644 --- a/queue/ALSA-usb-audio-Add-registration-quirk-for-Kingston-H.patch +++ b/queue/ALSA-usb-audio-Add-registration-quirk-for-Kingston-H.patch
@@ -1,4 +1,4 @@ -From 73094608b8e214952444fb104651704c98a37aeb Mon Sep 17 00:00:00 2001 +From 38a03a0470d0b24eb929cb1e516655c441034ff6 Mon Sep 17 00:00:00 2001 From: Christoffer Nielsen <cn@obviux.dk> Date: Fri, 19 Jun 2020 13:48:22 +0200 Subject: [PATCH] ALSA: usb-audio: Add registration quirk for Kingston HyperX @@ -15,12 +15,13 @@ Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/CAOtG2YHOM3zy+ed9KS-J4HkZo_QGzcUG9MigSp4e4_-13r6B=Q@mail.gmail.com Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c -index c495e720e2f1..54d4b4b5bd11 100644 +index 5341d045e6a4..6f51cc49ff50 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c -@@ -1857,6 +1857,7 @@ struct registration_quirk { +@@ -1802,6 +1802,7 @@ struct registration_quirk { static const struct registration_quirk registration_quirks[] = { REG_QUIRK_ENTRY(0x0951, 0x16d8, 2), /* Kingston HyperX AMP */ REG_QUIRK_ENTRY(0x0951, 0x16ed, 2), /* Kingston HyperX Cloud Alpha S */
diff --git a/queue/ALSA-usb-audio-Add-support-for-MOTU-MicroBook-IIc.patch b/queue/ALSA-usb-audio-Add-support-for-MOTU-MicroBook-IIc.patch index 64e6a2f..35f2f06 100644 --- a/queue/ALSA-usb-audio-Add-support-for-MOTU-MicroBook-IIc.patch +++ b/queue/ALSA-usb-audio-Add-support-for-MOTU-MicroBook-IIc.patch
@@ -1,4 +1,4 @@ -From 2edb84e3047b93da2f2b234219cdc304df042d9e Mon Sep 17 00:00:00 2001 +From 0b361daf55f495f82aa3800ca2264f4eb2bcaa4a Mon Sep 17 00:00:00 2001 From: Alexander Tsoy <alexander@tsoy.me> Date: Sat, 29 Feb 2020 18:18:15 +0300 Subject: [PATCH] ALSA: usb-audio: Add support for MOTU MicroBook IIc @@ -21,6 +21,7 @@ Signed-off-by: Alexander Tsoy <alexander@tsoy.me> Link: https://lore.kernel.org/r/20200229151815.14199-1-alexander@tsoy.me Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/usb/clock.c b/sound/usb/clock.c index a48313dfa967..b118cf97607f 100644 @@ -106,10 +107,10 @@ static bool uac_clock_source_is_valid(struct snd_usb_audio *chip, diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c -index bd258f1ec2dd..a4e4064f9aee 100644 +index 4a9fcbd235a0..7eafc387e788 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c -@@ -357,7 +357,12 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, +@@ -344,7 +344,12 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, ep = 0x81; ifnum = 1; goto add_sync_ep_from_ifnum; @@ -124,10 +125,10 @@ ifnum = 0; goto add_sync_ep_from_ifnum; diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h -index d187aa6d50db..1c8719292eee 100644 +index 09484e3b7a11..d561b1c8070f 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h -@@ -3472,7 +3472,7 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), +@@ -3492,7 +3492,7 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), }, /* MOTU Microbook II */ { @@ -137,10 +138,10 @@ .vendor_name = "MOTU", .product_name = "MicroBookII", diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c -index 915aea256f65..3cc745fe24d8 100644 +index bf5083a20b6d..9d11ff742e5f 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c -@@ -1352,7 +1352,15 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev, +@@ -1316,7 +1316,15 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev, case USB_ID(0x2466, 0x8010): /* Fractal Audio Axe-Fx 3 */ return snd_usb_axefx3_boot_quirk(dev); case USB_ID(0x07fd, 0x0004): /* MOTU MicroBook II */ @@ -157,7 +158,7 @@ } return 0; -@@ -1790,5 +1798,13 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip, +@@ -1764,5 +1772,13 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip, else fp->ep_attr |= USB_ENDPOINT_SYNC_SYNC; break;
diff --git a/queue/ALSA-usb-audio-Create-a-registration-quirk-for-Kings.patch b/queue/ALSA-usb-audio-Create-a-registration-quirk-for-Kings.patch index fc6b490..2edda95 100644 --- a/queue/ALSA-usb-audio-Create-a-registration-quirk-for-Kings.patch +++ b/queue/ALSA-usb-audio-Create-a-registration-quirk-for-Kings.patch
@@ -1,4 +1,4 @@ -From 55f7326170d9e83e2d828591938e1101982a679c Mon Sep 17 00:00:00 2001 +From 4a9396a277f4ec1bd5a4c926939364ad09f817c1 Mon Sep 17 00:00:00 2001 From: Chris Wulff <crwulff@gmail.com> Date: Sat, 14 Mar 2020 12:54:49 -0400 Subject: [PATCH] ALSA: usb-audio: Create a registration quirk for Kingston @@ -16,12 +16,13 @@ Signed-off-by: Chris Wulff <crwulff@gmail.com> Link: https://lore.kernel.org/r/20200314165449.4086-3-crwulff@gmail.com Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/usb/card.c b/sound/usb/card.c -index 827fb0bc8b56..16bbe2a50fb7 100644 +index f9a64e9526f5..2284377cbb98 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c -@@ -662,10 +662,14 @@ static int usb_audio_probe(struct usb_interface *intf, +@@ -659,10 +659,14 @@ static int usb_audio_probe(struct usb_interface *intf, goto __error; } @@ -41,10 +42,10 @@ if (quirk && quirk->shares_media_device) { /* don't want to fail when snd_media_device_create() fails */ diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c -index 3cc745fe24d8..d605aff801b8 100644 +index 9d11ff742e5f..f3e26e65c325 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c -@@ -1808,3 +1808,17 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip, +@@ -1782,3 +1782,17 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip, break; } }
diff --git a/queue/ALSA-usb-audio-Fix-race-against-the-error-recovery-U.patch b/queue/ALSA-usb-audio-Fix-race-against-the-error-recovery-U.patch index 9285d9d..9d220aa 100644 --- a/queue/ALSA-usb-audio-Fix-race-against-the-error-recovery-U.patch +++ b/queue/ALSA-usb-audio-Fix-race-against-the-error-recovery-U.patch
@@ -1,4 +1,4 @@ -From 9b7e5208a941e2e491a83eb5fa83d889e888fa2f Mon Sep 17 00:00:00 2001 +From e2d1e0ec05363ec5ca8cbbc2f75965ce1961d870 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai@suse.de> Date: Fri, 10 Jul 2020 18:06:56 +0200 Subject: [PATCH] ALSA: usb-audio: Fix race against the error recovery URB @@ -27,9 +27,10 @@ Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200710160656.16819-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/usb/midi.c b/sound/usb/midi.c -index 047b90595d65..354f57692938 100644 +index b737f0ec77d0..0cb4142b05f6 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -1499,6 +1499,8 @@ void snd_usbmidi_disconnect(struct list_head *p) @@ -49,7 +50,7 @@ } EXPORT_SYMBOL(snd_usbmidi_disconnect); -@@ -2301,16 +2302,22 @@ void snd_usbmidi_input_stop(struct list_head *p) +@@ -2282,16 +2283,22 @@ void snd_usbmidi_input_stop(struct list_head *p) } EXPORT_SYMBOL(snd_usbmidi_input_stop); @@ -75,7 +76,7 @@ } } -@@ -2326,7 +2333,7 @@ void snd_usbmidi_input_start(struct list_head *p) +@@ -2307,7 +2314,7 @@ void snd_usbmidi_input_start(struct list_head *p) if (umidi->input_running || !umidi->opened[1]) return; for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i)
diff --git a/queue/ALSA-usb-audio-Rewrite-registration-quirk-handling.patch b/queue/ALSA-usb-audio-Rewrite-registration-quirk-handling.patch index 71c35d2..295379d 100644 --- a/queue/ALSA-usb-audio-Rewrite-registration-quirk-handling.patch +++ b/queue/ALSA-usb-audio-Rewrite-registration-quirk-handling.patch
@@ -1,4 +1,4 @@ -From d8695bc5b1fe88305396b1f788d3b5f218e28a30 Mon Sep 17 00:00:00 2001 +From 5944e52823b520b5e1892f3d06a0f24229e852d5 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai@suse.de> Date: Wed, 25 Mar 2020 11:33:19 +0100 Subject: [PATCH] ALSA: usb-audio: Rewrite registration quirk handling @@ -11,12 +11,13 @@ Link: https://lore.kernel.org/r/20200325103322.2508-2-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/usb/card.c b/sound/usb/card.c -index 16bbe2a50fb7..55d563a8154d 100644 +index 2284377cbb98..230d862cfa3a 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c -@@ -665,7 +665,7 @@ static int usb_audio_probe(struct usb_interface *intf, +@@ -662,7 +662,7 @@ static int usb_audio_probe(struct usb_interface *intf, /* we are allowed to call snd_card_register() many times, but first * check to see if a device needs to skip it or do anything special */ @@ -26,10 +27,10 @@ if (err < 0) goto __error; diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c -index d605aff801b8..86f192a3043d 100644 +index f3e26e65c325..ad557ab65e04 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c -@@ -1809,16 +1809,36 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip, +@@ -1783,16 +1783,36 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip, } }
diff --git a/queue/ARM-at91-pm-add-quirk-for-sam9x60-s-ulp1.patch b/queue/ARM-at91-pm-add-quirk-for-sam9x60-s-ulp1.patch index 43d32d5..05fe14d 100644 --- a/queue/ARM-at91-pm-add-quirk-for-sam9x60-s-ulp1.patch +++ b/queue/ARM-at91-pm-add-quirk-for-sam9x60-s-ulp1.patch
@@ -1,4 +1,4 @@ -From bb1a0e87e1c54cd884e9b92b1cec06b186edc7a0 Mon Sep 17 00:00:00 2001 +From d64a9a28969156d4fd2ebc479895c8dea67ce7cf Mon Sep 17 00:00:00 2001 From: Claudiu Beznea <claudiu.beznea@microchip.com> Date: Mon, 20 Jan 2020 14:10:08 +0200 Subject: [PATCH] ARM: at91: pm: add quirk for sam9x60's ulp1 @@ -11,12 +11,13 @@ Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Link: https://lore.kernel.org/r/1579522208-19523-9-git-send-email-claudiu.beznea@microchip.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S -index 4e9eb4f57f16..be9764e8d3fa 100644 +index ed57c879d4e1..2591cba61937 100644 --- a/arch/arm/mach-at91/pm_suspend.S +++ b/arch/arm/mach-at91/pm_suspend.S -@@ -275,6 +275,10 @@ ENDPROC(at91_backup_mode) +@@ -268,6 +268,10 @@ ENDPROC(at91_backup_mode) orr tmp1, tmp1, #AT91_PMC_KEY str tmp1, [pmc, #AT91_CKGR_MOR]
diff --git a/queue/ARM-dts-Fix-dcan-driver-probe-failed-on-am437x-platf.patch b/queue/ARM-dts-Fix-dcan-driver-probe-failed-on-am437x-platf.patch index 94512aa..c9adc90 100644 --- a/queue/ARM-dts-Fix-dcan-driver-probe-failed-on-am437x-platf.patch +++ b/queue/ARM-dts-Fix-dcan-driver-probe-failed-on-am437x-platf.patch
@@ -1,4 +1,4 @@ -From ac9fabb0d5c8bb57318fc417a24a31811d6f0980 Mon Sep 17 00:00:00 2001 +From 0aba37c226a6a3977992213f55a7228f5d6b18bc Mon Sep 17 00:00:00 2001 From: dillon min <dillon.minfei@gmail.com> Date: Tue, 14 Jul 2020 14:35:07 +0800 Subject: [PATCH] ARM: dts: Fix dcan driver probe failed on am437x platform @@ -31,6 +31,7 @@ Signed-off-by: dillon min <dillon.minfei@gmail.com> [tony@atomide.com: aligned commit message a bit for readability] Signed-off-by: Tony Lindgren <tony@atomide.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi index 04bee4ff9dcb..53017a1e5ab0 100644
diff --git a/queue/ARM-dts-socfpga-Align-L2-cache-controller-nodename-w.patch b/queue/ARM-dts-socfpga-Align-L2-cache-controller-nodename-w.patch index 7494226..0dc75b7 100644 --- a/queue/ARM-dts-socfpga-Align-L2-cache-controller-nodename-w.patch +++ b/queue/ARM-dts-socfpga-Align-L2-cache-controller-nodename-w.patch
@@ -1,4 +1,4 @@ -From d7adfe5ffed9faa05f8926223086b101e14f700d Mon Sep 17 00:00:00 2001 +From 738c09fbea2e64fdad4eaf6005da3f5414710fad Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzk@kernel.org> Date: Fri, 26 Jun 2020 10:06:02 +0200 Subject: [PATCH] ARM: dts: socfpga: Align L2 cache-controller nodename with @@ -13,12 +13,13 @@ Fixes: 475dc86d08de ("arm: dts: socfpga: Add a base DTSI for Altera's Arria10 SOC") Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Dinh Nguyen <dinguyen@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi -index c2b54af417a2..78f3267d9cbf 100644 +index ec1966480f2f..9a14b5fe3b57 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi -@@ -726,7 +726,7 @@ ocram-ecc@ffd08144 { +@@ -709,7 +709,7 @@ }; }; @@ -28,10 +29,10 @@ reg = <0xfffef000 0x1000>; interrupts = <0 38 0x04>; diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi -index 3b8571b8b412..8f614c4b0e3e 100644 +index ae24599d5829..6378e6461bf7 100644 --- a/arch/arm/boot/dts/socfpga_arria10.dtsi +++ b/arch/arm/boot/dts/socfpga_arria10.dtsi -@@ -636,7 +636,7 @@ sdr: sdr@ffcfb100 { +@@ -633,7 +633,7 @@ reg = <0xffcfb100 0x80>; };
diff --git a/queue/HID-logitech-hidpp-avoid-repeated-multiplier-log-mes.patch b/queue/HID-logitech-hidpp-avoid-repeated-multiplier-log-mes.patch index 0fc781e..b5a9edf 100644 --- a/queue/HID-logitech-hidpp-avoid-repeated-multiplier-log-mes.patch +++ b/queue/HID-logitech-hidpp-avoid-repeated-multiplier-log-mes.patch
@@ -1,4 +1,4 @@ -From e13762abf38ead29071407f32b9dcec38f21dc34 Mon Sep 17 00:00:00 2001 +From 163095aebe1a260dfe3cac3085c5c6eb7ed0253d Mon Sep 17 00:00:00 2001 From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name> Date: Sun, 5 Jul 2020 19:34:57 +0200 Subject: [PATCH] HID: logitech-hidpp: avoid repeated "multiplier = " log @@ -19,12 +19,13 @@ Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> Reviewed-by: Harry Cutts <hcutts@chromium.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c -index 1e1cf8eae649..b8b53dc95e86 100644 +index f97913974983..e994403f7650 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c -@@ -3146,7 +3146,7 @@ static int hi_res_scroll_enable(struct hidpp_device *hidpp) +@@ -2964,7 +2964,7 @@ static int hi_res_scroll_enable(struct hidpp_device *hidpp) multiplier = 1; hidpp->vertical_wheel_counter.wheel_multiplier = multiplier;
diff --git a/queue/HID-magicmouse-do-not-set-up-autorepeat.patch b/queue/HID-magicmouse-do-not-set-up-autorepeat.patch index 31ff9c5..e1640fc 100644 --- a/queue/HID-magicmouse-do-not-set-up-autorepeat.patch +++ b/queue/HID-magicmouse-do-not-set-up-autorepeat.patch
@@ -1,4 +1,4 @@ -From 6363d2065cd399cf9d6dc9d08c437f8658831100 Mon Sep 17 00:00:00 2001 +From 162099f05450c86882994f2420c47b50b96716f3 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov <dmitry.torokhov@gmail.com> Date: Sun, 24 May 2020 16:51:34 -0700 Subject: [PATCH] HID: magicmouse: do not set up autorepeat @@ -14,6 +14,7 @@ Tested-by: Yariv <oigevald+kernel@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 34138667f8af..abd86903875f 100644
diff --git a/queue/HID-quirks-Always-poll-Obins-Anne-Pro-2-keyboard.patch b/queue/HID-quirks-Always-poll-Obins-Anne-Pro-2-keyboard.patch index 38fa875..f874063 100644 --- a/queue/HID-quirks-Always-poll-Obins-Anne-Pro-2-keyboard.patch +++ b/queue/HID-quirks-Always-poll-Obins-Anne-Pro-2-keyboard.patch
@@ -1,4 +1,4 @@ -From ca28aff0e1dc7dce9e12a7fd9276b7118ce5e73a Mon Sep 17 00:00:00 2001 +From 9713ce6c112b1a06ff55a3fdb359ddb6e5b70cce Mon Sep 17 00:00:00 2001 From: Sebastian Parschauer <s.parschauer@gmx.de> Date: Tue, 9 Jun 2020 12:00:53 +0200 Subject: [PATCH] HID: quirks: Always poll Obins Anne Pro 2 keyboard @@ -19,12 +19,13 @@ Signed-off-by: Sebastian Parschauer <s.parschauer@gmx.de> Cc: stable@vger.kernel.org # v4.16+ Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 874fc3791f3b..ba6c49179e31 100644 +index 4a74614c22c1..2234b3e8bfb2 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -618,6 +618,7 @@ +@@ -619,6 +619,7 @@ #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081 0xa081 #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A0C2 0xa0c2 #define USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD_A096 0xa096 @@ -33,10 +34,10 @@ #define USB_VENDOR_ID_IMATION 0x0718 #define USB_DEVICE_ID_DISC_STAKKA 0xd000 diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index ca8b5c261c7c..78092407c9b2 100644 +index 5c38f7c7b763..720f75a0e965 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c -@@ -88,6 +88,7 @@ static const struct hid_device_id hid_quirks[] = { +@@ -87,6 +87,7 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING), HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING), HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD_A096), HID_QUIRK_NO_INIT_REPORTS },
diff --git a/queue/HID-quirks-Ignore-Simply-Automated-UPB-PIM.patch b/queue/HID-quirks-Ignore-Simply-Automated-UPB-PIM.patch index e55359d..1f8160a 100644 --- a/queue/HID-quirks-Ignore-Simply-Automated-UPB-PIM.patch +++ b/queue/HID-quirks-Ignore-Simply-Automated-UPB-PIM.patch
@@ -1,4 +1,4 @@ -From 1ee1369b46de1083238fced60ff718f59de4b8aa Mon Sep 17 00:00:00 2001 +From 662f0cd5262cb7df19426e4f5be44c44c7d3fb08 Mon Sep 17 00:00:00 2001 From: James Hilliard <james.hilliard1@gmail.com> Date: Tue, 23 Jun 2020 13:24:15 -0600 Subject: [PATCH] HID: quirks: Ignore Simply Automated UPB PIM @@ -12,12 +12,13 @@ Cc: stable <stable@vger.kernel.org> Signed-off-by: James Hilliard <james.hilliard1@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index ba6c49179e31..6f370e020feb 100644 +index 2234b3e8bfb2..e253e3a7a169 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -999,6 +999,8 @@ +@@ -993,6 +993,8 @@ #define USB_DEVICE_ID_ROCCAT_RYOS_MK_PRO 0x3232 #define USB_DEVICE_ID_ROCCAT_SAVU 0x2d5a @@ -27,10 +28,10 @@ #define USB_DEVICE_ID_SAITEK_RUMBLEPAD 0xff17 #define USB_DEVICE_ID_SAITEK_PS1000 0x0621 diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index 78092407c9b2..934fc0a798d4 100644 +index 720f75a0e965..affcd54c08e0 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c -@@ -833,6 +833,7 @@ static const struct hid_device_id hid_ignore_list[] = { +@@ -839,6 +839,7 @@ static const struct hid_device_id hid_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_PETZL, USB_DEVICE_ID_PETZL_HEADLAMP) }, { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE) }, { HID_USB_DEVICE(USB_VENDOR_ID_POWERCOM, USB_DEVICE_ID_POWERCOM_UPS) },
diff --git a/queue/HID-quirks-Remove-ITE-8595-entry-from-hid_have_speci.patch b/queue/HID-quirks-Remove-ITE-8595-entry-from-hid_have_speci.patch index 80efd0d..1e38ba9 100644 --- a/queue/HID-quirks-Remove-ITE-8595-entry-from-hid_have_speci.patch +++ b/queue/HID-quirks-Remove-ITE-8595-entry-from-hid_have_speci.patch
@@ -1,4 +1,4 @@ -From 3045696d0ce663d67c95dcb8206d3de57f6841ec Mon Sep 17 00:00:00 2001 +From c647a2fcb724b61514a260ca548e5b17f381c6ac Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede@redhat.com> Date: Fri, 31 Jan 2020 13:46:25 +0100 Subject: [PATCH] HID: quirks: Remove ITE 8595 entry from @@ -16,12 +16,13 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index 0e7b2d998395..503cfbe207ab 100644 +index 76a4539b1224..5c38f7c7b763 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c -@@ -397,9 +397,6 @@ static const struct hid_device_id hid_have_special_driver[] = { +@@ -399,9 +399,6 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) }, { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A0C2) }, #endif
diff --git a/queue/Input-elan_i2c-add-more-hardware-ID-for-Lenovo-lapto.patch b/queue/Input-elan_i2c-add-more-hardware-ID-for-Lenovo-lapto.patch index 85fe1f9..c9d1122 100644 --- a/queue/Input-elan_i2c-add-more-hardware-ID-for-Lenovo-lapto.patch +++ b/queue/Input-elan_i2c-add-more-hardware-ID-for-Lenovo-lapto.patch
@@ -1,4 +1,4 @@ -From 60a8288b6eff26b8c8895d35a26f0f725f2bc045 Mon Sep 17 00:00:00 2001 +From 8d9bd4fb8ef89d049abc4c8c00b122b4a8562f0c Mon Sep 17 00:00:00 2001 From: Dave Wang <dave.wang@emc.com.tw> Date: Wed, 8 Jul 2020 22:25:03 -0700 Subject: [PATCH] Input: elan_i2c - add more hardware ID for Lenovo laptops @@ -12,6 +12,7 @@ Link: https://lore.kernel.org/r/000201d5a8bd$9fead3f0$dfc07bd0$@emc.com.tw Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index e78c20d7df41..0fb6a369c9c7 100644
diff --git a/queue/Input-goodix-fix-touch-coordinates-on-Cube-I15-TC.patch b/queue/Input-goodix-fix-touch-coordinates-on-Cube-I15-TC.patch index 39b9302..e763021 100644 --- a/queue/Input-goodix-fix-touch-coordinates-on-Cube-I15-TC.patch +++ b/queue/Input-goodix-fix-touch-coordinates-on-Cube-I15-TC.patch
@@ -1,4 +1,4 @@ -From d891e49003e541fd336f7d0952d9bbc154cce9db Mon Sep 17 00:00:00 2001 +From e0a1eef1da9cd09a541de492019afd0e14099579 Mon Sep 17 00:00:00 2001 From: "Sergei A. Trusov" <sergei.a.trusov@ya.ru> Date: Thu, 5 Mar 2020 19:53:06 -0800 Subject: [PATCH] Input: goodix - fix touch coordinates on Cube I15-TC @@ -15,6 +15,7 @@ Signed-off-by: Sergei A. Trusov <sergei.a.trusov@ya.ru> Reviewed-by: Bastien Nocera <hadess@hadess.net> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c index b99ace9b9a0e..ab18cc298d76 100644
diff --git a/queue/Input-i8042-add-Lenovo-XiaoXin-Air-12-to-i8042-nomux.patch b/queue/Input-i8042-add-Lenovo-XiaoXin-Air-12-to-i8042-nomux.patch index 4d68a5a..ba7ca56 100644 --- a/queue/Input-i8042-add-Lenovo-XiaoXin-Air-12-to-i8042-nomux.patch +++ b/queue/Input-i8042-add-Lenovo-XiaoXin-Air-12-to-i8042-nomux.patch
@@ -1,4 +1,4 @@ -From 17d51429da722cd8fc77a365a112f008abf4f8b3 Mon Sep 17 00:00:00 2001 +From 7a5bfcab8d56dad3937d25e0b1493469cc73e961 Mon Sep 17 00:00:00 2001 From: David Pedersen <limero1337@gmail.com> Date: Mon, 6 Jul 2020 18:48:51 -0700 Subject: [PATCH] Input: i8042 - add Lenovo XiaoXin Air 12 to i8042 nomux list @@ -13,9 +13,10 @@ Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20200625133754.291325-1-limero1337@gmail.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h -index 7b08ff8ddf35..7d7f73702726 100644 +index 7e048b557462..858a26302198 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -425,6 +425,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = {
diff --git a/queue/Input-mms114-add-extra-compatible-for-mms345l.patch b/queue/Input-mms114-add-extra-compatible-for-mms345l.patch index 4ead8bf..b6f0787 100644 --- a/queue/Input-mms114-add-extra-compatible-for-mms345l.patch +++ b/queue/Input-mms114-add-extra-compatible-for-mms345l.patch
@@ -1,4 +1,4 @@ -From 7842087b0196d674ed877d768de8f2a34d7fdc53 Mon Sep 17 00:00:00 2001 +From f6c95f9c67310ae3b0c334d5db07a472a2e94a80 Mon Sep 17 00:00:00 2001 From: Stephan Gerhold <stephan@gerhold.net> Date: Sat, 25 Apr 2020 13:06:31 -0700 Subject: [PATCH] Input: mms114 - add extra compatible for mms345l @@ -27,9 +27,10 @@ Reviewed-by: Andi Shyti <andi@etezian.org> Link: https://lore.kernel.org/r/20200423102431.2715-1-stephan@gerhold.net Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/input/touchscreen/mms114.c b/drivers/input/touchscreen/mms114.c -index 69c6d559eeb0..b3dda1722bae 100644 +index fca908ba4841..fb28fd2d6f1c 100644 --- a/drivers/input/touchscreen/mms114.c +++ b/drivers/input/touchscreen/mms114.c @@ -54,6 +54,7 @@ @@ -67,7 +68,7 @@ return 0; error = mms114_set_active(data, true); -@@ -599,6 +609,9 @@ static const struct of_device_id mms114_dt_match[] = { +@@ -598,6 +608,9 @@ static const struct of_device_id mms114_dt_match[] = { }, { .compatible = "melfas,mms152", .data = (void *)TYPE_MMS152,
diff --git a/queue/Linux-5.2.53.patch b/queue/Linux-5.2.53.patch index 661172b..ae3e423 100644 --- a/queue/Linux-5.2.53.patch +++ b/queue/Linux-5.2.53.patch
@@ -1,8 +1,9 @@ -From 22dd297bf87f5ffa58a947dca9b448537f82cedb Mon Sep 17 00:00:00 2001 +From ea6aa217751344f630187072610f36ac6d6cbb22 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Wed, 12 Aug 2020 21:53:57 -0400 Subject: [PATCH] Linux 5.2.53 +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/Makefile b/Makefile index d88f4ef911e1..592a098aba4e 100644
diff --git a/queue/NFS-Fix-interrupted-slots-by-sending-a-solo-SEQUENCE.patch b/queue/NFS-Fix-interrupted-slots-by-sending-a-solo-SEQUENCE.patch index 605af79..40bc91a 100644 --- a/queue/NFS-Fix-interrupted-slots-by-sending-a-solo-SEQUENCE.patch +++ b/queue/NFS-Fix-interrupted-slots-by-sending-a-solo-SEQUENCE.patch
@@ -1,4 +1,4 @@ -From 913fadc5b105c3619d9e8d0fe8899ff1593cc737 Mon Sep 17 00:00:00 2001 +From bdee4442babcd52f4abce8afebe6b484bda222db Mon Sep 17 00:00:00 2001 From: Anna Schumaker <Anna.Schumaker@Netapp.com> Date: Wed, 8 Jul 2020 10:33:40 -0400 Subject: [PATCH] NFS: Fix interrupted slots by sending a solo SEQUENCE @@ -18,12 +18,13 @@ Fixes: 3453d5708b33 (NFSv4.1: Avoid false retries when RPC calls are interrupted) Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c -index e32717fd1169..2e2dac29a9e9 100644 +index beee0332adf7..8db0b66086bd 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c -@@ -774,6 +774,14 @@ static void nfs4_slot_sequence_acked(struct nfs4_slot *slot, +@@ -757,6 +757,14 @@ static void nfs4_slot_sequence_acked(struct nfs4_slot *slot, slot->seq_nr_last_acked = seqnr; } @@ -38,7 +39,7 @@ static int nfs41_sequence_process(struct rpc_task *task, struct nfs4_sequence_res *res) { -@@ -790,6 +798,7 @@ static int nfs41_sequence_process(struct rpc_task *task, +@@ -773,6 +781,7 @@ static int nfs41_sequence_process(struct rpc_task *task, goto out; session = slot->table->session; @@ -46,7 +47,7 @@ trace_nfs4_sequence_done(session, res); -@@ -804,7 +813,6 @@ static int nfs41_sequence_process(struct rpc_task *task, +@@ -787,7 +796,6 @@ static int nfs41_sequence_process(struct rpc_task *task, nfs4_slot_sequence_acked(slot, slot->seq_nr); /* Update the slot's sequence and clientid lease timer */ slot->seq_done = 1; @@ -54,7 +55,7 @@ do_renew_lease(clp, res->sr_timestamp); /* Check sequence flags */ nfs41_handle_sequence_flag_errors(clp, res->sr_status_flags, -@@ -852,10 +860,18 @@ static int nfs41_sequence_process(struct rpc_task *task, +@@ -835,10 +843,18 @@ static int nfs41_sequence_process(struct rpc_task *task, /* * Were one or more calls using this slot interrupted? * If the server never received the request, then our
diff --git a/queue/PCI-PM-Call-.bridge_d3-hook-only-if-non-NULL.patch b/queue/PCI-PM-Call-.bridge_d3-hook-only-if-non-NULL.patch index 201dbd7..0a8d49e 100644 --- a/queue/PCI-PM-Call-.bridge_d3-hook-only-if-non-NULL.patch +++ b/queue/PCI-PM-Call-.bridge_d3-hook-only-if-non-NULL.patch
@@ -1,4 +1,4 @@ -From c3aaf086701d05a82c8156ee8620af41e5a7d6fe Mon Sep 17 00:00:00 2001 +From 45589f5c9718cdc7440e0448ceb9f01f7ef7a6fd Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas <bhelgaas@google.com> Date: Tue, 7 Apr 2020 18:23:15 -0500 Subject: [PATCH] PCI/PM: Call .bridge_d3() hook only if non-NULL @@ -18,12 +18,13 @@ Fixes: 26ad34d510a8 ("PCI / ACPI: Whitelist D3 for more PCIe hotplug ports") Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c -index 595fcf59843f..dfa7ec008963 100644 +index 11cba24e263c..4edfa4f5f65e 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c -@@ -868,7 +868,9 @@ static inline bool platform_pci_need_resume(struct pci_dev *dev) +@@ -796,7 +796,9 @@ static inline bool platform_pci_need_resume(struct pci_dev *dev) static inline bool platform_pci_bridge_d3(struct pci_dev *dev) {
diff --git a/queue/RDMA-mlx5-Verify-that-QP-is-created-with-RQ-or-SQ.patch b/queue/RDMA-mlx5-Verify-that-QP-is-created-with-RQ-or-SQ.patch index 7acc466..383c2c3 100644 --- a/queue/RDMA-mlx5-Verify-that-QP-is-created-with-RQ-or-SQ.patch +++ b/queue/RDMA-mlx5-Verify-that-QP-is-created-with-RQ-or-SQ.patch
@@ -1,4 +1,4 @@ -From 0eacc574aae7300bf46c10c7116c3ba5825505b7 Mon Sep 17 00:00:00 2001 +From efa344b60f2434bc28b7a7d5b92558928876bab4 Mon Sep 17 00:00:00 2001 From: Aharon Landau <aharonl@mellanox.com> Date: Mon, 27 Apr 2020 18:46:36 +0300 Subject: [PATCH] RDMA/mlx5: Verify that QP is created with RQ or SQ @@ -14,12 +14,13 @@ Reviewed-by: Maor Gottlieb <maorg@mellanox.com> Signed-off-by: Leon Romanovsky <leonro@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c -index 18c0a25da47a..14f4f0982e4e 100644 +index 0b9cc00525b9..b19e580939ac 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c -@@ -1482,6 +1482,8 @@ static int create_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, +@@ -1468,6 +1468,8 @@ static int create_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, u16 uid = to_mpd(pd)->uid; u32 out[MLX5_ST_SZ_DW(create_tir_out)] = {};
diff --git a/queue/Revert-ALSA-hda-call-runtime_allow-for-all-hda-contr.patch b/queue/Revert-ALSA-hda-call-runtime_allow-for-all-hda-contr.patch index 387ac3f..f45df04 100644 --- a/queue/Revert-ALSA-hda-call-runtime_allow-for-all-hda-contr.patch +++ b/queue/Revert-ALSA-hda-call-runtime_allow-for-all-hda-contr.patch
@@ -1,4 +1,4 @@ -From 07c9983b567d0ef33aefc063299de95a987e12a8 Mon Sep 17 00:00:00 2001 +From 371216a14a6d3d927ff790002f8848e8861c3e82 Mon Sep 17 00:00:00 2001 From: Hui Wang <hui.wang@canonical.com> Date: Mon, 3 Aug 2020 14:46:38 +0800 Subject: [PATCH] Revert "ALSA: hda: call runtime_allow() for all hda @@ -22,12 +22,13 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com> Link: https://lore.kernel.org/r/20200803064638.6139-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/hda_intel.c b/sound/pci/hda/hda_intel.c -index e699873c8293..e34a4d5d047c 100644 +index e3693371fe19..011f8e958743 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c -@@ -2352,7 +2352,6 @@ static int azx_probe_continue(struct azx *chip) +@@ -2332,7 +2332,6 @@ static int azx_probe_continue(struct azx *chip) if (azx_has_pm_runtime(chip)) { pm_runtime_use_autosuspend(&pci->dev);
diff --git a/queue/Revert-cifs-Fix-the-target-file-was-deleted-when-ren.patch b/queue/Revert-cifs-Fix-the-target-file-was-deleted-when-ren.patch index ee1dc19..a52ab7e 100644 --- a/queue/Revert-cifs-Fix-the-target-file-was-deleted-when-ren.patch +++ b/queue/Revert-cifs-Fix-the-target-file-was-deleted-when-ren.patch
@@ -1,4 +1,4 @@ -From 0e6705182d4e1b77248a93470d6d7b3013d59b30 Mon Sep 17 00:00:00 2001 +From b64e789f75978be456dd1a8d85f1b6682ad67006 Mon Sep 17 00:00:00 2001 From: Steve French <stfrench@microsoft.com> Date: Thu, 23 Jul 2020 14:41:29 -0500 Subject: [PATCH] Revert "cifs: Fix the target file was deleted when rename @@ -23,12 +23,13 @@ Acked-by: Ronnie Sahlberg <lsahlber@redhat.com> Acked-by: Pavel Shilovsky <pshilov@microsoft.com> Acked-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c -index 49c3ea8aa845..ce95801e9b66 100644 +index ddfde6cc0c2c..97d826a26478 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c -@@ -2044,7 +2044,6 @@ cifs_rename2(struct inode *source_dir, struct dentry *source_dentry, +@@ -1783,7 +1783,6 @@ cifs_rename2(struct inode *source_dir, struct dentry *source_dentry, FILE_UNIX_BASIC_INFO *info_buf_target; unsigned int xid; int rc, tmprc; @@ -36,7 +37,7 @@ if (flags & ~RENAME_NOREPLACE) return -EINVAL; -@@ -2121,13 +2120,8 @@ cifs_rename2(struct inode *source_dir, struct dentry *source_dentry, +@@ -1860,13 +1859,8 @@ cifs_rename2(struct inode *source_dir, struct dentry *source_dentry, */ unlink_target:
diff --git a/queue/Revert-i2c-cadence-Fix-the-hold-bit-setting.patch b/queue/Revert-i2c-cadence-Fix-the-hold-bit-setting.patch index 33dcbaa..6b6c491 100644 --- a/queue/Revert-i2c-cadence-Fix-the-hold-bit-setting.patch +++ b/queue/Revert-i2c-cadence-Fix-the-hold-bit-setting.patch
@@ -1,4 +1,4 @@ -From 0db9254d6b896b587759e2c844c277fb1a6da5b9 Mon Sep 17 00:00:00 2001 +From 1af3dfefc5a49749e9714681e966e2598dc9ef66 Mon Sep 17 00:00:00 2001 From: Raviteja Narayanam <raviteja.narayanam@xilinx.com> Date: Fri, 3 Jul 2020 19:25:49 +0530 Subject: [PATCH] Revert "i2c: cadence: Fix the hold bit setting" @@ -33,12 +33,13 @@ Signed-off-by: Raviteja Narayanam <raviteja.narayanam@xilinx.com> Acked-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Wolfram Sang <wsa@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c -index 4b72398af505..e06960207ada 100644 +index 9d71ce15db05..a51d3b795770 100644 --- a/drivers/i2c/busses/i2c-cadence.c +++ b/drivers/i2c/busses/i2c-cadence.c -@@ -594,10 +594,8 @@ static void cdns_i2c_mrecv(struct cdns_i2c *id) +@@ -377,10 +377,8 @@ static void cdns_i2c_mrecv(struct cdns_i2c *id) * Check for the message size against FIFO depth and set the * 'hold bus' bit if it is greater than FIFO depth. */ @@ -50,7 +51,7 @@ cdns_i2c_writereg(ctrl_reg, CDNS_I2C_CR_OFFSET); -@@ -654,11 +652,8 @@ static void cdns_i2c_msend(struct cdns_i2c *id) +@@ -437,11 +435,8 @@ static void cdns_i2c_msend(struct cdns_i2c *id) * Check for the message size against FIFO depth and set the * 'hold bus' bit if it is greater than FIFO depth. */
diff --git a/queue/Revert-powerpc-kasan-Fix-shadow-pages-allocation-fai.patch b/queue/Revert-powerpc-kasan-Fix-shadow-pages-allocation-fai.patch index a496d7c..03b3ffa 100644 --- a/queue/Revert-powerpc-kasan-Fix-shadow-pages-allocation-fai.patch +++ b/queue/Revert-powerpc-kasan-Fix-shadow-pages-allocation-fai.patch
@@ -1,4 +1,4 @@ -From 4b460acdb765e1c8baf20df543aeca7716111888 Mon Sep 17 00:00:00 2001 +From f15a8c7fb5ab8a0584edb07254ffed89b24ef8a8 Mon Sep 17 00:00:00 2001 From: Christophe Leroy <christophe.leroy@csgroup.eu> Date: Thu, 2 Jul 2020 11:52:02 +0000 Subject: [PATCH] Revert "powerpc/kasan: Fix shadow pages allocation failure" @@ -22,6 +22,7 @@ Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://bugzilla.kernel.org/show_bug.cgi?id=208181 Link: https://lore.kernel.org/r/3667deb0911affbf999b99f87c31c77d5e870cd2.1593690707.git.christophe.leroy@csgroup.eu +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/include/asm/kasan.h b/arch/powerpc/include/asm/kasan.h index b68eeff77806..6db06f58deed 100644
diff --git a/queue/Revert-usb-ehci-platform-Set-PM-runtime-as-active-on.patch b/queue/Revert-usb-ehci-platform-Set-PM-runtime-as-active-on.patch index b445fb6..0bd6450 100644 --- a/queue/Revert-usb-ehci-platform-Set-PM-runtime-as-active-on.patch +++ b/queue/Revert-usb-ehci-platform-Set-PM-runtime-as-active-on.patch
@@ -1,4 +1,4 @@ -From 9995d9b76ecb20dedb26627d47d0bf73c7ddbd52 Mon Sep 17 00:00:00 2001 +From 76456de1326cc43a8757eae58be3a2cbb6667158 Mon Sep 17 00:00:00 2001 From: Sasha Levin <sashal@kernel.org> Date: Fri, 17 Jul 2020 13:01:10 -0400 Subject: [PATCH] Revert "usb/ehci-platform: Set PM runtime as active on
diff --git a/queue/Revert-usb-ohci-platform-Fix-a-warning-when-hibernat.patch b/queue/Revert-usb-ohci-platform-Fix-a-warning-when-hibernat.patch index a2bf7b0..8ed8546 100644 --- a/queue/Revert-usb-ohci-platform-Fix-a-warning-when-hibernat.patch +++ b/queue/Revert-usb-ohci-platform-Fix-a-warning-when-hibernat.patch
@@ -1,4 +1,4 @@ -From 11509035db863558e41fc71c7b2bc123c2cfb95d Mon Sep 17 00:00:00 2001 +From d2e8366278691632aae58079be785d2203695a5f Mon Sep 17 00:00:00 2001 From: Sasha Levin <sashal@kernel.org> Date: Fri, 17 Jul 2020 13:00:47 -0400 Subject: [PATCH] Revert "usb/ohci-platform: Fix a warning when hibernating"
diff --git a/queue/Revert-usb-xhci-plat-Set-PM-runtime-as-active-on-res.patch b/queue/Revert-usb-xhci-plat-Set-PM-runtime-as-active-on-res.patch index 0a790f6..088f2f0 100644 --- a/queue/Revert-usb-xhci-plat-Set-PM-runtime-as-active-on-res.patch +++ b/queue/Revert-usb-xhci-plat-Set-PM-runtime-as-active-on-res.patch
@@ -1,4 +1,4 @@ -From 8c4422e3d3d754a3b2ee64eb5719c861a2e88064 Mon Sep 17 00:00:00 2001 +From 0a18a91856759ee562da0d4326127bfc95173912 Mon Sep 17 00:00:00 2001 From: Sasha Levin <sashal@kernel.org> Date: Fri, 17 Jul 2020 13:01:26 -0400 Subject: [PATCH] Revert "usb/xhci-plat: Set PM runtime as active on resume" @@ -58,4 +58,4 @@ static int __maybe_unused xhci_plat_runtime_suspend(struct device *dev) -- 2.27.0 -- +
diff --git a/queue/Revert-vxlan-fix-tos-value-before-xmit.patch b/queue/Revert-vxlan-fix-tos-value-before-xmit.patch index 631553e..a15caea 100644 --- a/queue/Revert-vxlan-fix-tos-value-before-xmit.patch +++ b/queue/Revert-vxlan-fix-tos-value-before-xmit.patch
@@ -1,4 +1,4 @@ -From 710c94199a812d6c8241e8828c2ec9b35c5358f3 Mon Sep 17 00:00:00 2001 +From 41b1bcde46796c1a69d016eee58f2d2ab7a1f268 Mon Sep 17 00:00:00 2001 From: Hangbin Liu <liuhangbin@gmail.com> Date: Wed, 5 Aug 2020 10:41:31 +0800 Subject: [PATCH] Revert "vxlan: fix tos value before xmit" @@ -36,6 +36,7 @@ Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> Acked-by: Guillaume Nault <gnault@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/vxlan.c b/drivers/net/vxlan.c index f6c3030e282f..195fae570455 100644
diff --git a/queue/SUNRPC-Fix-SUNRPC-Add-len-parameter-to-gss_unwrap.patch b/queue/SUNRPC-Fix-SUNRPC-Add-len-parameter-to-gss_unwrap.patch index 1a0e6b3..d1ea4b3 100644 --- a/queue/SUNRPC-Fix-SUNRPC-Add-len-parameter-to-gss_unwrap.patch +++ b/queue/SUNRPC-Fix-SUNRPC-Add-len-parameter-to-gss_unwrap.patch
@@ -1,4 +1,4 @@ -From 986a4b63d3bc5f2c0eb4083b05aff2bf883b7b2f Mon Sep 17 00:00:00 2001 +From c16eddb7342500dc0496e3b5c0353493bf8860bd Mon Sep 17 00:00:00 2001 From: Chuck Lever <chuck.lever@oracle.com> Date: Fri, 24 Jul 2020 17:08:57 -0400 Subject: [PATCH] SUNRPC: Fix ("SUNRPC: Add "@len" parameter to gss_unwrap()") @@ -23,6 +23,7 @@ Fixes: 31c9590ae468 ("SUNRPC: Add "@len" parameter to gss_unwrap()") Reviewed-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/sunrpc/auth_gss/gss_krb5_wrap.c b/net/sunrpc/auth_gss/gss_krb5_wrap.c index cf0fd170ac18..90b8329fef82 100644 @@ -38,10 +39,10 @@ /* Trim off the trailing "extra count" and checksum blob */ xdr_buf_trim(buf, ec + GSS_KRB5_TOK_HDR_LEN + tailskip); diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c -index 7d83f54aaaa6..258b04372f85 100644 +index 0f95372bffe2..0bd2df7f2503 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c -@@ -990,7 +990,6 @@ unwrap_priv_data(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, struct gs +@@ -949,7 +949,6 @@ unwrap_priv_data(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, struct gs maj_stat = gss_unwrap(ctx, 0, priv_len, buf); pad = priv_len - buf->len;
diff --git a/queue/USB-c67x00-fix-use-after-free-in-c67x00_giveback_urb.patch b/queue/USB-c67x00-fix-use-after-free-in-c67x00_giveback_urb.patch index 2ac6fa8..78b56bc 100644 --- a/queue/USB-c67x00-fix-use-after-free-in-c67x00_giveback_urb.patch +++ b/queue/USB-c67x00-fix-use-after-free-in-c67x00_giveback_urb.patch
@@ -1,4 +1,4 @@ -From 211f08347355cba1f769bbf3355816a12b3ddd55 Mon Sep 17 00:00:00 2001 +From 76e2e15bc72878a584518f76cfb290ecd00f2b16 Mon Sep 17 00:00:00 2001 From: Tom Rix <trix@redhat.com> Date: Wed, 8 Jul 2020 06:12:43 -0700 Subject: [PATCH] USB: c67x00: fix use after free in c67x00_giveback_urb @@ -35,6 +35,7 @@ Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200708131243.24336-1-trix@redhat.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/c67x00/c67x00-sched.c b/drivers/usb/c67x00/c67x00-sched.c index 633c52de3bb3..9865750bc31e 100644
diff --git a/queue/USB-serial-ch341-add-new-Product-ID-for-CH340.patch b/queue/USB-serial-ch341-add-new-Product-ID-for-CH340.patch index 5f41be0..0db0231 100644 --- a/queue/USB-serial-ch341-add-new-Product-ID-for-CH340.patch +++ b/queue/USB-serial-ch341-add-new-Product-ID-for-CH340.patch
@@ -1,4 +1,4 @@ -From 5d0136f8e79f8287e6a36780601f0ce797cf11c2 Mon Sep 17 00:00:00 2001 +From dea640fe7da5688a37d895bceda7e8c1045f294e Mon Sep 17 00:00:00 2001 From: Igor Moura <imphilippini@gmail.com> Date: Tue, 23 Jun 2020 05:11:11 -0300 Subject: [PATCH] USB: serial: ch341: add new Product ID for CH340 @@ -18,12 +18,13 @@ Signed-off-by: Igor Moura <imphilippini@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Johan Hovold <johan@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c -index 89675ee29645..8fbaef5c9d69 100644 +index dcdd541b3291..390bc4b25045 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c -@@ -77,6 +77,7 @@ +@@ -81,6 +81,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x4348, 0x5523) },
diff --git a/queue/USB-serial-cypress_m8-enable-Simply-Automated-UPB-PI.patch b/queue/USB-serial-cypress_m8-enable-Simply-Automated-UPB-PI.patch index 58f81cd..3daf0db 100644 --- a/queue/USB-serial-cypress_m8-enable-Simply-Automated-UPB-PI.patch +++ b/queue/USB-serial-cypress_m8-enable-Simply-Automated-UPB-PI.patch
@@ -1,4 +1,4 @@ -From 5c45d04c5081c1830d674f4d22d4400ea2083afe Mon Sep 17 00:00:00 2001 +From 3861bc7415bf4bd317c2b690fa20b526a71fffc6 Mon Sep 17 00:00:00 2001 From: James Hilliard <james.hilliard1@gmail.com> Date: Tue, 16 Jun 2020 16:04:03 -0600 Subject: [PATCH] USB: serial: cypress_m8: enable Simply Automated UPB PIM @@ -34,9 +34,10 @@ Cc: stable@vger.kernel.org [ johan: amend VID define entry ] Signed-off-by: Johan Hovold <johan@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c -index 216edd5826ca..ecda82198798 100644 +index 72d3ae1ebc64..77681229486e 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c @@ -59,6 +59,7 @@ static const struct usb_device_id id_table_earthmate[] = {
diff --git a/queue/USB-serial-iuu_phoenix-fix-memory-corruption.patch b/queue/USB-serial-iuu_phoenix-fix-memory-corruption.patch index 3af0e16..45380cb 100644 --- a/queue/USB-serial-iuu_phoenix-fix-memory-corruption.patch +++ b/queue/USB-serial-iuu_phoenix-fix-memory-corruption.patch
@@ -1,4 +1,4 @@ -From e7b931bee739e8a77ae216e613d3b99342b6dec0 Mon Sep 17 00:00:00 2001 +From 01609e7d83f121e8043d5f0649fcf13f66d9c7c9 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Wed, 15 Jul 2020 11:02:45 +0200 Subject: [PATCH] USB: serial: iuu_phoenix: fix memory corruption @@ -11,6 +11,7 @@ Fixes: 5fcf62b0f1f2 ("tty: iuu_phoenix: fix locking.") Cc: stable <stable@vger.kernel.org> # 2.6.31 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 d5bff69b1769..b8dfeb4fb2ed 100644
diff --git a/queue/USB-serial-option-add-GosunCn-GM500-series.patch b/queue/USB-serial-option-add-GosunCn-GM500-series.patch index fbe24f9..56fcb89 100644 --- a/queue/USB-serial-option-add-GosunCn-GM500-series.patch +++ b/queue/USB-serial-option-add-GosunCn-GM500-series.patch
@@ -1,4 +1,4 @@ -From 08d4ef5cc9203a113702f24725f6cf4db476c958 Mon Sep 17 00:00:00 2001 +From f260b762c993f0d6351cd6c2140cd43c16e58f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rgen=20Storvist?= <jorgen.storvist@gmail.com> Date: Tue, 23 Jun 2020 00:13:59 +0200 Subject: [PATCH] USB: serial: option: add GosunCn GM500 series @@ -58,6 +58,7 @@ Signed-off-by: Jörgen Storvist <jorgen.storvist@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Johan Hovold <johan@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 254a8bbeea67..ef52841537dd 100644
diff --git a/queue/USB-serial-option-add-Quectel-EG95-LTE-modem.patch b/queue/USB-serial-option-add-Quectel-EG95-LTE-modem.patch index 4bc5569..f44c2a1 100644 --- a/queue/USB-serial-option-add-Quectel-EG95-LTE-modem.patch +++ b/queue/USB-serial-option-add-Quectel-EG95-LTE-modem.patch
@@ -1,4 +1,4 @@ -From da6902e5b6dbca9081e3d377f9802d4fd0c5ea59 Mon Sep 17 00:00:00 2001 +From 871bbdb156189a1d091a28ee543bfa4a5a1fc652 Mon Sep 17 00:00:00 2001 From: AceLan Kao <acelan.kao@canonical.com> Date: Tue, 7 Jul 2020 16:15:53 +0800 Subject: [PATCH] USB: serial: option: add Quectel EG95 LTE modem @@ -22,6 +22,7 @@ Signed-off-by: AceLan Kao <acelan.kao@canonical.com> Cc: stable@vger.kernel.org Signed-off-by: Johan Hovold <johan@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index ef52841537dd..9b7cee98ea60 100644
diff --git a/queue/apparmor-ensure-that-dfa-state-tables-have-entries.patch b/queue/apparmor-ensure-that-dfa-state-tables-have-entries.patch index 8656cd8..9a82770 100644 --- a/queue/apparmor-ensure-that-dfa-state-tables-have-entries.patch +++ b/queue/apparmor-ensure-that-dfa-state-tables-have-entries.patch
@@ -1,4 +1,4 @@ -From c27c6bd2c4d6b6bb779f9b722d5607993e1d5e5c Mon Sep 17 00:00:00 2001 +From 3436de4bd62797de28c70c45e7e6424378340532 Mon Sep 17 00:00:00 2001 From: John Johansen <john.johansen@canonical.com> Date: Mon, 30 Mar 2020 23:37:54 -0700 Subject: [PATCH] apparmor: ensure that dfa state tables have entries @@ -13,9 +13,10 @@ Fixes: d901d6a298dc ("apparmor: dfa split verification of table headers") Reported-by: Mike Salvatore <mike.salvatore@canonical.com> Signed-off-by: John Johansen <john.johansen@canonical.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/security/apparmor/match.c b/security/apparmor/match.c -index e605b7d53fb4..3e9e1eaf990e 100644 +index 6ccd3734a841..43669403f755 100644 --- a/security/apparmor/match.c +++ b/security/apparmor/match.c @@ -97,6 +97,9 @@ static struct table_header *unpack_table(char *blob, size_t bsize)
diff --git a/queue/arm64-alternatives-don-t-patch-up-internal-branches.patch b/queue/arm64-alternatives-don-t-patch-up-internal-branches.patch index 8f4c727..617b408 100644 --- a/queue/arm64-alternatives-don-t-patch-up-internal-branches.patch +++ b/queue/arm64-alternatives-don-t-patch-up-internal-branches.patch
@@ -1,4 +1,4 @@ -From 5679b28142193a62f6af93249c0477be9f0c669b Mon Sep 17 00:00:00 2001 +From 521647b4a07fef9cfd433754ad4488e25a56e364 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel <ardb@kernel.org> Date: Thu, 9 Jul 2020 15:59:53 +0300 Subject: [PATCH] arm64/alternatives: don't patch up internal branches @@ -25,6 +25,7 @@ Tested-by: Alexandru Elisei <alexandru.elisei@arm.com> Link: https://lore.kernel.org/r/20200709125953.30918-1-ardb@kernel.org Signed-off-by: Will Deacon <will@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/kernel/alternative.c b/arch/arm64/kernel/alternative.c index d1757ef1b1e7..73039949b5ce 100644
diff --git a/queue/arm64-alternatives-move-length-validation-inside-the.patch b/queue/arm64-alternatives-move-length-validation-inside-the.patch index 965aa54..de4f548 100644 --- a/queue/arm64-alternatives-move-length-validation-inside-the.patch +++ b/queue/arm64-alternatives-move-length-validation-inside-the.patch
@@ -1,4 +1,4 @@ -From d3780f8ae52ce4eaa3d998c939ec4273c1bda38f Mon Sep 17 00:00:00 2001 +From 7b86ab52bd76f845d1670bf7427f9c17d7c6e86e Mon Sep 17 00:00:00 2001 From: Sami Tolvanen <samitolvanen@google.com> Date: Thu, 30 Jul 2020 08:37:01 -0700 Subject: [PATCH] arm64/alternatives: move length validation inside the @@ -18,6 +18,7 @@ Link: https://github.com/ClangBuiltLinux/linux/issues/1078 Link: https://lore.kernel.org/r/20200730153701.3892953-1-samitolvanen@google.com Signed-off-by: Will Deacon <will@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/include/asm/alternative.h b/arch/arm64/include/asm/alternative.h index f7facb4eda9a..aa9ad4097361 100644
diff --git a/queue/arm64-alternatives-use-subsections-for-replacement-s.patch b/queue/arm64-alternatives-use-subsections-for-replacement-s.patch index b7def1f..a73e6df 100644 --- a/queue/arm64-alternatives-use-subsections-for-replacement-s.patch +++ b/queue/arm64-alternatives-use-subsections-for-replacement-s.patch
@@ -1,4 +1,4 @@ -From 7018dc43e731f1ced7dddaffe79e964efbbfa94e Mon Sep 17 00:00:00 2001 +From 7eacf3456b1d20454f12e34c131073fd2a7c264c Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel <ardb@kernel.org> Date: Tue, 30 Jun 2020 10:19:21 +0200 Subject: [PATCH] arm64/alternatives: use subsections for replacement sequences @@ -49,6 +49,7 @@ Cc: Dave P Martin <dave.martin@arm.com> Link: https://lore.kernel.org/r/20200630081921.13443-1-ardb@kernel.org Signed-off-by: Will Deacon <will@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/include/asm/alternative.h b/arch/arm64/include/asm/alternative.h index 97624ee1aaa3..f7facb4eda9a 100644
diff --git a/queue/arm64-compat-Ensure-upper-32-bits-of-x0-are-zero-on-.patch b/queue/arm64-compat-Ensure-upper-32-bits-of-x0-are-zero-on-.patch index b2da0b2..c4f56e4 100644 --- a/queue/arm64-compat-Ensure-upper-32-bits-of-x0-are-zero-on-.patch +++ b/queue/arm64-compat-Ensure-upper-32-bits-of-x0-are-zero-on-.patch
@@ -1,4 +1,4 @@ -From 15956689a0e60aa0c795174f3c310b60d8794235 Mon Sep 17 00:00:00 2001 +From a3f210ef2caf380a32afaf33d14e3c495b0d5f86 Mon Sep 17 00:00:00 2001 From: Will Deacon <will@kernel.org> Date: Fri, 3 Jul 2020 12:08:42 +0100 Subject: [PATCH] arm64: compat: Ensure upper 32 bits of x0 are zero on syscall @@ -20,6 +20,7 @@ Cc: Keno Fischer <keno@juliacomputing.com> Cc: Luis Machado <luis.machado@linaro.org> Signed-off-by: Will Deacon <will@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h index 65299a2dcf9c..cfc0672013f6 100644 @@ -52,7 +53,7 @@ #define SYSCALL_MAX_ARGS 6 diff --git a/arch/arm64/kernel/syscall.c b/arch/arm64/kernel/syscall.c -index 7c14466a12af..98a26d4e7b0c 100644 +index b7b0d7f9ea05..1457a0ba83db 100644 --- a/arch/arm64/kernel/syscall.c +++ b/arch/arm64/kernel/syscall.c @@ -50,6 +50,9 @@ static void invoke_syscall(struct pt_regs *regs, unsigned int scno,
diff --git a/queue/arm64-dts-g12-common-add-parkmode_disable_ss_quirk-o.patch b/queue/arm64-dts-g12-common-add-parkmode_disable_ss_quirk-o.patch index a87469d..4fe111b 100644 --- a/queue/arm64-dts-g12-common-add-parkmode_disable_ss_quirk-o.patch +++ b/queue/arm64-dts-g12-common-add-parkmode_disable_ss_quirk-o.patch
@@ -1,4 +1,4 @@ -From 5767379398674864edc14da6ef0e7bd863bb4046 Mon Sep 17 00:00:00 2001 +From b22a1d54fa98f1e35dfd44482d554f6011b657da Mon Sep 17 00:00:00 2001 From: Neil Armstrong <narmstrong@baylibre.com> Date: Fri, 21 Feb 2020 10:15:32 +0100 Subject: [PATCH] arm64: dts: g12-common: add parkmode_disable_ss_quirk on DWC3 @@ -23,6 +23,7 @@ Cc: Jianxin Pan <jianxin.pan@amlogic.com> CC: Dongjin Kim <tobetter@gmail.com> Link: https://lore.kernel.org/r/20200221091532.8142-4-narmstrong@baylibre.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi index 4a47344dc252..85b3ba605a23 100644
diff --git a/queue/arm64-dts-meson-add-missing-gxl-rng-clock.patch b/queue/arm64-dts-meson-add-missing-gxl-rng-clock.patch index 3547c20..54f2df0 100644 --- a/queue/arm64-dts-meson-add-missing-gxl-rng-clock.patch +++ b/queue/arm64-dts-meson-add-missing-gxl-rng-clock.patch
@@ -1,4 +1,4 @@ -From 95ca6f06dd4827ff63be5154120c7a8511cd9a41 Mon Sep 17 00:00:00 2001 +From 1551fc9c2fa37a44d5ad66e5d204ce86f6f53cfa Mon Sep 17 00:00:00 2001 From: Jerome Brunet <jbrunet@baylibre.com> Date: Wed, 17 Jun 2020 14:53:46 +0200 Subject: [PATCH] arm64: dts: meson: add missing gxl rng clock @@ -13,12 +13,13 @@ Signed-off-by: Kevin Hilman <khilman@baylibre.com> Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> Link: https://lore.kernel.org/r/20200617125346.1163527-1-jbrunet@baylibre.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi -index fc59c8534c0f..6c8b189884ca 100644 +index 3093ae421b17..f66a545aab51 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi -@@ -337,6 +337,11 @@ clkc: clock-controller { +@@ -291,6 +291,11 @@ }; };
diff --git a/queue/arm64-dts-meson-gxl-s805x-reduce-initial-Mali450-cor.patch b/queue/arm64-dts-meson-gxl-s805x-reduce-initial-Mali450-cor.patch index 535f48a..64d9cda 100644 --- a/queue/arm64-dts-meson-gxl-s805x-reduce-initial-Mali450-cor.patch +++ b/queue/arm64-dts-meson-gxl-s805x-reduce-initial-Mali450-cor.patch
@@ -1,4 +1,4 @@ -From 6c0ca721711005698345a099e9ecda499e109e9c Mon Sep 17 00:00:00 2001 +From 5bdc91397c2fc9a943e72d9b2e39072a97a8258a Mon Sep 17 00:00:00 2001 From: Neil Armstrong <narmstrong@baylibre.com> Date: Thu, 18 Jun 2020 15:27:37 +0200 Subject: [PATCH] arm64: dts: meson-gxl-s805x: reduce initial Mali450 core @@ -34,6 +34,7 @@ Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Kevin Hilman <khilman@baylibre.com> Link: https://lore.kernel.org/r/20200618132737.14243-1-narmstrong@baylibre.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts index 82b1c4851147..e034bbff8e66 100644
diff --git a/queue/arm64-ptrace-Consistently-use-pseudo-singlestep-exce.patch b/queue/arm64-ptrace-Consistently-use-pseudo-singlestep-exce.patch index eef5624..7f8d96e 100644 --- a/queue/arm64-ptrace-Consistently-use-pseudo-singlestep-exce.patch +++ b/queue/arm64-ptrace-Consistently-use-pseudo-singlestep-exce.patch
@@ -1,4 +1,4 @@ -From 66fd5842af98ef7c0607cd939fcc6ceb80c2db5f Mon Sep 17 00:00:00 2001 +From 8b5ce5c566de10683b369d645266ed1339a8bf25 Mon Sep 17 00:00:00 2001 From: Will Deacon <will@kernel.org> Date: Thu, 2 Jul 2020 21:16:20 +0100 Subject: [PATCH] arm64: ptrace: Consistently use pseudo-singlestep exceptions @@ -30,6 +30,7 @@ Tested-by: Luis Machado <luis.machado@linaro.org> Reported-by: Keno Fischer <keno@juliacomputing.com> Signed-off-by: Will Deacon <will@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h index 2372e97db29c..90441da764ab 100644
diff --git a/queue/arm64-ptrace-Override-SPSR.SS-when-single-stepping-i.patch b/queue/arm64-ptrace-Override-SPSR.SS-when-single-stepping-i.patch index 2dfe6b6..e321000 100644 --- a/queue/arm64-ptrace-Override-SPSR.SS-when-single-stepping-i.patch +++ b/queue/arm64-ptrace-Override-SPSR.SS-when-single-stepping-i.patch
@@ -1,4 +1,4 @@ -From 3a5a4366cecc25daa300b9a9174f7fdd352b9068 Mon Sep 17 00:00:00 2001 +From 0c230e90e9bf0a60f0c16e0ba63d86553ea72457 Mon Sep 17 00:00:00 2001 From: Will Deacon <will@kernel.org> Date: Thu, 13 Feb 2020 12:06:26 +0000 Subject: [PATCH] arm64: ptrace: Override SPSR.SS when single-stepping is @@ -32,12 +32,13 @@ Reported-by: Luis Machado <luis.machado@linaro.org> Tested-by: Luis Machado <luis.machado@linaro.org> Signed-off-by: Will Deacon <will@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h -index e5ceea213e39..0b298f48f5bf 100644 +index d8ec5bb881c2..6c289542cee5 100644 --- a/arch/arm64/include/asm/debug-monitors.h +++ b/arch/arm64/include/asm/debug-monitors.h -@@ -109,6 +109,8 @@ void disable_debug_monitors(enum dbg_active_el el); +@@ -111,6 +111,8 @@ void disable_debug_monitors(enum dbg_active_el el); void user_rewind_single_step(struct task_struct *task); void user_fastforward_single_step(struct task_struct *task); @@ -47,7 +48,7 @@ void kernel_enable_single_step(struct pt_regs *regs); void kernel_disable_single_step(void); diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c -index 5df49366e9ab..91146c0a3691 100644 +index f8719bd30850..b203751bf126 100644 --- a/arch/arm64/kernel/debug-monitors.c +++ b/arch/arm64/kernel/debug-monitors.c @@ -141,17 +141,20 @@ postcore_initcall(debug_monitors_init); @@ -92,10 +93,10 @@ void kernel_enable_single_step(struct pt_regs *regs) { diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c -index 057d4aa1af4d..22f9053b55b6 100644 +index 9b4edc23a442..88d260d63002 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c -@@ -1947,8 +1947,8 @@ static int valid_native_regs(struct user_pt_regs *regs) +@@ -1930,8 +1930,8 @@ static int valid_native_regs(struct user_pt_regs *regs) */ int valid_user_regs(struct user_pt_regs *regs, struct task_struct *task) {
diff --git a/queue/blk-mq-debugfs-update-blk_queue_flag_name-accordingl.patch b/queue/blk-mq-debugfs-update-blk_queue_flag_name-accordingl.patch index 9d1b470..3844237 100644 --- a/queue/blk-mq-debugfs-update-blk_queue_flag_name-accordingl.patch +++ b/queue/blk-mq-debugfs-update-blk_queue_flag_name-accordingl.patch
@@ -1,4 +1,4 @@ -From bfe373f608cf81b7626dfeb904001b0e867c5110 Mon Sep 17 00:00:00 2001 +From 1644987b526c74413c14eb98170c39ac4ef7ad55 Mon Sep 17 00:00:00 2001 From: Hou Tao <houtao1@huawei.com> Date: Tue, 28 Apr 2020 09:54:56 +0800 Subject: [PATCH] blk-mq-debugfs: update blk_queue_flag_name[] accordingly for @@ -12,9 +12,10 @@ Reviewed-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Jens Axboe <axboe@kernel.dk> [PG: drop two FLAG_NAME not yet present in v5.2.x kernels.] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c -index 15df3a36e9fa..e0b2bc131bf5 100644 +index 3afe327f816f..082faacb9993 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -125,6 +125,7 @@ static const char *const blk_queue_flag_name[] = { @@ -26,10 +27,10 @@ #undef QUEUE_FLAG_NAME diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h -index 8fd900998b4e..57241417ff2f 100644 +index ab54e897eb47..0db80f6327eb 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h -@@ -590,6 +590,7 @@ struct request_queue { +@@ -589,6 +589,7 @@ struct request_queue { u64 write_hints[BLK_MAX_WRITE_HINTS]; };
diff --git a/queue/blktrace-Avoid-sparse-warnings-when-assigning-q-blk_.patch b/queue/blktrace-Avoid-sparse-warnings-when-assigning-q-blk_.patch index 185cbf3..9e25866 100644 --- a/queue/blktrace-Avoid-sparse-warnings-when-assigning-q-blk_.patch +++ b/queue/blktrace-Avoid-sparse-warnings-when-assigning-q-blk_.patch
@@ -1,4 +1,4 @@ -From c3dbe541ef77754729de5e82be2d6e5d267c6c8c Mon Sep 17 00:00:00 2001 +From 30fe4076e26b4f17fbe63def291f06bba5f2b54f Mon Sep 17 00:00:00 2001 From: Jan Kara <jack@suse.cz> Date: Fri, 5 Jun 2020 16:58:37 +0200 Subject: [PATCH] blktrace: Avoid sparse warnings when assigning q->blk_trace @@ -21,12 +21,13 @@ Reported-by: kbuild test robot <lkp@intel.com> Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c -index 8fd36e827f14..5ef0484513ec 100644 +index eaee960153e1..9bedf962e162 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c -@@ -347,7 +347,8 @@ static int __blk_trace_remove(struct request_queue *q) +@@ -348,7 +348,8 @@ static int __blk_trace_remove(struct request_queue *q) { struct blk_trace *bt; @@ -36,7 +37,7 @@ if (!bt) return -EINVAL; -@@ -501,7 +502,8 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, +@@ -502,7 +503,8 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, * bdev can be NULL, as with scsi-generic, this is a helpful as * we can be. */ @@ -46,7 +47,7 @@ pr_warn("Concurrent blktraces are not allowed on %s\n", buts->name); return -EBUSY; -@@ -556,10 +558,7 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, +@@ -557,10 +559,7 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, bt->pid = buts->pid; bt->trace_state = Blktrace_setup; @@ -58,7 +59,7 @@ get_probe_ref(); ret = 0; -@@ -1642,7 +1641,8 @@ static int blk_trace_remove_queue(struct request_queue *q) +@@ -1634,7 +1633,8 @@ static int blk_trace_remove_queue(struct request_queue *q) { struct blk_trace *bt; @@ -68,7 +69,7 @@ if (bt == NULL) return -EINVAL; -@@ -1674,10 +1674,7 @@ static int blk_trace_setup_queue(struct request_queue *q, +@@ -1666,10 +1666,7 @@ static int blk_trace_setup_queue(struct request_queue *q, blk_trace_setup_lba(bt, bdev);
diff --git a/queue/blktrace-annotate-required-lock-on-do_blk_trace_setu.patch b/queue/blktrace-annotate-required-lock-on-do_blk_trace_setu.patch index e0b6c79..1b42c2a 100644 --- a/queue/blktrace-annotate-required-lock-on-do_blk_trace_setu.patch +++ b/queue/blktrace-annotate-required-lock-on-do_blk_trace_setu.patch
@@ -1,4 +1,4 @@ -From a67549c8e568627290234e9fbe833cb9dfd36b55 Mon Sep 17 00:00:00 2001 +From 7db657bfbbe87d2706e9068a111337aeaea7723d Mon Sep 17 00:00:00 2001 From: Luis Chamberlain <mcgrof@kernel.org> Date: Fri, 19 Jun 2020 20:47:26 +0000 Subject: [PATCH] blktrace: annotate required lock on do_blk_trace_setup() @@ -11,12 +11,13 @@ Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> Reviewed-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c -index 5ef0484513ec..5a88a6b55933 100644 +index 9bedf962e162..e6dfc7f880d0 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c -@@ -483,6 +483,8 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, +@@ -484,6 +484,8 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, struct dentry *dir = NULL; int ret;
diff --git a/queue/blktrace-ensure-our-debugfs-dir-exists.patch b/queue/blktrace-ensure-our-debugfs-dir-exists.patch index cb70c43..f5ba7aa 100644 --- a/queue/blktrace-ensure-our-debugfs-dir-exists.patch +++ b/queue/blktrace-ensure-our-debugfs-dir-exists.patch
@@ -1,4 +1,4 @@ -From b431ef837e3374da0db8ff6683170359aaa0859c Mon Sep 17 00:00:00 2001 +From 58920ab37a6ac459b933f8253eae72f17e332a00 Mon Sep 17 00:00:00 2001 From: Luis Chamberlain <mcgrof@kernel.org> Date: Fri, 19 Jun 2020 20:47:29 +0000 Subject: [PATCH] blktrace: ensure our debugfs dir exists @@ -31,12 +31,13 @@ Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c -index e27dee345d81..46c273f4dec5 100644 +index 55b37cd39a17..8f18311f9be5 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c -@@ -538,6 +538,18 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, +@@ -539,6 +539,18 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, #endif bt->dir = dir = debugfs_create_dir(buts->name, blk_debugfs_root);
diff --git a/queue/blktrace-fix-debugfs-use-after-free.patch b/queue/blktrace-fix-debugfs-use-after-free.patch index 926d929..c0a9639 100644 --- a/queue/blktrace-fix-debugfs-use-after-free.patch +++ b/queue/blktrace-fix-debugfs-use-after-free.patch
@@ -1,4 +1,4 @@ -From bad8e64fb19d3a0de5e564d9a7271c31bd684369 Mon Sep 17 00:00:00 2001 +From 6e22187b80f60f9ad5d55b76a88d87841aaa383a Mon Sep 17 00:00:00 2001 From: Luis Chamberlain <mcgrof@kernel.org> Date: Fri, 19 Jun 2020 20:47:28 +0000 Subject: [PATCH] blktrace: fix debugfs use after free @@ -170,12 +170,13 @@ Cc: "James E.J. Bottomley" <jejb@linux.ibm.com> Cc: yu kuai <yukuai3@huawei.com> Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c -index 5a88a6b55933..e27dee345d81 100644 +index e6dfc7f880d0..55b37cd39a17 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c -@@ -524,10 +524,18 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, +@@ -525,10 +525,18 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, if (!bt->msg_data) goto err; @@ -198,7 +199,7 @@ bt->dir = dir = debugfs_create_dir(buts->name, blk_debugfs_root); bt->dev = dev; -@@ -565,8 +573,6 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, +@@ -566,8 +574,6 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, ret = 0; err:
diff --git a/queue/blktrace-no-need-to-check-return-value-of-debugfs_cr.patch b/queue/blktrace-no-need-to-check-return-value-of-debugfs_cr.patch index 62807b8..be5d8f6 100644 --- a/queue/blktrace-no-need-to-check-return-value-of-debugfs_cr.patch +++ b/queue/blktrace-no-need-to-check-return-value-of-debugfs_cr.patch
@@ -1,4 +1,4 @@ -From 3e6f176f304ee8effec698ebaff6b7baecb5e1e6 Mon Sep 17 00:00:00 2001 +From dff02c92ae60dcdad36f6863d815c540485bea0d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Date: Tue, 22 Jan 2019 16:21:41 +0100 Subject: [PATCH] blktrace: no need to check return value of debugfs_create @@ -15,12 +15,13 @@ Cc: Ingo Molnar <mingo@redhat.com> Cc: linux-block@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c -index e1c6d79fb4cc..2d6e93ab0478 100644 +index 45369eccbc01..eaee960153e1 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c -@@ -512,8 +512,6 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, +@@ -526,8 +526,6 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, dir = debugfs_lookup(buts->name, blk_debugfs_root); if (!dir) bt->dir = dir = debugfs_create_dir(buts->name, blk_debugfs_root); @@ -29,7 +30,7 @@ bt->dev = dev; atomic_set(&bt->dropped, 0); -@@ -522,12 +520,8 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, +@@ -536,12 +534,8 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, ret = -EIO; bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt, &blk_dropped_fops);
diff --git a/queue/block-fix-get_max_segment_size-overflow-on-32bit-arc.patch b/queue/block-fix-get_max_segment_size-overflow-on-32bit-arc.patch index eb67785..3dd6728 100644 --- a/queue/block-fix-get_max_segment_size-overflow-on-32bit-arc.patch +++ b/queue/block-fix-get_max_segment_size-overflow-on-32bit-arc.patch
@@ -1,4 +1,4 @@ -From 48ca126591ee79a713c18eebc4e8d47457ad21fa Mon Sep 17 00:00:00 2001 +From 60c4822311cdd03fc8a761b2012ab3b41d93d861 Mon Sep 17 00:00:00 2001 From: Ming Lei <ming.lei@redhat.com> Date: Sat, 11 Jan 2020 20:57:43 +0800 Subject: [PATCH] block: fix get_max_segment_size() overflow on 32bit arch @@ -21,6 +21,7 @@ Tested-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Ming Lei <ming.lei@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/block/blk-merge.c b/block/blk-merge.c index 849b718b5252..4140c9594b92 100644
diff --git a/queue/block-fix-splitting-segments-on-boundary-masks.patch b/queue/block-fix-splitting-segments-on-boundary-masks.patch index f74a859..85b5039 100644 --- a/queue/block-fix-splitting-segments-on-boundary-masks.patch +++ b/queue/block-fix-splitting-segments-on-boundary-masks.patch
@@ -1,4 +1,4 @@ -From 6ed4b54a3a734b1ab17c1a3fae1c8af1212ae3bc Mon Sep 17 00:00:00 2001 +From 4921f7671814718e3e63189c5e692e67d55375fb Mon Sep 17 00:00:00 2001 From: Ming Lei <ming.lei@redhat.com> Date: Sun, 29 Dec 2019 10:32:30 +0800 Subject: [PATCH] block: fix splitting segments on boundary masks @@ -34,6 +34,7 @@ page as const... Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/block/blk-merge.c b/block/blk-merge.c index 17713d7d98d5..849b718b5252 100644
diff --git a/queue/cgroup-Fix-sock_cgroup_data-on-big-endian.patch b/queue/cgroup-Fix-sock_cgroup_data-on-big-endian.patch index a7e75e7..cb111c0 100644 --- a/queue/cgroup-Fix-sock_cgroup_data-on-big-endian.patch +++ b/queue/cgroup-Fix-sock_cgroup_data-on-big-endian.patch
@@ -1,4 +1,4 @@ -From 14b032b8f8fce03a546dcf365454bec8c4a58d7d Mon Sep 17 00:00:00 2001 +From cf36ce0f5b511b2696be4ee75725282946e438ab Mon Sep 17 00:00:00 2001 From: Cong Wang <xiyou.wangcong@gmail.com> Date: Thu, 9 Jul 2020 16:28:44 -0700 Subject: [PATCH] cgroup: Fix sock_cgroup_data on big-endian. @@ -11,12 +11,13 @@ Fixes: ad0f75e5f57c ("cgroup: fix cgroup_sk_alloc() for sk_clone_lock()") Reported-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h -index 4f1cd0edc57d..fee0b5547cd0 100644 +index 7d1af70900ae..6a5604d3ea24 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h -@@ -792,6 +792,7 @@ struct sock_cgroup_data { +@@ -799,6 +799,7 @@ struct sock_cgroup_data { struct { u8 is_data : 1; u8 no_refcnt : 1; @@ -24,7 +25,7 @@ u8 padding; u16 prioidx; u32 classid; -@@ -801,6 +802,7 @@ struct sock_cgroup_data { +@@ -808,6 +809,7 @@ struct sock_cgroup_data { u32 classid; u16 prioidx; u8 padding;
diff --git a/queue/cgroup-fix-cgroup_sk_alloc-for-sk_clone_lock.patch b/queue/cgroup-fix-cgroup_sk_alloc-for-sk_clone_lock.patch index e92d67a..43ae682 100644 --- a/queue/cgroup-fix-cgroup_sk_alloc-for-sk_clone_lock.patch +++ b/queue/cgroup-fix-cgroup_sk_alloc-for-sk_clone_lock.patch
@@ -1,4 +1,4 @@ -From ad0f75e5f57ccbceec13274e1e242f2b5a6397ed Mon Sep 17 00:00:00 2001 +From b3bfc11529c31681809f69fda3b731c66ba78bd3 Mon Sep 17 00:00:00 2001 From: Cong Wang <xiyou.wangcong@gmail.com> Date: Thu, 2 Jul 2020 11:52:56 -0700 Subject: [PATCH] cgroup: fix cgroup_sk_alloc() for sk_clone_lock() @@ -50,6 +50,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [PG: use 4.19.134-stable version instead of mainline.] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index b4e766e93f6e..7d1af70900ae 100644
diff --git a/queue/cifs-prevent-truncation-from-long-to-int-in-wait_for.patch b/queue/cifs-prevent-truncation-from-long-to-int-in-wait_for.patch index af63949..75d525a 100644 --- a/queue/cifs-prevent-truncation-from-long-to-int-in-wait_for.patch +++ b/queue/cifs-prevent-truncation-from-long-to-int-in-wait_for.patch
@@ -1,4 +1,4 @@ -From 19e888678bac8c82206eb915eaf72741b2a2615c Mon Sep 17 00:00:00 2001 +From b4f1e792d71e51039a84c27c33fc8b787a896302 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg <lsahlber@redhat.com> Date: Thu, 2 Jul 2020 10:55:41 +1000 Subject: [PATCH] cifs: prevent truncation from long to int in @@ -12,12 +12,13 @@ Reported-by: Marshall Midden <marshallmidden@gmail.com> Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> Signed-off-by: Steve French <stfrench@microsoft.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c -index d11e31064679..84433d0653f9 100644 +index 5bb87a61d913..44079b1a0456 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c -@@ -523,7 +523,7 @@ wait_for_free_credits(struct TCP_Server_Info *server, const int num_credits, +@@ -528,7 +528,7 @@ wait_for_free_credits(struct TCP_Server_Info *server, const int num_credits, const int timeout, const int flags, unsigned int *instance) {
diff --git a/queue/crypto-atmel-Fix-build-error-of-CRYPTO_AUTHENC.patch b/queue/crypto-atmel-Fix-build-error-of-CRYPTO_AUTHENC.patch index a17c3fc..cdca18b 100644 --- a/queue/crypto-atmel-Fix-build-error-of-CRYPTO_AUTHENC.patch +++ b/queue/crypto-atmel-Fix-build-error-of-CRYPTO_AUTHENC.patch
@@ -1,4 +1,4 @@ -From ba4d9ec2e5f7001f9e92f6d6eab060c6ce73deed Mon Sep 17 00:00:00 2001 +From 364a65a5644de59fd1557cca44eb47e6b93ba048 Mon Sep 17 00:00:00 2001 From: YueHaibing <yuehaibing@huawei.com> Date: Wed, 13 Nov 2019 17:55:50 +0800 Subject: [PATCH] crypto: atmel - Fix build error of CRYPTO_AUTHENC @@ -23,6 +23,7 @@ Signed-off-by: YueHaibing <yuehaibing@huawei.com> Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.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/Kconfig b/drivers/crypto/Kconfig index df178f8c4c2b..4bdd761a8ca9 100644
diff --git a/queue/crypto-atmel-Fix-selection-of-CRYPTO_AUTHENC.patch b/queue/crypto-atmel-Fix-selection-of-CRYPTO_AUTHENC.patch index c0fd9ed..5d7b791 100644 --- a/queue/crypto-atmel-Fix-selection-of-CRYPTO_AUTHENC.patch +++ b/queue/crypto-atmel-Fix-selection-of-CRYPTO_AUTHENC.patch
@@ -1,4 +1,4 @@ -From 4ed4fd8963f95dd50764c82eb7907e2b5a571cdc Mon Sep 17 00:00:00 2001 +From 43d05241ff4326df10d2dbb37cc5323601c1910e Mon Sep 17 00:00:00 2001 From: Tudor Ambarus <tudor.ambarus@microchip.com> Date: Fri, 1 Nov 2019 16:40:37 +0000 Subject: [PATCH] crypto: atmel - Fix selection of CRYPTO_AUTHENC @@ -17,6 +17,7 @@ Fixes: 89a82ef87e01 ("crypto: atmel-authenc - add support to...") Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.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/Kconfig b/drivers/crypto/Kconfig index 1de2349f1be6..df178f8c4c2b 100644
diff --git a/queue/dmaengine-dw-Initialize-channel-before-each-transfer.patch b/queue/dmaengine-dw-Initialize-channel-before-each-transfer.patch index 6cc2d2f..9a0b414 100644 --- a/queue/dmaengine-dw-Initialize-channel-before-each-transfer.patch +++ b/queue/dmaengine-dw-Initialize-channel-before-each-transfer.patch
@@ -1,4 +1,4 @@ -From 99ba8b9b0d9780e9937eb1d488d120e9e5c2533d Mon Sep 17 00:00:00 2001 +From 7166ee85b6c99e37cbaa98fbae08af0503899077 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Date: Sun, 5 Jul 2020 14:56:20 +0300 Subject: [PATCH] dmaengine: dw: Initialize channel before each transfer @@ -18,6 +18,7 @@ BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=206403 Link: https://lore.kernel.org/r/20200705115620.51929-1-andriy.shevchenko@linux.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c index 21cb2a58dbd2..a1b56f52db2f 100644
diff --git a/queue/dmaengine-fsl-edma-Fix-NULL-pointer-exception-in-fsl.patch b/queue/dmaengine-fsl-edma-Fix-NULL-pointer-exception-in-fsl.patch index 3f2f42c..1751c05 100644 --- a/queue/dmaengine-fsl-edma-Fix-NULL-pointer-exception-in-fsl.patch +++ b/queue/dmaengine-fsl-edma-Fix-NULL-pointer-exception-in-fsl.patch
@@ -1,4 +1,4 @@ -From f5e5677c420346b4e9788051c2e4d750996c428c Mon Sep 17 00:00:00 2001 +From 095cee83c9711dff0e8f83625c57088afcd0025a Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzk@kernel.org> Date: Thu, 11 Jun 2020 14:17:41 +0200 Subject: [PATCH] dmaengine: fsl-edma: Fix NULL pointer exception in @@ -52,12 +52,13 @@ Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/1591877861-28156-2-git-send-email-krzk@kernel.org Signed-off-by: Vinod Koul <vkoul@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c -index eff7ebd8cf35..90bb72af306c 100644 +index 0ddad3adb761..8f03930e4691 100644 --- a/drivers/dma/fsl-edma.c +++ b/drivers/dma/fsl-edma.c -@@ -45,6 +45,13 @@ static irqreturn_t fsl_edma_tx_handler(int irq, void *dev_id) +@@ -38,6 +38,13 @@ static irqreturn_t fsl_edma_tx_handler(int irq, void *dev_id) fsl_chan = &fsl_edma->chans[ch]; spin_lock(&fsl_chan->vchan.lock);
diff --git a/queue/dmaengine-fsl-edma-common-correct-DSIZE_32BYTE.patch b/queue/dmaengine-fsl-edma-common-correct-DSIZE_32BYTE.patch index cf2a846..e6b5dad 100644 --- a/queue/dmaengine-fsl-edma-common-correct-DSIZE_32BYTE.patch +++ b/queue/dmaengine-fsl-edma-common-correct-DSIZE_32BYTE.patch
@@ -1,4 +1,4 @@ -From e142087b15960a4e1e5932942e5abae1f49d2318 Mon Sep 17 00:00:00 2001 +From 6183ba53034ead1aa3e29650d6c393cee6af730b Mon Sep 17 00:00:00 2001 From: Robin Gong <yibin.gong@nxp.com> Date: Tue, 30 Jun 2020 00:59:58 +0800 Subject: [PATCH] dmaengine: fsl-edma-common: correct DSIZE_32BYTE @@ -14,12 +14,13 @@ Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/1593449998-32091-1-git-send-email-yibin.gong@nxp.com Signed-off-by: Vinod Koul <vkoul@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h -index 67e422590c9a..ec1169741de1 100644 +index c53f76eeb4d3..b434c6b9fd54 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h -@@ -33,7 +33,7 @@ +@@ -32,7 +32,7 @@ #define EDMA_TCD_ATTR_DSIZE_16BIT BIT(0) #define EDMA_TCD_ATTR_DSIZE_32BIT BIT(1) #define EDMA_TCD_ATTR_DSIZE_64BIT (BIT(0) | BIT(1))
diff --git a/queue/dmaengine-mcf-edma-Fix-NULL-pointer-exception-in-mcf.patch b/queue/dmaengine-mcf-edma-Fix-NULL-pointer-exception-in-mcf.patch index 31dea13..80ea2d9 100644 --- a/queue/dmaengine-mcf-edma-Fix-NULL-pointer-exception-in-mcf.patch +++ b/queue/dmaengine-mcf-edma-Fix-NULL-pointer-exception-in-mcf.patch
@@ -1,4 +1,4 @@ -From 8995aa3d164ddd9200e6abcf25c449cf5298c858 Mon Sep 17 00:00:00 2001 +From e09e6cd7d4514003abfa1fed4e993f6a7de58d93 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzk@kernel.org> Date: Thu, 11 Jun 2020 15:21:05 +0200 Subject: [PATCH] dmaengine: mcf-edma: Fix NULL pointer exception in @@ -30,9 +30,10 @@ Reviewed-by: Robin Gong <yibin.gong@nxp.com> Link: https://lore.kernel.org/r/1591881665-25592-1-git-send-email-krzk@kernel.org Signed-off-by: Vinod Koul <vkoul@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/dma/mcf-edma.c b/drivers/dma/mcf-edma.c -index e15bd15a9ef6..e12b754e6398 100644 +index 7de54b2fafdb..6e3d4ab34321 100644 --- a/drivers/dma/mcf-edma.c +++ b/drivers/dma/mcf-edma.c @@ -35,6 +35,13 @@ static irqreturn_t mcf_edma_tx_handler(int irq, void *dev_id)
diff --git a/queue/doc-dt-bindings-usb-dwc3-Update-entries-for-disablin.patch b/queue/doc-dt-bindings-usb-dwc3-Update-entries-for-disablin.patch index fb89711..ed2b12f 100644 --- a/queue/doc-dt-bindings-usb-dwc3-Update-entries-for-disablin.patch +++ b/queue/doc-dt-bindings-usb-dwc3-Update-entries-for-disablin.patch
@@ -1,4 +1,4 @@ -From 3d157c28d2289edf0439e8308e8de3a06acaaf0e Mon Sep 17 00:00:00 2001 +From dcf8ad6cc6b8f5b86bd9ff39fa58b168091edd99 Mon Sep 17 00:00:00 2001 From: Neil Armstrong <narmstrong@baylibre.com> Date: Fri, 21 Feb 2020 10:15:30 +0100 Subject: [PATCH] doc: dt: bindings: usb: dwc3: Update entries for disabling SS @@ -18,12 +18,13 @@ Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Felipe Balbi <balbi@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt -index 66780a47ad85..c977a3ba2f35 100644 +index 8e5265e9f658..14d97c40b75c 100644 --- a/Documentation/devicetree/bindings/usb/dwc3.txt +++ b/Documentation/devicetree/bindings/usb/dwc3.txt -@@ -75,6 +75,8 @@ Optional properties: +@@ -73,6 +73,8 @@ Optional properties: from P0 to P1/P2/P3 without delay. - snps,dis-tx-ipgap-linecheck-quirk: when set, disable u2mac linestate check during HS transmit.
diff --git a/queue/drm-exynos-Properly-propagate-return-value-in-drm_io.patch b/queue/drm-exynos-Properly-propagate-return-value-in-drm_io.patch index 0d8602a..5dd1c94 100644 --- a/queue/drm-exynos-Properly-propagate-return-value-in-drm_io.patch +++ b/queue/drm-exynos-Properly-propagate-return-value-in-drm_io.patch
@@ -1,4 +1,4 @@ -From b9c633882de4601015625f9136f248e9abca8a7a Mon Sep 17 00:00:00 2001 +From 0373eb145ce8bba8662f2f4e046888117edc0804 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski <m.szyprowski@samsung.com> Date: Mon, 1 Jun 2020 17:06:30 +0900 Subject: [PATCH] drm/exynos: Properly propagate return value in @@ -13,12 +13,13 @@ Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Merge conflict so merged it manually. Signed-off-by: Inki Dae <inki.dae@samsung.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/exynos/exynos_drm_dma.c b/drivers/gpu/drm/exynos/exynos_drm_dma.c -index 619f81435c1b..58b89ec11b0e 100644 +index 1098a4c8f526..38f7e9dc9485 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dma.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dma.c -@@ -61,7 +61,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev, +@@ -59,7 +59,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev, struct device *subdrv_dev, void **dma_priv) { struct exynos_drm_private *priv = drm_dev->dev_private; @@ -27,7 +28,7 @@ if (get_dma_ops(priv->dma_dev) != get_dma_ops(subdrv_dev)) { DRM_DEV_ERROR(subdrv_dev, "Device %s lacks support for IOMMU\n", -@@ -92,7 +92,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev, +@@ -90,7 +90,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev, if (ret) clear_dma_max_seg_size(subdrv_dev);
diff --git a/queue/drm-exynos-fix-ref-count-leak-in-mic_pre_enable.patch b/queue/drm-exynos-fix-ref-count-leak-in-mic_pre_enable.patch index f80951d..c67a08b 100644 --- a/queue/drm-exynos-fix-ref-count-leak-in-mic_pre_enable.patch +++ b/queue/drm-exynos-fix-ref-count-leak-in-mic_pre_enable.patch
@@ -1,4 +1,4 @@ -From d4f5a095daf0d25f0b385e1ef26338608433a4c5 Mon Sep 17 00:00:00 2001 +From 067b2d31837458fc143182f0563438e6a7dc70f4 Mon Sep 17 00:00:00 2001 From: Navid Emamdoost <navid.emamdoost@gmail.com> Date: Mon, 15 Jun 2020 00:49:28 -0500 Subject: [PATCH] drm/exynos: fix ref count leak in mic_pre_enable @@ -11,12 +11,13 @@ Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> Signed-off-by: Inki Dae <inki.dae@samsung.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/exynos/exynos_drm_mic.c b/drivers/gpu/drm/exynos/exynos_drm_mic.c -index a86abc173605..3821ea76a703 100644 +index 8363cb40daed..08e5e45eaf0e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_mic.c +++ b/drivers/gpu/drm/exynos/exynos_drm_mic.c -@@ -269,8 +269,10 @@ static void mic_pre_enable(struct drm_bridge *bridge) +@@ -266,8 +266,10 @@ static void mic_pre_enable(struct drm_bridge *bridge) goto unlock; ret = pm_runtime_get_sync(mic->dev);
diff --git a/queue/drm-i915-gvt-Fix-two-CFL-MMIO-handling-caused-by-reg.patch b/queue/drm-i915-gvt-Fix-two-CFL-MMIO-handling-caused-by-reg.patch index 32581b7..db43507 100644 --- a/queue/drm-i915-gvt-Fix-two-CFL-MMIO-handling-caused-by-reg.patch +++ b/queue/drm-i915-gvt-Fix-two-CFL-MMIO-handling-caused-by-reg.patch
@@ -1,4 +1,4 @@ -From fccd0f7cf4d532674d727c7f204f038456675dee Mon Sep 17 00:00:00 2001 +From 4c9cc8e041adc0e53f9fa9814e7589b3de515968 Mon Sep 17 00:00:00 2001 From: Colin Xu <colin.xu@intel.com> Date: Mon, 1 Jun 2020 11:06:38 +0800 Subject: [PATCH] drm/i915/gvt: Fix two CFL MMIO handling caused by regression. @@ -17,12 +17,13 @@ Signed-off-by: Colin Xu <colin.xu@intel.com> Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20200601030638.16002-1-colin.xu@intel.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c -index 89873a7b7f32..f39a6b20bbaf 100644 +index 25f78196b964..689b07bc91c4 100644 --- a/drivers/gpu/drm/i915/gvt/handlers.c +++ b/drivers/gpu/drm/i915/gvt/handlers.c -@@ -3132,8 +3132,8 @@ static int init_skl_mmio_info(struct intel_gvt *gvt) +@@ -3103,8 +3103,8 @@ static int init_skl_mmio_info(struct intel_gvt *gvt) MMIO_DFH(GEN9_WM_CHICKEN3, D_SKL_PLUS, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
diff --git a/queue/drm-msm-dpu-allow-initialization-of-encoder-locks-du.patch b/queue/drm-msm-dpu-allow-initialization-of-encoder-locks-du.patch index 596b144..28d86c7 100644 --- a/queue/drm-msm-dpu-allow-initialization-of-encoder-locks-du.patch +++ b/queue/drm-msm-dpu-allow-initialization-of-encoder-locks-du.patch
@@ -1,4 +1,4 @@ -From 2e7ec6b5297157efabb50e5f82adc628cf90296c Mon Sep 17 00:00:00 2001 +From 0ebe1426e8b3e8378ba4400a49c84c8f8c32363e Mon Sep 17 00:00:00 2001 From: Krishna Manikandan <mkrishn@codeaurora.org> Date: Thu, 28 May 2020 14:04:28 +0530 Subject: [PATCH] drm/msm/dpu: allow initialization of encoder locks during @@ -14,12 +14,13 @@ Signed-off-by: Krishna Manikandan <mkrishn@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_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c -index 30254741e6ef..0946a86b37b2 100644 +index e26d2f3363ee..8fcfee5e6e85 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c -@@ -2140,7 +2140,6 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc, +@@ -2221,7 +2221,6 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc, dpu_enc = to_dpu_encoder_virt(enc); @@ -27,7 +28,7 @@ ret = dpu_encoder_setup_display(dpu_enc, dpu_kms, disp_info); if (ret) goto fail; -@@ -2155,7 +2154,6 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc, +@@ -2236,7 +2235,6 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc, 0); @@ -35,7 +36,7 @@ INIT_DELAYED_WORK(&dpu_enc->delayed_off_work, dpu_encoder_off_work); dpu_enc->idle_timeout = IDLE_TIMEOUT; -@@ -2200,6 +2198,8 @@ struct drm_encoder *dpu_encoder_init(struct drm_device *dev, +@@ -2281,6 +2279,8 @@ struct drm_encoder *dpu_encoder_init(struct drm_device *dev, spin_lock_init(&dpu_enc->enc_spinlock); dpu_enc->enabled = false;
diff --git a/queue/drm-msm-fix-potential-memleak-in-error-branch.patch b/queue/drm-msm-fix-potential-memleak-in-error-branch.patch index dfcf62a..31aa8c7 100644 --- a/queue/drm-msm-fix-potential-memleak-in-error-branch.patch +++ b/queue/drm-msm-fix-potential-memleak-in-error-branch.patch
@@ -1,4 +1,4 @@ -From 177d3819633cd520e3f95df541a04644aab4c657 Mon Sep 17 00:00:00 2001 +From 944ffbd40a6829cdb381053a3439fac0c21f49c3 Mon Sep 17 00:00:00 2001 From: Bernard Zhao <bernard@vivo.com> Date: Fri, 12 Jun 2020 09:23:49 +0800 Subject: [PATCH] drm/msm: fix potential memleak in error branch @@ -13,12 +13,13 @@ Signed-off-by: Bernard Zhao <bernard@vivo.com> [trivial commit msg fixup] 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_submitqueue.c b/drivers/gpu/drm/msm/msm_submitqueue.c -index 001fbf537440..a1d94be7883a 100644 +index c70e00e22c4c..5ae5a465d28a 100644 --- a/drivers/gpu/drm/msm/msm_submitqueue.c +++ b/drivers/gpu/drm/msm/msm_submitqueue.c -@@ -71,8 +71,10 @@ int msm_submitqueue_create(struct drm_device *drm, struct msm_file_private *ctx, +@@ -69,8 +69,10 @@ int msm_submitqueue_create(struct drm_device *drm, struct msm_file_private *ctx, queue->flags = flags; if (priv->gpu) {
diff --git a/queue/drm-sun4i-tcon-Separate-quirks-for-tcon0-and-tcon1-o.patch b/queue/drm-sun4i-tcon-Separate-quirks-for-tcon0-and-tcon1-o.patch index d05b107..85d537d 100644 --- a/queue/drm-sun4i-tcon-Separate-quirks-for-tcon0-and-tcon1-o.patch +++ b/queue/drm-sun4i-tcon-Separate-quirks-for-tcon0-and-tcon1-o.patch
@@ -1,4 +1,4 @@ -From cd0ecabdc953397ed0378022b3b90e0c0871c2eb Mon Sep 17 00:00:00 2001 +From a4d323811d2635315a54f5ec8224753bf92bce89 Mon Sep 17 00:00:00 2001 From: Andrey Lebedev <andrey@lebedev.lt> Date: Wed, 19 Feb 2020 20:08:55 +0200 Subject: [PATCH] drm/sun4i: tcon: Separate quirks for tcon0 and tcon1 on A20 @@ -12,12 +12,13 @@ Signed-off-by: Andrey Lebedev <andrey@lebedev.lt> Signed-off-by: Maxime Ripard <maxime@cerno.tech> Link: https://patchwork.freedesktop.org/patch/msgid/20200219180858.4806-3-andrey.lebedev@gmail.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c -index 72dc7498aa71..2d55ca4218c2 100644 +index 7774824bf04c..9ecd0a604c19 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c -@@ -1508,6 +1508,8 @@ const struct of_device_id sun4i_tcon_of_table[] = { +@@ -1501,6 +1501,8 @@ const struct of_device_id sun4i_tcon_of_table[] = { { .compatible = "allwinner,sun6i-a31-tcon", .data = &sun6i_a31_quirks }, { .compatible = "allwinner,sun6i-a31s-tcon", .data = &sun6i_a31s_quirks }, { .compatible = "allwinner,sun7i-a20-tcon", .data = &sun7i_a20_quirks },
diff --git a/queue/dt-bindings-mailbox-zynqmp_ipi-fix-unit-address.patch b/queue/dt-bindings-mailbox-zynqmp_ipi-fix-unit-address.patch index 57715de..82cdc36 100644 --- a/queue/dt-bindings-mailbox-zynqmp_ipi-fix-unit-address.patch +++ b/queue/dt-bindings-mailbox-zynqmp_ipi-fix-unit-address.patch
@@ -1,4 +1,4 @@ -From 35b9c0fdb9f666628ecda02b1fc44306933a2d97 Mon Sep 17 00:00:00 2001 +From ad4b367fbec85c6c733f4e493efaa1fecc986278 Mon Sep 17 00:00:00 2001 From: Kangmin Park <l4stpr0gr4m@gmail.com> Date: Thu, 25 Jun 2020 22:51:58 +0900 Subject: [PATCH] dt-bindings: mailbox: zynqmp_ipi: fix unit address @@ -11,6 +11,7 @@ Signed-off-by: Kangmin Park <l4stpr0gr4m@gmail.com> Link: https://lore.kernel.org/r/20200625135158.5861-1-l4stpr0gr4m@gmail.com Signed-off-by: Rob Herring <robh@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/Documentation/devicetree/bindings/mailbox/xlnx,zynqmp-ipi-mailbox.txt b/Documentation/devicetree/bindings/mailbox/xlnx,zynqmp-ipi-mailbox.txt index 4438432bfe9b..ad76edccf881 100644
diff --git a/queue/fuse-Fix-parameter-for-FS_IOC_-GET-SET-FLAGS.patch b/queue/fuse-Fix-parameter-for-FS_IOC_-GET-SET-FLAGS.patch index 0e50ba2..5cc0082 100644 --- a/queue/fuse-Fix-parameter-for-FS_IOC_-GET-SET-FLAGS.patch +++ b/queue/fuse-Fix-parameter-for-FS_IOC_-GET-SET-FLAGS.patch
@@ -1,4 +1,4 @@ -From 184af43980e28d6eb7ae76755a3d11fe1fdd2bdd Mon Sep 17 00:00:00 2001 +From ff495fd52353e72abaf0a48c81f1d09814853c28 Mon Sep 17 00:00:00 2001 From: Chirantan Ekbote <chirantan@chromium.org> Date: Tue, 14 Jul 2020 19:26:39 +0900 Subject: [PATCH] fuse: Fix parameter for FS_IOC_{GET,SET}FLAGS @@ -27,6 +27,7 @@ Fixes: 59efec7b9039 ("fuse: implement ioctl support") Cc: <stable@vger.kernel.org> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 216c21009821..c053266235e2 100644
diff --git a/queue/fuse-don-t-ignore-errors-from-fuse_writepages_fill.patch b/queue/fuse-don-t-ignore-errors-from-fuse_writepages_fill.patch index 709e576..8ecef29 100644 --- a/queue/fuse-don-t-ignore-errors-from-fuse_writepages_fill.patch +++ b/queue/fuse-don-t-ignore-errors-from-fuse_writepages_fill.patch
@@ -1,4 +1,4 @@ -From b41b9142ab58391779904ae85434b1fcb4ae0199 Mon Sep 17 00:00:00 2001 +From 1a1fcbeb1821b6727ed07b074fc5d0d7114d8bf1 Mon Sep 17 00:00:00 2001 From: Vasily Averin <vvs@virtuozzo.com> Date: Thu, 25 Jun 2020 12:39:51 +0300 Subject: [PATCH] fuse: don't ignore errors from fuse_writepages_fill() @@ -12,6 +12,7 @@ Fixes: 26d614df1da9 ("fuse: Implement writepages callback") Signed-off-by: Vasily Averin <vvs@virtuozzo.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/fuse/file.c b/fs/fuse/file.c index b39e25f55e1d..216c21009821 100644
diff --git a/queue/genetlink-remove-genl_bind.patch b/queue/genetlink-remove-genl_bind.patch index 1653fed..907970e 100644 --- a/queue/genetlink-remove-genl_bind.patch +++ b/queue/genetlink-remove-genl_bind.patch
@@ -1,4 +1,4 @@ -From 55dea65413141a5064ba905687567f346aa06927 Mon Sep 17 00:00:00 2001 +From 72643999e2b1370f44db91f5a0d98975376c93ae Mon Sep 17 00:00:00 2001 From: Sean Tranchetti <stranche@codeaurora.org> Date: Tue, 30 Jun 2020 11:50:17 -0600 Subject: [PATCH] genetlink: remove genl_bind @@ -37,6 +37,7 @@ Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Sean Tranchetti <stranche@codeaurora.org> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/net/genetlink.h b/include/net/genetlink.h index 9292f1c588b7..2d9e67a69cbe 100644
diff --git a/queue/genirq-Add-protection-against-unsafe-usage-of-generi.patch b/queue/genirq-Add-protection-against-unsafe-usage-of-generi.patch index d451a59..e9b80e8 100644 --- a/queue/genirq-Add-protection-against-unsafe-usage-of-generi.patch +++ b/queue/genirq-Add-protection-against-unsafe-usage-of-generi.patch
@@ -1,4 +1,4 @@ -From c16816acd08697b02a53f56f8936497a9f6f6e7a Mon Sep 17 00:00:00 2001 +From 64edb885e76b08d63444ff4adbd2ec7a190c4c42 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Fri, 6 Mar 2020 14:03:43 +0100 Subject: [PATCH] genirq: Add protection against unsafe usage of @@ -18,9 +18,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Marc Zyngier <maz@kernel.org> Link: https://lkml.kernel.org/r/20200306130623.590923677@linutronix.de +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/irq.h b/include/linux/irq.h -index 3ed5a055b5f4..9315fbb87db3 100644 +index f8755e5fcd74..b736900394d3 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -211,6 +211,8 @@ struct irq_data { @@ -58,10 +59,10 @@ { return __irqd_to_state(d) & IRQD_WAKEUP_STATE; diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h -index c9d8eb7f5c02..5be382fc9415 100644 +index ed4843df6220..207bac6ad4c3 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h -@@ -425,6 +425,10 @@ static inline struct cpumask *irq_desc_get_pending_mask(struct irq_desc *desc) +@@ -422,6 +422,10 @@ static inline struct cpumask *irq_desc_get_pending_mask(struct irq_desc *desc) { return desc->pending_mask; } @@ -72,7 +73,7 @@ bool irq_fixup_move_pending(struct irq_desc *desc, bool force_clear); #else /* CONFIG_GENERIC_PENDING_IRQ */ static inline bool irq_can_move_pcntxt(struct irq_data *data) -@@ -451,6 +455,10 @@ static inline bool irq_fixup_move_pending(struct irq_desc *desc, bool fclear) +@@ -448,6 +452,10 @@ static inline bool irq_fixup_move_pending(struct irq_desc *desc, bool fclear) { return false; } @@ -84,7 +85,7 @@ #if !defined(CONFIG_IRQ_DOMAIN) || !defined(CONFIG_IRQ_DOMAIN_HIERARCHY) diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c -index 98a5f10d1900..1a7723604399 100644 +index 9be995fc3c5a..6a27603fe1cf 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -638,9 +638,15 @@ void irq_init_desc(unsigned int irq)
diff --git a/queue/genirq-affinity-Handle-affinity-setting-on-inactive-.patch b/queue/genirq-affinity-Handle-affinity-setting-on-inactive-.patch index fc4fee9..0ed400e 100644 --- a/queue/genirq-affinity-Handle-affinity-setting-on-inactive-.patch +++ b/queue/genirq-affinity-Handle-affinity-setting-on-inactive-.patch
@@ -1,4 +1,4 @@ -From baedb87d1b53532f81b4bd0387f83b05d4f7eb9a Mon Sep 17 00:00:00 2001 +From 6e28961b7c6e9689f87903c165d89f5006a25c10 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Fri, 17 Jul 2020 18:00:02 +0200 Subject: [PATCH] genirq/affinity: Handle affinity setting on inactive @@ -42,9 +42,10 @@ Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20200529015501.15771-1-alisaidi@amazon.com Link: https://lkml.kernel.org/r/877dv2rv25.fsf@nanos.tec.linutronix.de +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c -index cc8b16f89dd4..7649da2478d8 100644 +index 2c5676b0a6e7..18c0dca08163 100644 --- a/arch/x86/kernel/apic/vector.c +++ b/arch/x86/kernel/apic/vector.c @@ -446,12 +446,10 @@ static int x86_vector_activate(struct irq_domain *dom, struct irq_data *irqd, @@ -63,7 +64,7 @@ vector_assign_managed_shutdown(irqd); else if (apicd->is_managed) ret = activate_managed(irqd); -@@ -774,20 +772,10 @@ void lapic_offline(void) +@@ -769,20 +767,10 @@ void lapic_offline(void) static int apic_set_affinity(struct irq_data *irqd, const struct cpumask *dest, bool force) { @@ -87,10 +88,10 @@ raw_spin_lock(&vector_lock); cpumask_and(vector_searchmask, dest, cpu_online_mask); diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c -index 761911168438..2a9fec53e159 100644 +index e88faff5bea5..2f5ce125e9e6 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c -@@ -195,9 +195,9 @@ void irq_set_thread_affinity(struct irq_desc *desc) +@@ -194,9 +194,9 @@ void irq_set_thread_affinity(struct irq_desc *desc) set_bit(IRQTF_AFFINITY, &action->thread_flags); } @@ -101,7 +102,7 @@ const struct cpumask *m = irq_data_get_effective_affinity_mask(data); struct irq_chip *chip = irq_data_get_irq_chip(data); -@@ -205,9 +205,19 @@ static void irq_validate_effective_affinity(struct irq_data *data) +@@ -204,9 +204,19 @@ static void irq_validate_effective_affinity(struct irq_data *data) return; pr_warn_once("irq_chip %s did not update eff. affinity mask of irq %u\n", chip->name, data->irq); @@ -122,7 +123,7 @@ int irq_do_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force) { -@@ -304,6 +314,26 @@ static int irq_try_set_affinity(struct irq_data *data, +@@ -265,6 +275,26 @@ static int irq_try_set_affinity(struct irq_data *data, return ret; } @@ -149,7 +150,7 @@ int irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask, bool force) { -@@ -314,6 +344,9 @@ int irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask, +@@ -275,6 +305,9 @@ int irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask, if (!chip || !chip->irq_set_affinity) return -EINVAL;
diff --git a/queue/genirq-affinity-Make-affinity-setting-if-activated-o.patch b/queue/genirq-affinity-Make-affinity-setting-if-activated-o.patch index 7860f99..6fa61b3 100644 --- a/queue/genirq-affinity-Make-affinity-setting-if-activated-o.patch +++ b/queue/genirq-affinity-Make-affinity-setting-if-activated-o.patch
@@ -1,4 +1,4 @@ -From f0c7baca180046824e07fc5f1326e83a8fd150c7 Mon Sep 17 00:00:00 2001 +From 2ecdf4e5e789c1d5fe4c6e89ba8d746f9222cc0e Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Fri, 24 Jul 2020 22:44:41 +0200 Subject: [PATCH] genirq/affinity: Make affinity setting if activated opt-in @@ -35,9 +35,10 @@ Acked-by: Marc Zyngier <maz@kernel.org> Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/87blk4tzgm.fsf@nanos.tec.linutronix.de +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c -index 7649da2478d8..dae32d948bf2 100644 +index c1857c08706e..259d17d08983 100644 --- a/arch/x86/kernel/apic/vector.c +++ b/arch/x86/kernel/apic/vector.c @@ -560,6 +560,10 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq, @@ -52,10 +53,10 @@ * Legacy vectors are already assigned when the IOAPIC * takes them over. They stay on the same vector. This is diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c -index beac4caefad9..103d850b5595 100644 +index eeea66daa389..0e8c08ce2cd6 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c -@@ -3523,6 +3523,7 @@ static int its_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, +@@ -2581,6 +2581,7 @@ static int its_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, msi_alloc_info_t *info = args; struct its_device *its_dev = info->scratchpad[0].ptr; struct its_node *its = its_dev->its; @@ -63,7 +64,7 @@ irq_hw_number_t hwirq; int err; int i; -@@ -3542,7 +3543,9 @@ static int its_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, +@@ -2600,7 +2601,9 @@ static int its_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, irq_domain_set_hwirq_and_chip(domain, virq + i, hwirq + i, &its_irq_chip, its_dev); @@ -75,7 +76,7 @@ (int)(hwirq + i - its_dev->event_map.lpi_base), (int)(hwirq + i), virq + i); diff --git a/include/linux/irq.h b/include/linux/irq.h -index 8d5bc2c237d7..1b7f4dfee35b 100644 +index b736900394d3..8060a53805a0 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -213,6 +213,8 @@ struct irq_data { @@ -113,10 +114,10 @@ static inline irq_hw_number_t irqd_to_hwirq(struct irq_data *d) diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c -index 2a9fec53e159..48c38e09c673 100644 +index 2f5ce125e9e6..e557a375cd02 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c -@@ -320,12 +320,16 @@ static bool irq_set_affinity_deactivated(struct irq_data *data, +@@ -281,12 +281,16 @@ static bool irq_set_affinity_deactivated(struct irq_data *data, struct irq_desc *desc = irq_data_to_desc(data); /*
diff --git a/queue/gfs2-read-only-mounts-should-grab-the-sd_freeze_gl-g.patch b/queue/gfs2-read-only-mounts-should-grab-the-sd_freeze_gl-g.patch index 95a5a1f..fdc5d0d 100644 --- a/queue/gfs2-read-only-mounts-should-grab-the-sd_freeze_gl-g.patch +++ b/queue/gfs2-read-only-mounts-should-grab-the-sd_freeze_gl-g.patch
@@ -1,4 +1,4 @@ -From b780cc615ba4795a7ef0e93b19424828a5ad456a Mon Sep 17 00:00:00 2001 +From c6df1636860c40d62f6141f2fce83d3eb597c7b8 Mon Sep 17 00:00:00 2001 From: Bob Peterson <rpeterso@redhat.com> Date: Thu, 25 Jun 2020 13:30:18 -0500 Subject: [PATCH] gfs2: read-only mounts should grab the sd_freeze_gl glock @@ -16,12 +16,13 @@ which will block for file systems that are frozen on another node. Signed-off-by: Bob Peterson <rpeterso@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c -index 094f5fe7c009..a2c0554a1890 100644 +index bc32e11c9cee..aa98abd177c3 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c -@@ -1136,7 +1136,17 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc) +@@ -1158,7 +1158,17 @@ static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent goto fail_per_node; }
diff --git a/queue/hwmon-emc2103-fix-unable-to-change-fan-pwm1_enable-a.patch b/queue/hwmon-emc2103-fix-unable-to-change-fan-pwm1_enable-a.patch index 6d36d3d..86a5231 100644 --- a/queue/hwmon-emc2103-fix-unable-to-change-fan-pwm1_enable-a.patch +++ b/queue/hwmon-emc2103-fix-unable-to-change-fan-pwm1_enable-a.patch
@@ -1,4 +1,4 @@ -From 14b0e83dc4f1e52b94acaeb85a18fd7fdd46d2dc Mon Sep 17 00:00:00 2001 +From e76ebb794660eb9c9a8ad5e39a0def69d0a624d7 Mon Sep 17 00:00:00 2001 From: Vishwas M <vishwas.reddy.vr@gmail.com> Date: Tue, 7 Jul 2020 19:57:47 +0530 Subject: [PATCH] hwmon: (emc2103) fix unable to change fan pwm1_enable @@ -20,6 +20,7 @@ Fixes: 9df7305b5a86 ("hwmon: Add driver for SMSC EMC2103 temperature monitor and fan controller") Cc: stable@vger.kernel.org Signed-off-by: Guenter Roeck <linux@roeck-us.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hwmon/emc2103.c b/drivers/hwmon/emc2103.c index 491a570e8e50..924c02c1631d 100644
diff --git a/queue/i2c-eg20t-Load-module-automatically-if-ID-matches.patch b/queue/i2c-eg20t-Load-module-automatically-if-ID-matches.patch index c8aa325..44012b3 100644 --- a/queue/i2c-eg20t-Load-module-automatically-if-ID-matches.patch +++ b/queue/i2c-eg20t-Load-module-automatically-if-ID-matches.patch
@@ -1,4 +1,4 @@ -From 5f90786b31fb7d1e199a8999d46c4e3aea672e11 Mon Sep 17 00:00:00 2001 +From 35ddd4d77c3547979e91ee45e9026414a6175647 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Date: Thu, 2 Jul 2020 13:15:27 +0300 Subject: [PATCH] i2c: eg20t: Load module automatically if ID matches @@ -11,6 +11,7 @@ Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Wolfram Sang <wsa@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c index bb810dee8fb5..73f139690e4e 100644
diff --git a/queue/iio-adc-ad7780-Fix-a-resource-handling-path-in-ad778.patch b/queue/iio-adc-ad7780-Fix-a-resource-handling-path-in-ad778.patch index 29af1b4..e316738 100644 --- a/queue/iio-adc-ad7780-Fix-a-resource-handling-path-in-ad778.patch +++ b/queue/iio-adc-ad7780-Fix-a-resource-handling-path-in-ad778.patch
@@ -1,4 +1,4 @@ -From b0536f9826a5ed3328d527b4fc1686867a9f3041 Mon Sep 17 00:00:00 2001 +From ee5b52260d1e5acd8e263fea2b61b7dc4200939c Mon Sep 17 00:00:00 2001 From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Date: Sun, 17 May 2020 11:59:53 +0200 Subject: [PATCH] iio: adc: ad7780: Fix a resource handling path in @@ -14,12 +14,13 @@ Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Acked-by: Renato Lui Geh <renatogeh@gmail.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/iio/adc/ad7780.c b/drivers/iio/adc/ad7780.c -index f47606ebbbbe..b33fe6c3907e 100644 +index 217a5a5c3c6d..7e741294de7b 100644 --- a/drivers/iio/adc/ad7780.c +++ b/drivers/iio/adc/ad7780.c -@@ -329,7 +329,7 @@ static int ad7780_probe(struct spi_device *spi) +@@ -309,7 +309,7 @@ static int ad7780_probe(struct spi_device *spi) ret = ad7780_init_gpios(&spi->dev, st); if (ret)
diff --git a/queue/iio-core-add-missing-IIO_MOD_H2-ETHANOL-string-ident.patch b/queue/iio-core-add-missing-IIO_MOD_H2-ETHANOL-string-ident.patch index 6fd0248..4df1e65 100644 --- a/queue/iio-core-add-missing-IIO_MOD_H2-ETHANOL-string-ident.patch +++ b/queue/iio-core-add-missing-IIO_MOD_H2-ETHANOL-string-ident.patch
@@ -1,4 +1,4 @@ -From 25f02d3242ab4d16d0cee2dec0d89cedb3747fa9 Mon Sep 17 00:00:00 2001 +From fbf37d7415ed818b26953bde2a95b4aa9b413d7b Mon Sep 17 00:00:00 2001 From: Matt Ranostay <matt.ranostay@konsulko.com> Date: Tue, 9 Jun 2020 06:01:16 +0300 Subject: [PATCH] iio: core: add missing IIO_MOD_H2/ETHANOL string identifiers @@ -12,9 +12,10 @@ Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c -index 1527f01a44f1..352533342702 100644 +index 245b5844028d..393bafc91331 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -130,6 +130,8 @@ static const char * const iio_modifier_names[] = {
diff --git a/queue/iio-health-afe4403-Fix-timestamp-alignment-and-preve.patch b/queue/iio-health-afe4403-Fix-timestamp-alignment-and-preve.patch index a0d29ba..0bd1774 100644 --- a/queue/iio-health-afe4403-Fix-timestamp-alignment-and-preve.patch +++ b/queue/iio-health-afe4403-Fix-timestamp-alignment-and-preve.patch
@@ -1,4 +1,4 @@ -From 3f9c6d38797e9903937b007a341dad0c251765d6 Mon Sep 17 00:00:00 2001 +From 21bb2bbe58a4872910b61a2e50408d77752eb97c Mon Sep 17 00:00:00 2001 From: Jonathan Cameron <Jonathan.Cameron@huawei.com> Date: Sun, 17 May 2020 18:29:56 +0100 Subject: [PATCH] iio:health:afe4403 Fix timestamp alignment and prevent data @@ -22,6 +22,7 @@ Acked-by: Andrew F. Davis <afd@ti.com> Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/iio/health/afe4403.c b/drivers/iio/health/afe4403.c index e9f87e42ff4f..a3507624b30f 100644
diff --git a/queue/iio-health-afe4403-Use-get_unaligned_be24.patch b/queue/iio-health-afe4403-Use-get_unaligned_be24.patch index 9a412eb..09c2385 100644 --- a/queue/iio-health-afe4403-Use-get_unaligned_be24.patch +++ b/queue/iio-health-afe4403-Use-get_unaligned_be24.patch
@@ -1,4 +1,4 @@ -From d324ac2e93cdb69ef81dc272342898cd02d2777a Mon Sep 17 00:00:00 2001 +From c75d93513cc9f7e1063065e2576edebd309123d3 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Date: Tue, 21 Apr 2020 03:31:27 +0300 Subject: [PATCH] iio: health: afe4403: Use get_unaligned_be24() @@ -9,6 +9,7 @@ Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/iio/health/afe4403.c b/drivers/iio/health/afe4403.c index dc22dc363a99..e9f87e42ff4f 100644
diff --git a/queue/iio-health-afe4404-Fix-timestamp-alignment-and-preve.patch b/queue/iio-health-afe4404-Fix-timestamp-alignment-and-preve.patch index 9f996d6..166293e 100644 --- a/queue/iio-health-afe4404-Fix-timestamp-alignment-and-preve.patch +++ b/queue/iio-health-afe4404-Fix-timestamp-alignment-and-preve.patch
@@ -1,4 +1,4 @@ -From f88ecccac4be348bbcc6d056bdbc622a8955c04d Mon Sep 17 00:00:00 2001 +From 0f386f0e32f4b145adc8410114cd0bbfe577c332 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron <Jonathan.Cameron@huawei.com> Date: Sun, 17 May 2020 18:29:57 +0100 Subject: [PATCH] iio:health:afe4404 Fix timestamp alignment and prevent data @@ -21,6 +21,7 @@ Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Acked-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/iio/health/afe4404.c b/drivers/iio/health/afe4404.c index e728bbb21ca8..cebb1fd4d0b1 100644
diff --git a/queue/iio-humidity-hdc100x-Fix-alignment-and-data-leak-iss.patch b/queue/iio-humidity-hdc100x-Fix-alignment-and-data-leak-iss.patch index 62bea55..ea4ebf8 100644 --- a/queue/iio-humidity-hdc100x-Fix-alignment-and-data-leak-iss.patch +++ b/queue/iio-humidity-hdc100x-Fix-alignment-and-data-leak-iss.patch
@@ -1,4 +1,4 @@ -From ea5e7a7bb6205d24371373cd80325db1bc15eded Mon Sep 17 00:00:00 2001 +From edcb0d43157444753071e25d4d178350c5193c99 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron <Jonathan.Cameron@huawei.com> Date: Sun, 7 Jun 2020 16:53:52 +0100 Subject: [PATCH] iio:humidity:hdc100x Fix alignment and data leak issues @@ -21,9 +21,10 @@ Cc: Alison Schofield <amsfield22@gmail.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Cc: <Stable@vger.kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/iio/humidity/hdc100x.c b/drivers/iio/humidity/hdc100x.c -index 7ecd2ffa3132..665eb7e38293 100644 +index ff6666ac5d68..0fcaa2c0b2f4 100644 --- a/drivers/iio/humidity/hdc100x.c +++ b/drivers/iio/humidity/hdc100x.c @@ -38,6 +38,11 @@ struct hdc100x_data { @@ -38,7 +39,7 @@ }; /* integration time in us */ -@@ -322,7 +327,6 @@ static irqreturn_t hdc100x_trigger_handler(int irq, void *p) +@@ -319,7 +324,6 @@ static irqreturn_t hdc100x_trigger_handler(int irq, void *p) struct i2c_client *client = data->client; int delay = data->adc_int_us[0] + data->adc_int_us[1]; int ret; @@ -46,7 +47,7 @@ /* dual read starts at temp register */ mutex_lock(&data->lock); -@@ -333,13 +337,13 @@ static irqreturn_t hdc100x_trigger_handler(int irq, void *p) +@@ -330,13 +334,13 @@ static irqreturn_t hdc100x_trigger_handler(int irq, void *p) } usleep_range(delay, delay + 1000);
diff --git a/queue/iio-humidity-hts221-Fix-alignment-and-data-leak-issu.patch b/queue/iio-humidity-hts221-Fix-alignment-and-data-leak-issu.patch index d6a54f6..2e611eb 100644 --- a/queue/iio-humidity-hts221-Fix-alignment-and-data-leak-issu.patch +++ b/queue/iio-humidity-hts221-Fix-alignment-and-data-leak-issu.patch
@@ -1,4 +1,4 @@ -From 5c49056ad9f3c786f7716da2dd47e4488fc6bd25 Mon Sep 17 00:00:00 2001 +From 1d7a3b4c6c34eea64222d6681a00d1c1bd979cda Mon Sep 17 00:00:00 2001 From: Jonathan Cameron <Jonathan.Cameron@huawei.com> Date: Sun, 7 Jun 2020 16:53:53 +0100 Subject: [PATCH] iio:humidity:hts221 Fix alignment and data leak issues @@ -24,6 +24,7 @@ Acked-by: Lorenzo Bianconi <lorenzo@kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Cc: <Stable@vger.kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/iio/humidity/hts221.h b/drivers/iio/humidity/hts221.h index 7d6771f7cf47..b2eb5abeaccd 100644 @@ -51,10 +52,10 @@ extern const struct dev_pm_ops hts221_pm_ops; diff --git a/drivers/iio/humidity/hts221_buffer.c b/drivers/iio/humidity/hts221_buffer.c -index 9fb3f33614d4..ba7d413d75ba 100644 +index 81d50a861c22..49dcd36d8838 100644 --- a/drivers/iio/humidity/hts221_buffer.c +++ b/drivers/iio/humidity/hts221_buffer.c -@@ -160,7 +160,6 @@ static const struct iio_buffer_setup_ops hts221_buffer_ops = { +@@ -162,7 +162,6 @@ static const struct iio_buffer_setup_ops hts221_buffer_ops = { static irqreturn_t hts221_buffer_handler_thread(int irq, void *p) { @@ -62,7 +63,7 @@ struct iio_poll_func *pf = p; struct iio_dev *iio_dev = pf->indio_dev; struct hts221_hw *hw = iio_priv(iio_dev); -@@ -170,18 +169,20 @@ static irqreturn_t hts221_buffer_handler_thread(int irq, void *p) +@@ -172,18 +171,20 @@ static irqreturn_t hts221_buffer_handler_thread(int irq, void *p) /* humidity data */ ch = &iio_dev->channels[HTS221_SENSOR_H]; err = regmap_bulk_read(hw->regmap, ch->address,
diff --git a/queue/iio-magnetometer-ak8974-Fix-alignment-and-data-leak-.patch b/queue/iio-magnetometer-ak8974-Fix-alignment-and-data-leak-.patch index 7170a37..8c18a3b 100644 --- a/queue/iio-magnetometer-ak8974-Fix-alignment-and-data-leak-.patch +++ b/queue/iio-magnetometer-ak8974-Fix-alignment-and-data-leak-.patch
@@ -1,4 +1,4 @@ -From 838e00b13bfd4cac8b24df25bfc58e2eb99bcc70 Mon Sep 17 00:00:00 2001 +From 1544bdd66e9b58e899b9c0f063b4c3c9b1ea70aa Mon Sep 17 00:00:00 2001 From: Jonathan Cameron <Jonathan.Cameron@huawei.com> Date: Sun, 7 Jun 2020 16:53:49 +0100 Subject: [PATCH] iio:magnetometer:ak8974: Fix alignment and data leak issues @@ -21,12 +21,13 @@ Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Cc: <Stable@vger.kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/iio/magnetometer/ak8974.c b/drivers/iio/magnetometer/ak8974.c -index 041c9007bfbe..91c39352fba2 100644 +index d32996702110..4a9ba4171c57 100644 --- a/drivers/iio/magnetometer/ak8974.c +++ b/drivers/iio/magnetometer/ak8974.c -@@ -192,6 +192,11 @@ struct ak8974 { +@@ -185,6 +185,11 @@ struct ak8974 { bool drdy_irq; struct completion drdy_complete; bool drdy_active_low; @@ -38,7 +39,7 @@ }; static const char ak8974_reg_avdd[] = "avdd"; -@@ -657,7 +662,6 @@ static void ak8974_fill_buffer(struct iio_dev *indio_dev) +@@ -581,7 +586,6 @@ static void ak8974_fill_buffer(struct iio_dev *indio_dev) { struct ak8974 *ak8974 = iio_priv(indio_dev); int ret; @@ -46,7 +47,7 @@ pm_runtime_get_sync(&ak8974->i2c->dev); mutex_lock(&ak8974->lock); -@@ -667,13 +671,13 @@ static void ak8974_fill_buffer(struct iio_dev *indio_dev) +@@ -591,13 +595,13 @@ static void ak8974_fill_buffer(struct iio_dev *indio_dev) dev_err(&ak8974->i2c->dev, "error triggering measure\n"); goto out_unlock; }
diff --git a/queue/iio-magnetometer-ak8974-Fix-runtime-PM-imbalance-on-.patch b/queue/iio-magnetometer-ak8974-Fix-runtime-PM-imbalance-on-.patch index 7f4dc6a..fcd52e2 100644 --- a/queue/iio-magnetometer-ak8974-Fix-runtime-PM-imbalance-on-.patch +++ b/queue/iio-magnetometer-ak8974-Fix-runtime-PM-imbalance-on-.patch
@@ -1,4 +1,4 @@ -From 5616d11602a3d0c72bc1593e2521fa1b8e83e50a Mon Sep 17 00:00:00 2001 +From 1ef92196f79d67424155ee17a19432fc8a664508 Mon Sep 17 00:00:00 2001 From: Dinghao Liu <dinghao.liu@zju.edu.cn> Date: Tue, 26 May 2020 18:47:17 +0800 Subject: [PATCH] iio: magnetometer: ak8974: Fix runtime PM imbalance on error @@ -18,6 +18,7 @@ Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/iio/magnetometer/ak8974.c b/drivers/iio/magnetometer/ak8974.c index 4a9ba4171c57..87c15a63c1a4 100644
diff --git a/queue/iio-mma8452-Add-missed-iio_device_unregister-call-in.patch b/queue/iio-mma8452-Add-missed-iio_device_unregister-call-in.patch index 7e4f0ad..5331e1a 100644 --- a/queue/iio-mma8452-Add-missed-iio_device_unregister-call-in.patch +++ b/queue/iio-mma8452-Add-missed-iio_device_unregister-call-in.patch
@@ -1,4 +1,4 @@ -From d7369ae1f4d7cffa7574d15e1f787dcca184c49d Mon Sep 17 00:00:00 2001 +From 1784f28b4265f2f72079c0a8afc54c447e5e7b43 Mon Sep 17 00:00:00 2001 From: Chuhong Yuan <hslester96@gmail.com> Date: Thu, 28 May 2020 14:41:21 +0800 Subject: [PATCH] iio: mma8452: Add missed iio_device_unregister() call in @@ -15,6 +15,7 @@ Signed-off-by: Chuhong Yuan <hslester96@gmail.com> Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c index 00e100fc845a..813bca7cfc3e 100644
diff --git a/queue/iio-pressure-ms5611-Fix-buffer-element-alignment.patch b/queue/iio-pressure-ms5611-Fix-buffer-element-alignment.patch index 82e1e6a..3156870 100644 --- a/queue/iio-pressure-ms5611-Fix-buffer-element-alignment.patch +++ b/queue/iio-pressure-ms5611-Fix-buffer-element-alignment.patch
@@ -1,4 +1,4 @@ -From 8db4afe163bbdd93dca6fcefbb831ef12ecc6b4d Mon Sep 17 00:00:00 2001 +From 2e94c3da4f7c64c5b3d21dc44ec52ae755953d86 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron <Jonathan.Cameron@huawei.com> Date: Sun, 7 Jun 2020 16:53:57 +0100 Subject: [PATCH] iio:pressure:ms5611 Fix buffer element alignment @@ -22,6 +22,7 @@ Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Acked-by: Tomasz Duszynski <tomasz.duszynski@octakon.com> Cc: <Stable@vger.kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/iio/pressure/ms5611_core.c b/drivers/iio/pressure/ms5611_core.c index 2f598ad91621..f5db9fa086f3 100644
diff --git a/queue/iio-pressure-zpa2326-handle-pm_runtime_get_sync-fail.patch b/queue/iio-pressure-zpa2326-handle-pm_runtime_get_sync-fail.patch index cebc5ac..b92f7e3 100644 --- a/queue/iio-pressure-zpa2326-handle-pm_runtime_get_sync-fail.patch +++ b/queue/iio-pressure-zpa2326-handle-pm_runtime_get_sync-fail.patch
@@ -1,4 +1,4 @@ -From d88de040e1df38414fc1e4380be9d0e997ab4d58 Mon Sep 17 00:00:00 2001 +From d991541ae8e1c7b8a4d6f0013c00313f1491f953 Mon Sep 17 00:00:00 2001 From: Navid Emamdoost <navid.emamdoost@gmail.com> Date: Thu, 4 Jun 2020 21:44:44 -0500 Subject: [PATCH] iio: pressure: zpa2326: handle pm_runtime_get_sync failure @@ -13,12 +13,13 @@ Fixes: 03b262f2bbf4 ("iio:pressure: initial zpa2326 barometer support") Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/iio/pressure/zpa2326.c b/drivers/iio/pressure/zpa2326.c -index 37fe851f89af..799a8dc3e248 100644 +index 9d0d07930236..7f2e5a8942a4 100644 --- a/drivers/iio/pressure/zpa2326.c +++ b/drivers/iio/pressure/zpa2326.c -@@ -665,8 +665,10 @@ static int zpa2326_resume(const struct iio_dev *indio_dev) +@@ -664,8 +664,10 @@ static int zpa2326_resume(const struct iio_dev *indio_dev) int err; err = pm_runtime_get_sync(indio_dev->dev.parent);
diff --git a/queue/intel_th-Fix-a-NULL-dereference-when-hub-driver-is-n.patch b/queue/intel_th-Fix-a-NULL-dereference-when-hub-driver-is-n.patch index 67f6534..bf21e9b 100644 --- a/queue/intel_th-Fix-a-NULL-dereference-when-hub-driver-is-n.patch +++ b/queue/intel_th-Fix-a-NULL-dereference-when-hub-driver-is-n.patch
@@ -1,4 +1,4 @@ -From e78e1fdb282726beaf88aa75943682217e6ded0e Mon Sep 17 00:00:00 2001 +From a3662c640bd2b09a493f42c5919569f283e0706d Mon Sep 17 00:00:00 2001 From: Alexander Shishkin <alexander.shishkin@linux.intel.com> Date: Mon, 6 Jul 2020 19:13:39 +0300 Subject: [PATCH] intel_th: Fix a NULL dereference when hub driver is not @@ -33,12 +33,13 @@ Cc: stable@vger.kernel.org # v4.4 Link: https://lore.kernel.org/r/20200706161339.55468-5-alexander.shishkin@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hwtracing/intel_th/core.c b/drivers/hwtracing/intel_th/core.c -index ca232ec565e8..c9ac3dc65113 100644 +index 52f000d37bac..9ea1d8f54465 100644 --- a/drivers/hwtracing/intel_th/core.c +++ b/drivers/hwtracing/intel_th/core.c -@@ -1021,15 +1021,30 @@ int intel_th_set_output(struct intel_th_device *thdev, +@@ -1030,15 +1030,30 @@ int intel_th_set_output(struct intel_th_device *thdev, { struct intel_th_device *hub = to_intel_th_hub(thdev); struct intel_th_driver *hubdrv = to_intel_th_driver(hub->dev.driver);
diff --git a/queue/intel_th-pci-Add-Emmitsburg-PCH-support.patch b/queue/intel_th-pci-Add-Emmitsburg-PCH-support.patch index 81a7c5a..16826e2 100644 --- a/queue/intel_th-pci-Add-Emmitsburg-PCH-support.patch +++ b/queue/intel_th-pci-Add-Emmitsburg-PCH-support.patch
@@ -1,4 +1,4 @@ -From fd73d74a32bfaaf259441322cc5a1c83caaa94f2 Mon Sep 17 00:00:00 2001 +From 53fedc4da845751837e6ed5f640099d15da81318 Mon Sep 17 00:00:00 2001 From: Alexander Shishkin <alexander.shishkin@linux.intel.com> Date: Mon, 6 Jul 2020 19:13:38 +0300 Subject: [PATCH] intel_th: pci: Add Emmitsburg PCH support @@ -12,12 +12,13 @@ Cc: stable@vger.kernel.org # v4.14+ Link: https://lore.kernel.org/r/20200706161339.55468-4-alexander.shishkin@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c -index f321e5ffe2a7..21fdf0b93516 100644 +index 2d58669228b2..0d26484d6795 100644 --- a/drivers/hwtracing/intel_th/pci.c +++ b/drivers/hwtracing/intel_th/pci.c -@@ -258,6 +258,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { +@@ -254,6 +254,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4b26), .driver_data = (kernel_ulong_t)&intel_th_2x, },
diff --git a/queue/intel_th-pci-Add-Jasper-Lake-CPU-support.patch b/queue/intel_th-pci-Add-Jasper-Lake-CPU-support.patch index 14cf0fa..fc9cb75 100644 --- a/queue/intel_th-pci-Add-Jasper-Lake-CPU-support.patch +++ b/queue/intel_th-pci-Add-Jasper-Lake-CPU-support.patch
@@ -1,4 +1,4 @@ -From 203c1f615052921901b7a8fbe2005d8ea6add076 Mon Sep 17 00:00:00 2001 +From fb496e4702f436d3a5cdfefc104bc13ca8bf9959 Mon Sep 17 00:00:00 2001 From: Alexander Shishkin <alexander.shishkin@linux.intel.com> Date: Mon, 6 Jul 2020 19:13:36 +0300 Subject: [PATCH] intel_th: pci: Add Jasper Lake CPU support @@ -12,12 +12,13 @@ Cc: stable@vger.kernel.org # v4.14+ Link: https://lore.kernel.org/r/20200706161339.55468-2-alexander.shishkin@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c -index 7ccac74553a6..f1dc1eef9ba2 100644 +index 86aa6a46bcba..dd856747f1df 100644 --- a/drivers/hwtracing/intel_th/pci.c +++ b/drivers/hwtracing/intel_th/pci.c -@@ -238,6 +238,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { +@@ -234,6 +234,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4da6), .driver_data = (kernel_ulong_t)&intel_th_2x, },
diff --git a/queue/intel_th-pci-Add-Tiger-Lake-PCH-H-support.patch b/queue/intel_th-pci-Add-Tiger-Lake-PCH-H-support.patch index f0c2e99..b8922fa 100644 --- a/queue/intel_th-pci-Add-Tiger-Lake-PCH-H-support.patch +++ b/queue/intel_th-pci-Add-Tiger-Lake-PCH-H-support.patch
@@ -1,4 +1,4 @@ -From 6227585dc7b6a5405fc08dc322f98cb95e2f0eb4 Mon Sep 17 00:00:00 2001 +From eafa39d1a4d1392f20e59428b5b634b0ca6af57d Mon Sep 17 00:00:00 2001 From: Alexander Shishkin <alexander.shishkin@linux.intel.com> Date: Mon, 6 Jul 2020 19:13:37 +0300 Subject: [PATCH] intel_th: pci: Add Tiger Lake PCH-H support @@ -12,12 +12,13 @@ Cc: stable@vger.kernel.org # v4.14+ Link: https://lore.kernel.org/r/20200706161339.55468-3-alexander.shishkin@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c -index f1dc1eef9ba2..f321e5ffe2a7 100644 +index dd856747f1df..2d58669228b2 100644 --- a/drivers/hwtracing/intel_th/pci.c +++ b/drivers/hwtracing/intel_th/pci.c -@@ -233,6 +233,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { +@@ -229,6 +229,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa0a6), .driver_data = (kernel_ulong_t)&intel_th_2x, },
diff --git a/queue/iommu-vt-d-Make-Intel-SVM-code-64-bit-only.patch b/queue/iommu-vt-d-Make-Intel-SVM-code-64-bit-only.patch index b7d13cd..7b3ece1 100644 --- a/queue/iommu-vt-d-Make-Intel-SVM-code-64-bit-only.patch +++ b/queue/iommu-vt-d-Make-Intel-SVM-code-64-bit-only.patch
@@ -1,4 +1,4 @@ -From 9de1e4064588c8fc64f40a4d9d88c8ab41306304 Mon Sep 17 00:00:00 2001 +From 674404360f8895eaa8f8b2ff5a9ccaeb073217e4 Mon Sep 17 00:00:00 2001 From: Lu Baolu <baolu.lu@linux.intel.com> Date: Tue, 23 Jun 2020 07:13:40 +0800 Subject: [PATCH] iommu/vt-d: Make Intel SVM code 64-bit only @@ -17,6 +17,7 @@ Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> Link: https://lore.kernel.org/r/20200622231345.29722-2-baolu.lu@linux.intel.com Signed-off-by: Joerg Roedel <jroedel@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 83664db5221d..c255fc8c7f8a 100644
diff --git a/queue/ipv4-fill-fl4_icmp_-type-code-in-ping_v4_sendmsg.patch b/queue/ipv4-fill-fl4_icmp_-type-code-in-ping_v4_sendmsg.patch index b9ce91f..998b1b0 100644 --- a/queue/ipv4-fill-fl4_icmp_-type-code-in-ping_v4_sendmsg.patch +++ b/queue/ipv4-fill-fl4_icmp_-type-code-in-ping_v4_sendmsg.patch
@@ -1,4 +1,4 @@ -From 5eff06902394425c722f0a44d9545909a8800f79 Mon Sep 17 00:00:00 2001 +From 5a9c2b8c3ce5b685bfa53d4febd7762da9dc3914 Mon Sep 17 00:00:00 2001 From: Sabrina Dubroca <sd@queasysnail.net> Date: Fri, 3 Jul 2020 17:00:32 +0200 Subject: [PATCH] ipv4: fill fl4_icmp_{type,code} in ping_v4_sendmsg @@ -29,9 +29,10 @@ Tested-by: Paul Wouters <pwouters@redhat.com> Signed-off-by: Sabrina Dubroca <sd@queasysnail.net> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c -index 535427292194..df6fbefe44d4 100644 +index 9d24ef5c5d8f..ce723a526b73 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -786,6 +786,9 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
diff --git a/queue/ipv6-Fix-use-of-anycast-address-with-loopback.patch b/queue/ipv6-Fix-use-of-anycast-address-with-loopback.patch index c37a8e7..0c37326 100644 --- a/queue/ipv6-Fix-use-of-anycast-address-with-loopback.patch +++ b/queue/ipv6-Fix-use-of-anycast-address-with-loopback.patch
@@ -1,4 +1,4 @@ -From aea23c323d89836bcdcee67e49def997ffca043b Mon Sep 17 00:00:00 2001 +From f4bee498b191376e55bb82a6670d02a272243a1a Mon Sep 17 00:00:00 2001 From: David Ahern <dsahern@kernel.org> Date: Tue, 7 Jul 2020 07:39:24 -0600 Subject: [PATCH] ipv6: Fix use of anycast address with loopback @@ -23,12 +23,13 @@ Reported-by: thomas.gambier@nexedi.com Signed-off-by: David Ahern <dsahern@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv6/route.c b/net/ipv6/route.c -index ea0be7cf3d93..f3279810d765 100644 +index 1f5a33d0c68c..a71b115e65fe 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c -@@ -3405,7 +3405,7 @@ static bool fib6_is_reject(u32 flags, struct net_device *dev, int addr_type) +@@ -2989,7 +2989,7 @@ static bool fib6_is_reject(u32 flags, struct net_device *dev, int addr_type) if ((flags & RTF_REJECT) || (dev && (dev->flags & IFF_LOOPBACK) && !(addr_type & IPV6_ADDR_LOOPBACK) &&
diff --git a/queue/keys-asymmetric-fix-error-return-code-in-software_ke.patch b/queue/keys-asymmetric-fix-error-return-code-in-software_ke.patch index 069403e..458bf81 100644 --- a/queue/keys-asymmetric-fix-error-return-code-in-software_ke.patch +++ b/queue/keys-asymmetric-fix-error-return-code-in-software_ke.patch
@@ -1,4 +1,4 @@ -From 6cbba1f9114a8134cff9138c79add15012fd52b9 Mon Sep 17 00:00:00 2001 +From a7e65d273de741c48f14f05ed9648233bda1495b Mon Sep 17 00:00:00 2001 From: Wei Yongjun <weiyongjun1@huawei.com> Date: Wed, 15 Jul 2020 23:28:38 +0100 Subject: [PATCH] keys: asymmetric: fix error return code in @@ -13,6 +13,7 @@ Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c index d7f43d4ea925..e5fae4e838c0 100644
diff --git a/queue/l2tp-remove-skb_dst_set-from-l2tp_xmit_skb.patch b/queue/l2tp-remove-skb_dst_set-from-l2tp_xmit_skb.patch index 9e136de..c46d114 100644 --- a/queue/l2tp-remove-skb_dst_set-from-l2tp_xmit_skb.patch +++ b/queue/l2tp-remove-skb_dst_set-from-l2tp_xmit_skb.patch
@@ -1,4 +1,4 @@ -From 27d53323664c549b5bb2dfaaf6f7ad6e0376a64e Mon Sep 17 00:00:00 2001 +From 7ee94fd68b136b83aee07e42c88ead860bc5741d Mon Sep 17 00:00:00 2001 From: Xin Long <lucien.xin@gmail.com> Date: Tue, 7 Jul 2020 02:02:32 +0800 Subject: [PATCH] l2tp: remove skb_dst_set() from l2tp_xmit_skb() @@ -30,12 +30,13 @@ Acked-by: James Chapman <jchapman@katalix.com> Tested-by: James Chapman <jchapman@katalix.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c -index 6d7ef78c88af..6434d17e6e8e 100644 +index b9f02f1407ac..4399c8466fe0 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c -@@ -1028,6 +1028,7 @@ static void l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb, +@@ -1030,6 +1030,7 @@ static void l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb, /* Queue the packet to IP for output */ skb->ignore_df = 1; @@ -43,7 +44,7 @@ #if IS_ENABLED(CONFIG_IPV6) if (l2tp_sk_is_v6(tunnel->sock)) error = inet6_csk_xmit(tunnel->sock, skb, NULL); -@@ -1099,10 +1100,6 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len +@@ -1101,10 +1102,6 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len goto out_unlock; }
diff --git a/queue/libceph-don-t-omit-recovery_deletes-in-target_copy.patch b/queue/libceph-don-t-omit-recovery_deletes-in-target_copy.patch index e976942..1344a09 100644 --- a/queue/libceph-don-t-omit-recovery_deletes-in-target_copy.patch +++ b/queue/libceph-don-t-omit-recovery_deletes-in-target_copy.patch
@@ -1,4 +1,4 @@ -From 2f3fead62144002557f322c2a7c15e1255df0653 Mon Sep 17 00:00:00 2001 +From 7c5dcdfe50a66e80c65adba9f753a6e876d94f33 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov <idryomov@gmail.com> Date: Tue, 9 Jun 2020 11:57:56 +0200 Subject: [PATCH] libceph: don't omit recovery_deletes in target_copy() @@ -12,12 +12,13 @@ Fixes: ae78dd8139ce ("libceph: make RECOVERY_DELETES feature create a new interval") Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Reviewed-by: Jeff Layton <jlayton@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c -index a37d159019a0..8f7fbe861dff 100644 +index c370b1eb8203..bb85787f9237 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c -@@ -445,6 +445,7 @@ static void target_copy(struct ceph_osd_request_target *dest, +@@ -453,6 +453,7 @@ static void target_copy(struct ceph_osd_request_target *dest, dest->size = src->size; dest->min_size = src->min_size; dest->sort_bitwise = src->sort_bitwise;
diff --git a/queue/llc-make-sure-applications-use-ARPHRD_ETHER.patch b/queue/llc-make-sure-applications-use-ARPHRD_ETHER.patch index 8b740b2..0d76222 100644 --- a/queue/llc-make-sure-applications-use-ARPHRD_ETHER.patch +++ b/queue/llc-make-sure-applications-use-ARPHRD_ETHER.patch
@@ -1,4 +1,4 @@ -From a9b1110162357689a34992d5c925852948e5b9fd Mon Sep 17 00:00:00 2001 +From 06fbf28590e8871f545b30e214b5b070591edc4b Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Sat, 27 Jun 2020 13:31:50 -0700 Subject: [PATCH] llc: make sure applications use ARPHRD_ETHER @@ -118,12 +118,13 @@ Fixes: abf9d537fea2 ("llc: add support for SO_BINDTODEVICE") Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c -index 54fb8d452a7b..6e53e43c1907 100644 +index 2017b7d780f5..e56b3ef0d5bc 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c -@@ -273,6 +273,10 @@ static int llc_ui_autobind(struct socket *sock, struct sockaddr_llc *addr) +@@ -269,6 +269,10 @@ static int llc_ui_autobind(struct socket *sock, struct sockaddr_llc *addr) if (!sock_flag(sk, SOCK_ZAPPED)) goto out; @@ -134,7 +135,7 @@ rc = -ENODEV; if (sk->sk_bound_dev_if) { llc->dev = dev_get_by_index(&init_net, sk->sk_bound_dev_if); -@@ -328,7 +332,9 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen) +@@ -324,7 +328,9 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen) if (unlikely(!sock_flag(sk, SOCK_ZAPPED) || addrlen != sizeof(*addr))) goto out; rc = -EAFNOSUPPORT; @@ -145,7 +146,7 @@ goto out; dprintk("%s: binding %02X\n", __func__, addr->sllc_sap); rc = -ENODEV; -@@ -336,8 +342,6 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen) +@@ -332,8 +338,6 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen) if (sk->sk_bound_dev_if) { llc->dev = dev_get_by_index_rcu(&init_net, sk->sk_bound_dev_if); if (llc->dev) {
diff --git a/queue/m68k-mm-fix-node-memblock-init.patch b/queue/m68k-mm-fix-node-memblock-init.patch index 8354cd3..f4dfd1e 100644 --- a/queue/m68k-mm-fix-node-memblock-init.patch +++ b/queue/m68k-mm-fix-node-memblock-init.patch
@@ -1,4 +1,4 @@ -From c43e55796dd4d13f4855971a4d7970ce2cd94db4 Mon Sep 17 00:00:00 2001 +From 3422aa9b6b336fae1afcd6644005170aa03c428c Mon Sep 17 00:00:00 2001 From: Angelo Dureghello <angelo.dureghello@timesys.com> Date: Wed, 17 Jun 2020 09:53:41 +0300 Subject: [PATCH] m68k: mm: fix node memblock init @@ -14,12 +14,13 @@ Signed-off-by: Angelo Dureghello <angelo.dureghello@timesys.com> Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> Signed-off-by: Greg Ungerer <gerg@linux-m68k.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c -index 29f47923aa46..7d04210d34f0 100644 +index 6cb1e41d58d0..70a5f55ea664 100644 --- a/arch/m68k/mm/mcfmmu.c +++ b/arch/m68k/mm/mcfmmu.c -@@ -174,7 +174,7 @@ void __init cf_bootmem_alloc(void) +@@ -164,7 +164,7 @@ void __init cf_bootmem_alloc(void) m68k_memory[0].addr = _rambase; m68k_memory[0].size = _ramend - _rambase;
diff --git a/queue/m68k-nommu-register-start-of-the-memory-with-membloc.patch b/queue/m68k-nommu-register-start-of-the-memory-with-membloc.patch index b257c44..e6a851a 100644 --- a/queue/m68k-nommu-register-start-of-the-memory-with-membloc.patch +++ b/queue/m68k-nommu-register-start-of-the-memory-with-membloc.patch
@@ -1,4 +1,4 @@ -From d63bd8c81d8ab64db506ffde569cc8ff197516e2 Mon Sep 17 00:00:00 2001 +From 8c7a0b68011b8686ffac1cdae8ef34491b246958 Mon Sep 17 00:00:00 2001 From: Mike Rapoport <rppt@linux.ibm.com> Date: Wed, 17 Jun 2020 09:53:40 +0300 Subject: [PATCH] m68k: nommu: register start of the memory with memblock @@ -37,12 +37,13 @@ Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> Signed-off-by: Greg Ungerer <gerg@linux-m68k.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c -index e779b19e0193..f66f4b1d062e 100644 +index 3c5def10d486..caa260f877f2 100644 --- a/arch/m68k/kernel/setup_no.c +++ b/arch/m68k/kernel/setup_no.c -@@ -138,7 +138,8 @@ void __init setup_arch(char **cmdline_p) +@@ -139,7 +139,8 @@ void __init setup_arch(char **cmdline_p) pr_debug("MEMORY -> ROMFS=0x%p-0x%06lx MEM=0x%06lx-0x%06lx\n ", __bss_stop, memory_start, memory_start, memory_end);
diff --git a/queue/mac80211-fix-misplaced-while-instead-of-if.patch b/queue/mac80211-fix-misplaced-while-instead-of-if.patch index f184310..4274bdb 100644 --- a/queue/mac80211-fix-misplaced-while-instead-of-if.patch +++ b/queue/mac80211-fix-misplaced-while-instead-of-if.patch
@@ -1,4 +1,4 @@ -From 5981fe5b0529ba25d95f37d7faa434183ad618c5 Mon Sep 17 00:00:00 2001 +From 324f0378c7306b6f5ee97dc1cfe9e7f2eafc70ab Mon Sep 17 00:00:00 2001 From: Johannes Berg <johannes.berg@intel.com> Date: Mon, 3 Aug 2020 11:02:10 +0200 Subject: [PATCH] mac80211: fix misplaced while instead of if @@ -16,12 +16,13 @@ Reported-by: Ben Greear <greearb@candelatech.com> Link: https://lore.kernel.org/r/20200803110209.253009ae41ff.I3522aad099392b31d5cf2dcca34cbac7e5832dde@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c -index 1dc747de30cc..f2840d1d95cf 100644 +index b0b3ea3cbd56..2e217664f146 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c -@@ -1050,7 +1050,7 @@ static void __sta_info_destroy_part2(struct sta_info *sta) +@@ -992,7 +992,7 @@ static void __sta_info_destroy_part2(struct sta_info *sta) might_sleep(); lockdep_assert_held(&local->sta_mtx);
diff --git a/queue/mei-bus-don-t-clean-driver-pointer.patch b/queue/mei-bus-don-t-clean-driver-pointer.patch index c16f420..01e7b00 100644 --- a/queue/mei-bus-don-t-clean-driver-pointer.patch +++ b/queue/mei-bus-don-t-clean-driver-pointer.patch
@@ -1,4 +1,4 @@ -From e852c2c251ed9c23ae6e3efebc5ec49adb504207 Mon Sep 17 00:00:00 2001 +From 02375c0816b8fb6599f771daae56869a98537640 Mon Sep 17 00:00:00 2001 From: Alexander Usyskin <alexander.usyskin@intel.com> Date: Mon, 29 Jun 2020 01:53:59 +0300 Subject: [PATCH] mei: bus: don't clean driver pointer @@ -28,9 +28,10 @@ Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Link: https://lore.kernel.org/r/20200628225359.2185929-1-tomas.winkler@intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c -index 8d468e0a950a..f476dbc7252b 100644 +index 53bb394ccba6..cef97a7eb8b6 100644 --- a/drivers/misc/mei/bus.c +++ b/drivers/misc/mei/bus.c @@ -745,9 +745,8 @@ static int mei_cl_device_remove(struct device *dev)
diff --git a/queue/misc-atmel-ssc-lock-with-mutex-instead-of-spinlock.patch b/queue/misc-atmel-ssc-lock-with-mutex-instead-of-spinlock.patch index ab1941c..b1b095a 100644 --- a/queue/misc-atmel-ssc-lock-with-mutex-instead-of-spinlock.patch +++ b/queue/misc-atmel-ssc-lock-with-mutex-instead-of-spinlock.patch
@@ -1,4 +1,4 @@ -From b037d60a3b1d1227609fd858fa34321f41829911 Mon Sep 17 00:00:00 2001 +From 53e57d02a7bac8df583f05b0db3744c3092362b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <mirq-linux@rere.qmqm.pl> Date: Wed, 24 Jun 2020 13:35:41 +0200 Subject: [PATCH] misc: atmel-ssc: lock with mutex instead of spinlock @@ -17,6 +17,7 @@ Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Link: https://lore.kernel.org/r/50f0d7fa107f318296afb49477c3571e4d6978c5.1592998403.git.mirq-linux@rere.qmqm.pl Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c index ab4144ea1f11..d6cd5537126c 100644
diff --git a/queue/mmc-mmci-Support-any-block-sizes-for-ux500v2-and-qco.patch b/queue/mmc-mmci-Support-any-block-sizes-for-ux500v2-and-qco.patch index 5a40632..225e3b7 100644 --- a/queue/mmc-mmci-Support-any-block-sizes-for-ux500v2-and-qco.patch +++ b/queue/mmc-mmci-Support-any-block-sizes-for-ux500v2-and-qco.patch
@@ -1,4 +1,4 @@ -From 22f107c4f6c31967f77cb4551e18038ef9c19658 Mon Sep 17 00:00:00 2001 +From 78c68dbfc6f725a99726210d06b9dd2ed66696a2 Mon Sep 17 00:00:00 2001 From: Linus Walleij <linus.walleij@linaro.org> Date: Tue, 17 Dec 2019 15:39:52 +0100 Subject: [PATCH] mmc: mmci: Support any block sizes for ux500v2 and qcom @@ -64,6 +64,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Tested-by: Stephan Gerhold <stephan@gerhold.net> Link: https://lore.kernel.org/r/20191217143952.2885-1-linus.walleij@linaro.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index b8554bf38f72..da59512e9411 100644
diff --git a/queue/mmc-sdhci-do-not-enable-card-detect-interrupt-for-gp.patch b/queue/mmc-sdhci-do-not-enable-card-detect-interrupt-for-gp.patch index 1914f1b..020d71f 100644 --- a/queue/mmc-sdhci-do-not-enable-card-detect-interrupt-for-gp.patch +++ b/queue/mmc-sdhci-do-not-enable-card-detect-interrupt-for-gp.patch
@@ -1,4 +1,4 @@ -From e65bb38824711559844ba932132f417bc5a355e2 Mon Sep 17 00:00:00 2001 +From 4f6c90b1bccdac2ad7006ce48104163a455b96de Mon Sep 17 00:00:00 2001 From: Haibo Chen <haibo.chen@nxp.com> Date: Wed, 19 Feb 2020 16:22:40 +0800 Subject: [PATCH] mmc: sdhci: do not enable card detect interrupt for gpio cd @@ -18,12 +18,13 @@ Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/1582100563-20555-2-git-send-email-haibo.chen@nxp.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.c b/drivers/mmc/host/sdhci.c -index 9c3745118e49..c59566363a42 100644 +index 89ff43b43de9..5a8d97a8f1e1 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c -@@ -153,7 +153,7 @@ static void sdhci_set_card_detection(struct sdhci_host *host, bool enable) +@@ -152,7 +152,7 @@ static void sdhci_set_card_detection(struct sdhci_host *host, bool enable) u32 present; if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) ||
diff --git a/queue/module-Correctly-truncate-sysfs-sections-output.patch b/queue/module-Correctly-truncate-sysfs-sections-output.patch index e772ade..e4aa98d 100644 --- a/queue/module-Correctly-truncate-sysfs-sections-output.patch +++ b/queue/module-Correctly-truncate-sysfs-sections-output.patch
@@ -1,4 +1,4 @@ -From 720ae20153dc1125966ffceabf6e69a919ced515 Mon Sep 17 00:00:00 2001 +From 3dc6abeed93072988e972f6b19f75f845c9387be Mon Sep 17 00:00:00 2001 From: Kees Cook <keescook@chromium.org> Date: Thu, 6 Aug 2020 14:15:23 -0700 Subject: [PATCH] module: Correctly truncate sysfs sections output @@ -19,6 +19,7 @@ Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Jessica Yu <jeyu@kernel.org> Signed-off-by: Kees Cook <keescook@chromium.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/module.c b/kernel/module.c index 78e750dd9fb5..9f35e1927807 100644
diff --git a/queue/mtd-rawnand-brcmnand-Fix-ecc-chunk-calculation-for-e.patch b/queue/mtd-rawnand-brcmnand-Fix-ecc-chunk-calculation-for-e.patch index ddcc069..beb9b3b 100644 --- a/queue/mtd-rawnand-brcmnand-Fix-ecc-chunk-calculation-for-e.patch +++ b/queue/mtd-rawnand-brcmnand-Fix-ecc-chunk-calculation-for-e.patch
@@ -1,4 +1,4 @@ -From 7f852cc1579297fd763789f8cd370639d0c654b6 Mon Sep 17 00:00:00 2001 +From e3ebfcb972ed77b71bf3b0a92f15ea312de3f022 Mon Sep 17 00:00:00 2001 From: Claire Lin <claire.lin@broadcom.com> Date: Mon, 26 Aug 2019 15:57:56 -0400 Subject: [PATCH] mtd: rawnand: brcmnand: Fix ecc chunk calculation for erased @@ -14,12 +14,13 @@ Reviewed-by: Ray Jui <ray.jui@broadcom.com> Signed-off-by: Kamal Dasu <kdasu.kdev@gmail.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c -index 33310b8a6eb8..15ef30b368a5 100644 +index f71bab29c475..8f60f9d8783c 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c -@@ -1792,6 +1792,7 @@ static int brcmstb_nand_verify_erased_page(struct mtd_info *mtd, +@@ -1670,6 +1670,7 @@ static int brcmstb_nand_verify_erased_page(struct mtd_info *mtd, int bitflips = 0; int page = addr >> chip->page_shift; int ret; @@ -27,7 +28,7 @@ if (!buf) buf = nand_get_data_buf(chip); -@@ -1804,7 +1805,9 @@ static int brcmstb_nand_verify_erased_page(struct mtd_info *mtd, +@@ -1682,7 +1683,9 @@ static int brcmstb_nand_verify_erased_page(struct mtd_info *mtd, return ret; for (i = 0; i < chip->ecc.steps; i++, oob += sas) {
diff --git a/queue/mtd-rawnand-brcmnand-correctly-verify-erased-pages.patch b/queue/mtd-rawnand-brcmnand-correctly-verify-erased-pages.patch index 578f064..eed6741 100644 --- a/queue/mtd-rawnand-brcmnand-correctly-verify-erased-pages.patch +++ b/queue/mtd-rawnand-brcmnand-correctly-verify-erased-pages.patch
@@ -1,4 +1,4 @@ -From dcb351c03f2fa6a599de1061b174167e03ee312b Mon Sep 17 00:00:00 2001 +From 758d7baf183c7e07aeb9dd52ead8baceec31598d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com> Date: Tue, 12 May 2020 10:24:51 +0200 Subject: [PATCH] mtd: rawnand: brcmnand: correctly verify erased pages @@ -17,12 +17,13 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20200512082451.771212-1-noltari@gmail.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c -index ede7cb95fe71..30a9a8dbcc05 100644 +index 8f60f9d8783c..3d870cf9fab4 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c -@@ -2017,28 +2017,31 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip, +@@ -1665,28 +1665,31 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip, static int brcmstb_nand_verify_erased_page(struct mtd_info *mtd, struct nand_chip *chip, void *buf, u64 addr) {
diff --git a/queue/mtd-rawnand-brcmnand-fix-CS0-layout.patch b/queue/mtd-rawnand-brcmnand-fix-CS0-layout.patch index 26eed88..9173de5 100644 --- a/queue/mtd-rawnand-brcmnand-fix-CS0-layout.patch +++ b/queue/mtd-rawnand-brcmnand-fix-CS0-layout.patch
@@ -1,4 +1,4 @@ -From 3d3fb3c5be9ce07fa85d8f67fb3922e4613b955b Mon Sep 17 00:00:00 2001 +From 8dd6a53c66ac1b9c4e4414f75bcd08894a8ba2e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com> Date: Fri, 22 May 2020 14:15:21 +0200 Subject: [PATCH] mtd: rawnand: brcmnand: fix CS0 layout @@ -16,12 +16,13 @@ Acked-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20200522121524.4161539-3-noltari@gmail.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c -index 0abd5d5fd54d..0a2a76195047 100644 +index 3d870cf9fab4..9d0a532efcf2 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c -@@ -605,8 +605,9 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) +@@ -483,8 +483,9 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) } else { ctrl->cs_offsets = brcmnand_cs_offsets;
diff --git a/queue/mtd-rawnand-marvell-Fix-probe-error-path.patch b/queue/mtd-rawnand-marvell-Fix-probe-error-path.patch index c04d15f..b3a5740 100644 --- a/queue/mtd-rawnand-marvell-Fix-probe-error-path.patch +++ b/queue/mtd-rawnand-marvell-Fix-probe-error-path.patch
@@ -1,4 +1,4 @@ -From c525b7af96714f72e316c70781570a4a3e1c2856 Mon Sep 17 00:00:00 2001 +From 7f0b626bbb001cfbccf9a3ed56d08a534dcbc08c Mon Sep 17 00:00:00 2001 From: Miquel Raynal <miquel.raynal@bootlin.com> Date: Fri, 24 Apr 2020 18:44:59 +0200 Subject: [PATCH] mtd: rawnand: marvell: Fix probe error path @@ -12,12 +12,13 @@ Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> Link: https://lore.kernel.org/linux-mtd/20200424164501.26719-5-miquel.raynal@bootlin.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c -index 893f86c2f57c..b5b58075ae3e 100644 +index f6a04715693e..ee4afa17d8a3 100644 --- a/drivers/mtd/nand/raw/marvell_nand.c +++ b/drivers/mtd/nand/raw/marvell_nand.c -@@ -2674,6 +2674,16 @@ static int marvell_nand_chip_init(struct device *dev, struct marvell_nfc *nfc, +@@ -2673,6 +2673,16 @@ static int marvell_nand_chip_init(struct device *dev, struct marvell_nfc *nfc, return 0; } @@ -34,7 +35,7 @@ static int marvell_nand_chips_init(struct device *dev, struct marvell_nfc *nfc) { struct device_node *np = dev->of_node; -@@ -2708,21 +2718,16 @@ static int marvell_nand_chips_init(struct device *dev, struct marvell_nfc *nfc) +@@ -2707,21 +2717,16 @@ static int marvell_nand_chips_init(struct device *dev, struct marvell_nfc *nfc) ret = marvell_nand_chip_init(dev, nfc, nand_np); if (ret) { of_node_put(nand_np);
diff --git a/queue/mtd-rawnand-marvell-Fix-the-condition-on-a-return-co.patch b/queue/mtd-rawnand-marvell-Fix-the-condition-on-a-return-co.patch index d86739a..8a45343 100644 --- a/queue/mtd-rawnand-marvell-Fix-the-condition-on-a-return-co.patch +++ b/queue/mtd-rawnand-marvell-Fix-the-condition-on-a-return-co.patch
@@ -1,4 +1,4 @@ -From c27075772d1f1c8aaf276db9943b35adda8a8b65 Mon Sep 17 00:00:00 2001 +From c360c26e6837a7710dbbac85ae29de77bc6df7e0 Mon Sep 17 00:00:00 2001 From: Miquel Raynal <miquel.raynal@bootlin.com> Date: Fri, 24 Apr 2020 18:44:56 +0200 Subject: [PATCH] mtd: rawnand: marvell: Fix the condition on a return code @@ -30,9 +30,10 @@ Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> Link: https://lore.kernel.org/linux-mtd/20200424164501.26719-2-miquel.raynal@bootlin.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c -index 343001250ccc..b5e9fa71d435 100644 +index fc49e13d81ec..1af568ae1c00 100644 --- a/drivers/mtd/nand/raw/marvell_nand.c +++ b/drivers/mtd/nand/raw/marvell_nand.c @@ -707,7 +707,7 @@ static int marvell_nfc_wait_op(struct nand_chip *chip, unsigned int timeout_ms)
diff --git a/queue/mtd-rawnand-marvell-Use-nand_cleanup-when-the-device.patch b/queue/mtd-rawnand-marvell-Use-nand_cleanup-when-the-device.patch index 1a044d9..44ee8a9 100644 --- a/queue/mtd-rawnand-marvell-Use-nand_cleanup-when-the-device.patch +++ b/queue/mtd-rawnand-marvell-Use-nand_cleanup-when-the-device.patch
@@ -1,4 +1,4 @@ -From 7a0c18fb5c71c6ac7d4662a145e4227dcd4a36a3 Mon Sep 17 00:00:00 2001 +From 12fe315b81ee506eedf2198c6d0cad63130030be Mon Sep 17 00:00:00 2001 From: Miquel Raynal <miquel.raynal@bootlin.com> Date: Fri, 24 Apr 2020 18:44:58 +0200 Subject: [PATCH] mtd: rawnand: marvell: Use nand_cleanup() when the device is @@ -13,12 +13,13 @@ Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> Link: https://lore.kernel.org/linux-mtd/20200424164501.26719-4-miquel.raynal@bootlin.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c -index b7f0bf5e8894..893f86c2f57c 100644 +index 1af568ae1c00..f6a04715693e 100644 --- a/drivers/mtd/nand/raw/marvell_nand.c +++ b/drivers/mtd/nand/raw/marvell_nand.c -@@ -2665,7 +2665,7 @@ static int marvell_nand_chip_init(struct device *dev, struct marvell_nfc *nfc, +@@ -2664,7 +2664,7 @@ static int marvell_nand_chip_init(struct device *dev, struct marvell_nfc *nfc, ret = mtd_device_register(mtd, NULL, 0); if (ret) { dev_err(dev, "failed to register mtd device: %d\n", ret);
diff --git a/queue/mtd-rawnand-oxnas-Add-of_node_put.patch b/queue/mtd-rawnand-oxnas-Add-of_node_put.patch index 0b5e8e2..d8895b5 100644 --- a/queue/mtd-rawnand-oxnas-Add-of_node_put.patch +++ b/queue/mtd-rawnand-oxnas-Add-of_node_put.patch
@@ -1,4 +1,4 @@ -From c436f68beeb20f2f92937677db1d9069b0dd2a3d Mon Sep 17 00:00:00 2001 +From 36a518dcee7fa81ce4cfd3876625d2808d5d086d Mon Sep 17 00:00:00 2001 From: Nishka Dasgupta <nishkadg.linux@gmail.com> Date: Tue, 9 Jul 2019 22:40:16 +0530 Subject: [PATCH] mtd: rawnand: oxnas: Add of_node_put() @@ -13,6 +13,7 @@ Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mtd/nand/raw/oxnas_nand.c b/drivers/mtd/nand/raw/oxnas_nand.c index 30c51f772de6..c43cb4d92d3d 100644
diff --git a/queue/mtd-rawnand-oxnas-Keep-track-of-registered-devices.patch b/queue/mtd-rawnand-oxnas-Keep-track-of-registered-devices.patch index e3f8451..192ce88 100644 --- a/queue/mtd-rawnand-oxnas-Keep-track-of-registered-devices.patch +++ b/queue/mtd-rawnand-oxnas-Keep-track-of-registered-devices.patch
@@ -1,4 +1,4 @@ -From 383fc3f613e7eac9f2e3c13b6f9fb8c1f39cb9d5 Mon Sep 17 00:00:00 2001 +From 4504751f78fa0762a392e6b9f3397466cfd7a62c Mon Sep 17 00:00:00 2001 From: Miquel Raynal <miquel.raynal@bootlin.com> Date: Tue, 19 May 2020 15:00:08 +0200 Subject: [PATCH] mtd: rawnand: oxnas: Keep track of registered devices @@ -14,6 +14,7 @@ Fixes: 668592492409 ("mtd: nand: Add OX820 NAND Support") Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20200519130035.1883-36-miquel.raynal@bootlin.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mtd/nand/raw/oxnas_nand.c b/drivers/mtd/nand/raw/oxnas_nand.c index c43cb4d92d3d..bead5ac70160 100644
diff --git a/queue/mtd-rawnand-oxnas-Release-all-devices-in-the-_remove.patch b/queue/mtd-rawnand-oxnas-Release-all-devices-in-the-_remove.patch index ffb6f78..60e1e78 100644 --- a/queue/mtd-rawnand-oxnas-Release-all-devices-in-the-_remove.patch +++ b/queue/mtd-rawnand-oxnas-Release-all-devices-in-the-_remove.patch
@@ -1,4 +1,4 @@ -From 0a5f45e57e35d0840bedb816974ce2e63406cd8b Mon Sep 17 00:00:00 2001 +From 074c9ef4c7d25bd1776b0a9c41edb0cb1fdb038b Mon Sep 17 00:00:00 2001 From: Miquel Raynal <miquel.raynal@bootlin.com> Date: Tue, 19 May 2020 15:00:11 +0200 Subject: [PATCH] mtd: rawnand: oxnas: Release all devices in the _remove() @@ -12,9 +12,10 @@ Fixes: 668592492409 ("mtd: nand: Add OX820 NAND Support") Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20200519130035.1883-39-miquel.raynal@bootlin.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mtd/nand/raw/oxnas_nand.c b/drivers/mtd/nand/raw/oxnas_nand.c -index 25862d62f994..23c222b6c40e 100644 +index 6ae71e2a0ed5..504c4504300c 100644 --- a/drivers/mtd/nand/raw/oxnas_nand.c +++ b/drivers/mtd/nand/raw/oxnas_nand.c @@ -177,9 +177,13 @@ static int oxnas_nand_probe(struct platform_device *pdev)
diff --git a/queue/mtd-rawnand-oxnas-Unregister-all-devices-on-error.patch b/queue/mtd-rawnand-oxnas-Unregister-all-devices-on-error.patch index 49fb4cf..5622572 100644 --- a/queue/mtd-rawnand-oxnas-Unregister-all-devices-on-error.patch +++ b/queue/mtd-rawnand-oxnas-Unregister-all-devices-on-error.patch
@@ -1,4 +1,4 @@ -From c036040702dc6fe1e3b6f2f29221bc44d510ff94 Mon Sep 17 00:00:00 2001 +From a21f8a98c4c9b845de5d5b296f34e962583dcc6f Mon Sep 17 00:00:00 2001 From: Miquel Raynal <miquel.raynal@bootlin.com> Date: Tue, 19 May 2020 15:00:10 +0200 Subject: [PATCH] mtd: rawnand: oxnas: Unregister all devices on error @@ -14,6 +14,7 @@ Fixes: 668592492409 ("mtd: nand: Add OX820 NAND Support") Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20200519130035.1883-38-miquel.raynal@bootlin.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mtd/nand/raw/oxnas_nand.c b/drivers/mtd/nand/raw/oxnas_nand.c index bead5ac70160..6ae71e2a0ed5 100644
diff --git a/queue/mtd-rawnand-timings-Fix-default-tR_max-and-tCCS_min-.patch b/queue/mtd-rawnand-timings-Fix-default-tR_max-and-tCCS_min-.patch index dd41926..e9bb4ac 100644 --- a/queue/mtd-rawnand-timings-Fix-default-tR_max-and-tCCS_min-.patch +++ b/queue/mtd-rawnand-timings-Fix-default-tR_max-and-tCCS_min-.patch
@@ -1,4 +1,4 @@ -From 4d8ec041d9c454029f6cd90622f6d81eb61e781c Mon Sep 17 00:00:00 2001 +From fa314a8b04dc4e75e4d5880f5e418afdd8e300a6 Mon Sep 17 00:00:00 2001 From: Miquel Raynal <miquel.raynal@bootlin.com> Date: Tue, 28 Apr 2020 11:42:55 +0200 Subject: [PATCH] mtd: rawnand: timings: Fix default tR_max and tCCS_min @@ -14,12 +14,13 @@ Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> Link: https://lore.kernel.org/linux-mtd/20200428094302.14624-3-miquel.raynal@bootlin.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mtd/nand/raw/nand_timings.c b/drivers/mtd/nand/raw/nand_timings.c -index 0061cbaf931d..36d21be3dfe5 100644 +index f64b06a71dfa..f12b7a7844c9 100644 --- a/drivers/mtd/nand/raw/nand_timings.c +++ b/drivers/mtd/nand/raw/nand_timings.c -@@ -320,10 +320,9 @@ int onfi_fill_data_interface(struct nand_chip *chip, +@@ -314,10 +314,9 @@ int onfi_fill_data_interface(struct nand_chip *chip, /* microseconds -> picoseconds */ timings->tPROG_max = 1000000ULL * ONFI_DYN_TIMING_MAX; timings->tBERS_max = 1000000ULL * ONFI_DYN_TIMING_MAX;
diff --git a/queue/net-Added-pointer-check-for-dst-ops-neigh_lookup-in-.patch b/queue/net-Added-pointer-check-for-dst-ops-neigh_lookup-in-.patch index 57b50cc..fa6bd17 100644 --- a/queue/net-Added-pointer-check-for-dst-ops-neigh_lookup-in-.patch +++ b/queue/net-Added-pointer-check-for-dst-ops-neigh_lookup-in-.patch
@@ -1,4 +1,4 @@ -From 394de110a73395de2ca4516b0de435e91b11b604 Mon Sep 17 00:00:00 2001 +From 576944bdcda2d7b734774da4e80ff56a2ac9f4e6 Mon Sep 17 00:00:00 2001 From: Martin Varghese <martin.varghese@nokia.com> Date: Sun, 5 Jul 2020 14:23:49 +0530 Subject: [PATCH] net: Added pointer check for dst->ops->neigh_lookup in @@ -94,12 +94,13 @@ Fixes: aaa0c23cb901 ("Fix dst_neigh_lookup/dst_neigh_lookup_skb return value handling bug") Signed-off-by: Martin Varghese <martin.varghese@nokia.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/net/dst.h b/include/net/dst.h -index 07adfacd8088..852d8fb36ab7 100644 +index 4d61945d5d74..2fbb03797d14 100644 --- a/include/net/dst.h +++ b/include/net/dst.h -@@ -400,7 +400,15 @@ static inline struct neighbour *dst_neigh_lookup(const struct dst_entry *dst, co +@@ -401,7 +401,15 @@ static inline struct neighbour *dst_neigh_lookup(const struct dst_entry *dst, co static inline struct neighbour *dst_neigh_lookup_skb(const struct dst_entry *dst, struct sk_buff *skb) {
diff --git a/queue/net-atlantic-fix-ip-dst-and-ipv6-address-filters.patch b/queue/net-atlantic-fix-ip-dst-and-ipv6-address-filters.patch index 5906740..7f9f108 100644 --- a/queue/net-atlantic-fix-ip-dst-and-ipv6-address-filters.patch +++ b/queue/net-atlantic-fix-ip-dst-and-ipv6-address-filters.patch
@@ -1,4 +1,4 @@ -From 68d5bcd0f6f574b103958c421043af8c1524de5b Mon Sep 17 00:00:00 2001 +From d4d8458ad87c63f5c932b4a27d2f3439ac67aa7a Mon Sep 17 00:00:00 2001 From: Dmitry Bogdanov <dbogdanov@marvell.com> Date: Wed, 8 Jul 2020 17:17:10 +0300 Subject: [PATCH] net: atlantic: fix ip dst and ipv6 address filters @@ -15,6 +15,7 @@ Signed-off-by: Mark Starovoytov <mstarovoitov@marvell.com> Signed-off-by: Alexander Lobakin <alobakin@marvell.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c index bf6673aab7a4..06838a38a246 100644
diff --git a/queue/net-macb-call-pm_runtime_put_sync-on-failure-path.patch b/queue/net-macb-call-pm_runtime_put_sync-on-failure-path.patch index 4b611fe..06067eb 100644 --- a/queue/net-macb-call-pm_runtime_put_sync-on-failure-path.patch +++ b/queue/net-macb-call-pm_runtime_put_sync-on-failure-path.patch
@@ -1,4 +1,4 @@ -From 28abae668f5ff1788e735ead8e008afe02261706 Mon Sep 17 00:00:00 2001 +From 9ddf929ea3a9e25597ea3ed052a966620916f895 Mon Sep 17 00:00:00 2001 From: Sasha Levin <sashal@kernel.org> Date: Fri, 17 Jul 2020 11:05:03 -0400 Subject: [PATCH] net: macb: call pm_runtime_put_sync on failure path @@ -12,6 +12,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org> [PG: use v5.4.53-stable version instead of mainline.] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 0ec4ea47f966..aef87ba68aec 100644
diff --git a/queue/net-sfp-add-some-quirks-for-GPON-modules.patch b/queue/net-sfp-add-some-quirks-for-GPON-modules.patch index 03492ef..18aa1e1 100644 --- a/queue/net-sfp-add-some-quirks-for-GPON-modules.patch +++ b/queue/net-sfp-add-some-quirks-for-GPON-modules.patch
@@ -1,4 +1,4 @@ -From b0eae33b2583dceb36224619f9fd85e6140ae594 Mon Sep 17 00:00:00 2001 +From c9aef228e43798fa42e446ffb90e80783812dd79 Mon Sep 17 00:00:00 2001 From: Russell King <rmk+kernel@armlinux.org.uk> Date: Wed, 20 Nov 2019 11:42:47 +0000 Subject: [PATCH] net: sfp: add some quirks for GPON modules @@ -16,9 +16,10 @@ Reviewed-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c -index 30529345581a..5a72093ab6e7 100644 +index 9d065372c709..f64e9fcd5c4b 100644 --- a/drivers/net/phy/sfp-bus.c +++ b/drivers/net/phy/sfp-bus.c @@ -38,7 +38,32 @@ struct sfp_bus {
diff --git a/queue/net-sfp-add-support-for-module-quirks.patch b/queue/net-sfp-add-support-for-module-quirks.patch index 10fb7a3..a6deceb 100644 --- a/queue/net-sfp-add-support-for-module-quirks.patch +++ b/queue/net-sfp-add-support-for-module-quirks.patch
@@ -1,4 +1,4 @@ -From b34bb2cb5b62c7397c28fcc335e8047a687eada4 Mon Sep 17 00:00:00 2001 +From 5a16df4df637870ae028d0b851f6deb41c1ebf4b Mon Sep 17 00:00:00 2001 From: Russell King <rmk+kernel@armlinux.org.uk> Date: Wed, 20 Nov 2019 11:42:42 +0000 Subject: [PATCH] net: sfp: add support for module quirks @@ -12,12 +12,13 @@ Reviewed-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c -index c5398a023440..30529345581a 100644 +index e9c187946cca..9d065372c709 100644 --- a/drivers/net/phy/sfp-bus.c +++ b/drivers/net/phy/sfp-bus.c -@@ -10,6 +10,12 @@ +@@ -9,6 +9,12 @@ #include "sfp.h" @@ -30,7 +31,7 @@ /** * struct sfp_bus - internal representation of a sfp bus */ -@@ -22,6 +28,7 @@ struct sfp_bus { +@@ -21,6 +27,7 @@ struct sfp_bus { const struct sfp_socket_ops *socket_ops; struct device *sfp_dev; struct sfp *sfp; @@ -95,7 +96,7 @@ bitmap_or(support, support, modes, __ETHTOOL_LINK_MODE_MASK_NBITS); phylink_set(support, Autoneg); -@@ -610,6 +660,8 @@ int sfp_module_insert(struct sfp_bus *bus, const struct sfp_eeprom_id *id) +@@ -557,6 +607,8 @@ int sfp_module_insert(struct sfp_bus *bus, const struct sfp_eeprom_id *id) const struct sfp_upstream_ops *ops = sfp_get_upstream_ops(bus); int ret = 0; @@ -104,7 +105,7 @@ if (ops && ops->module_insert) ret = ops->module_insert(bus->upstream, id); -@@ -623,6 +675,8 @@ void sfp_module_remove(struct sfp_bus *bus) +@@ -570,6 +622,8 @@ void sfp_module_remove(struct sfp_bus *bus) if (ops && ops->module_remove) ops->module_remove(bus->upstream);
diff --git a/queue/net-usb-qmi_wwan-add-support-for-Quectel-EG95-LTE-mo.patch b/queue/net-usb-qmi_wwan-add-support-for-Quectel-EG95-LTE-mo.patch index 0fed657..a9d0c92 100644 --- a/queue/net-usb-qmi_wwan-add-support-for-Quectel-EG95-LTE-mo.patch +++ b/queue/net-usb-qmi_wwan-add-support-for-Quectel-EG95-LTE-mo.patch
@@ -1,4 +1,4 @@ -From f815dd5cf48b905eeecf0a2b990e9b7ab048b4f1 Mon Sep 17 00:00:00 2001 +From 0b5f2e408e52e36fe81ca333b0d57d55975b809b Mon Sep 17 00:00:00 2001 From: AceLan Kao <acelan.kao@canonical.com> Date: Tue, 7 Jul 2020 16:14:45 +0800 Subject: [PATCH] net: usb: qmi_wwan: add support for Quectel EG95 LTE modem @@ -25,12 +25,13 @@ Signed-off-by: AceLan Kao <acelan.kao@canonical.com> Acked-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c -index 31b1d4b959f6..07c42c0719f5 100644 +index 7d2ca9174b8b..9348a2fa60e4 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c -@@ -1370,6 +1370,7 @@ static const struct usb_device_id products[] = { +@@ -1369,6 +1369,7 @@ static const struct usb_device_id products[] = { {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)}, /* Quectel EC21 Mini PCIe */ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0191, 4)}, /* Quectel EG91 */
diff --git a/queue/net_sched-fix-a-memory-leak-in-atm_tc_init.patch b/queue/net_sched-fix-a-memory-leak-in-atm_tc_init.patch index 62cdf88..63b3c4b 100644 --- a/queue/net_sched-fix-a-memory-leak-in-atm_tc_init.patch +++ b/queue/net_sched-fix-a-memory-leak-in-atm_tc_init.patch
@@ -1,4 +1,4 @@ -From 306381aec7c2b5a658eebca008c8a1b666536cba Mon Sep 17 00:00:00 2001 +From 14b821e95cff0373f51ca72287abbffc4e58b999 Mon Sep 17 00:00:00 2001 From: Cong Wang <xiyou.wangcong@gmail.com> Date: Wed, 8 Jul 2020 20:13:59 -0700 Subject: [PATCH] net_sched: fix a memory leak in atm_tc_init() @@ -19,9 +19,10 @@ Cc: Jiri Pirko <jiri@resnulli.us> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c -index ee12ca9f55b4..1c281cc81f57 100644 +index f4f9b8cdbffb..6385995dc700 100644 --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c @@ -553,16 +553,16 @@ static int atm_tc_init(struct Qdisc *sch, struct nlattr *opt,
diff --git a/queue/nvme-rdma-fix-controller-reset-hang-during-traffic.patch b/queue/nvme-rdma-fix-controller-reset-hang-during-traffic.patch index 2a007e3..7ebaf1b 100644 --- a/queue/nvme-rdma-fix-controller-reset-hang-during-traffic.patch +++ b/queue/nvme-rdma-fix-controller-reset-hang-during-traffic.patch
@@ -1,4 +1,4 @@ -From c5431a8b7bd020d156aacfd52fdb882646cca2a9 Mon Sep 17 00:00:00 2001 +From 3eeb100dd1cd3e617e579acb9baf160d1fe36c5d Mon Sep 17 00:00:00 2001 From: Sagi Grimberg <sagi@grimberg.me> Date: Mon, 27 Jul 2020 17:32:09 -0700 Subject: [PATCH] nvme-rdma: fix controller reset hang during traffic @@ -23,6 +23,7 @@ Fixes: fe35ec58f0d3 ("block: update hctx map when use multiple maps") Signed-off-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/rdma.c b/drivers/nvme/host/rdma.c index fe86b2623e51..ad17c79fd1e2 100644
diff --git a/queue/nvme-tcp-fix-controller-reset-hang-during-traffic.patch b/queue/nvme-tcp-fix-controller-reset-hang-during-traffic.patch index 1aff14d..6301214 100644 --- a/queue/nvme-tcp-fix-controller-reset-hang-during-traffic.patch +++ b/queue/nvme-tcp-fix-controller-reset-hang-during-traffic.patch
@@ -1,4 +1,4 @@ -From 40738a9f3a7cb78118d04ec24c4c71e5973b50b2 Mon Sep 17 00:00:00 2001 +From 0a53759727f59e1b137aef1790cdecd76a1d121c Mon Sep 17 00:00:00 2001 From: Sagi Grimberg <sagi@grimberg.me> Date: Fri, 24 Jul 2020 15:10:12 -0700 Subject: [PATCH] nvme-tcp: fix controller reset hang during traffic @@ -23,6 +23,7 @@ Fixes: fe35ec58f0d3 ("block: update hctx map when use multiple maps") Signed-off-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/tcp.c b/drivers/nvme/host/tcp.c index 4bf01f2cd3f3..a4245e2a1167 100644
diff --git a/queue/ocfs2-change-slot-number-type-s16-to-u16.patch b/queue/ocfs2-change-slot-number-type-s16-to-u16.patch index 9cf7623..19b40e3 100644 --- a/queue/ocfs2-change-slot-number-type-s16-to-u16.patch +++ b/queue/ocfs2-change-slot-number-type-s16-to-u16.patch
@@ -1,4 +1,4 @@ -From 38d51b2dd171ad973afc1f5faab825ed05a2d5e9 Mon Sep 17 00:00:00 2001 +From 6f661b8f98b098d316adb336c4e882dd7ae1545d Mon Sep 17 00:00:00 2001 From: Junxiao Bi <junxiao.bi@oracle.com> Date: Thu, 6 Aug 2020 23:18:02 -0700 Subject: [PATCH] ocfs2: change slot number type s16 to u16 @@ -28,12 +28,13 @@ Cc: <stable@vger.kernel.org> Link: http://lkml.kernel.org/r/20200627001259.19757-1-junxiao.bi@oracle.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h -index 2dd71d626196..7993d527edae 100644 +index 6133d4889694..b07eb2a30be5 100644 --- a/fs/ocfs2/ocfs2.h +++ b/fs/ocfs2/ocfs2.h -@@ -327,8 +327,8 @@ struct ocfs2_super +@@ -324,8 +324,8 @@ struct ocfs2_super spinlock_t osb_lock; u32 s_next_generation; unsigned long osb_flags; @@ -45,7 +46,7 @@ atomic_t s_num_meta_stolen; diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c -index 45745cc3408a..8c8cf7f4eb34 100644 +index 503e724d39f5..5e0eaea47405 100644 --- a/fs/ocfs2/suballoc.c +++ b/fs/ocfs2/suballoc.c @@ -879,9 +879,9 @@ static void __ocfs2_set_steal_slot(struct ocfs2_super *osb, int slot, int type) @@ -61,7 +62,7 @@ } diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c -index 71ea9ce71a6b..1d91dd1e8711 100644 +index a201f9780b35..e9cb264c5aae 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -78,7 +78,7 @@ struct mount_options @@ -73,7 +74,7 @@ int localalloc_opt; unsigned int resv_level; int dir_resv_level; -@@ -1349,7 +1349,7 @@ static int ocfs2_parse_options(struct super_block *sb, +@@ -1354,7 +1354,7 @@ static int ocfs2_parse_options(struct super_block *sb, goto bail; } if (option)
diff --git a/queue/ocfs2-fix-unbalanced-locking.patch b/queue/ocfs2-fix-unbalanced-locking.patch index d680733..55940c2 100644 --- a/queue/ocfs2-fix-unbalanced-locking.patch +++ b/queue/ocfs2-fix-unbalanced-locking.patch
@@ -1,4 +1,4 @@ -From 57c720d4144a9c2b88105c3e8f7b0e97e4b5cc93 Mon Sep 17 00:00:00 2001 +From 0a3b9012501cfc857df1486895aaef462c03176f Mon Sep 17 00:00:00 2001 From: Pavel Machek <pavel@ucw.cz> Date: Thu, 6 Aug 2020 23:18:09 -0700 Subject: [PATCH] ocfs2: fix unbalanced locking @@ -23,12 +23,13 @@ Cc: Jun Piao <piaojun@huawei.com> Link: http://lkml.kernel.org/r/20200724124443.GA28164@duo.ucw.cz Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c -index 751bc4dc7466..8e3a369086db 100644 +index f75b1735e8ec..b5934e995a69 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c -@@ -2871,9 +2871,15 @@ int ocfs2_nfs_sync_lock(struct ocfs2_super *osb, int ex) +@@ -2850,9 +2850,15 @@ int ocfs2_nfs_sync_lock(struct ocfs2_super *osb, int ex) status = ocfs2_cluster_lock(osb, lockres, ex ? LKM_EXMODE : LKM_PRMODE, 0, 0);
diff --git a/queue/ovl-fix-regression-with-re-formatted-lower-squashfs.patch b/queue/ovl-fix-regression-with-re-formatted-lower-squashfs.patch index e88225e..05bd486 100644 --- a/queue/ovl-fix-regression-with-re-formatted-lower-squashfs.patch +++ b/queue/ovl-fix-regression-with-re-formatted-lower-squashfs.patch
@@ -1,4 +1,4 @@ -From 7a4634ca7f464034bced45daaa257ff4859e89fd Mon Sep 17 00:00:00 2001 +From 72572ff15bc11238387c40f1b324ee8ec5432ea2 Mon Sep 17 00:00:00 2001 From: Amir Goldstein <amir73il@gmail.com> Date: Wed, 8 Jul 2020 16:16:13 +0300 Subject: [PATCH] ovl: fix regression with re-formatted lower squashfs @@ -26,6 +26,7 @@ Cc: stable@vger.kernel.org # v4.20+ Signed-off-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index 1e4cb019defd..d6b724beb304 100644
diff --git a/queue/ovl-fix-unneeded-call-to-ovl_change_flags.patch b/queue/ovl-fix-unneeded-call-to-ovl_change_flags.patch index 48bdc02..800157e 100644 --- a/queue/ovl-fix-unneeded-call-to-ovl_change_flags.patch +++ b/queue/ovl-fix-unneeded-call-to-ovl_change_flags.patch
@@ -1,4 +1,4 @@ -From 2c09decdd51c9c415e107538bf9e66359ddce229 Mon Sep 17 00:00:00 2001 +From 1a2cbd966a1f48a20e43cf54195aabaa9375732c Mon Sep 17 00:00:00 2001 From: Amir Goldstein <amir73il@gmail.com> Date: Thu, 18 Jun 2020 18:43:53 +0300 Subject: [PATCH] ovl: fix unneeded call to ovl_change_flags() @@ -12,6 +12,7 @@ Cc: <stable@vger.kernel.org> # v4.19+ Signed-off-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c index 15e4fa288475..7a08a576f7b2 100644
diff --git a/queue/ovl-relax-WARN_ON-when-decoding-lower-directory-file.patch b/queue/ovl-relax-WARN_ON-when-decoding-lower-directory-file.patch index 8876dba..c979d26 100644 --- a/queue/ovl-relax-WARN_ON-when-decoding-lower-directory-file.patch +++ b/queue/ovl-relax-WARN_ON-when-decoding-lower-directory-file.patch
@@ -1,4 +1,4 @@ -From 124c2de2c0aee96271e4ddab190083d8aa7aa71a Mon Sep 17 00:00:00 2001 +From 9ea7464aa0966a0eee436e7ab40ae926d94fe468 Mon Sep 17 00:00:00 2001 From: Amir Goldstein <amir73il@gmail.com> Date: Wed, 17 Jun 2020 09:57:11 +0300 Subject: [PATCH] ovl: relax WARN_ON() when decoding lower directory file @@ -45,12 +45,13 @@ Cc: <stable@vger.kernel.org> # v4.16+ Signed-off-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/overlayfs/export.c b/fs/overlayfs/export.c -index 8f4286450f92..0e696f72cf65 100644 +index 73c9775215b3..11dd8177770d 100644 --- a/fs/overlayfs/export.c +++ b/fs/overlayfs/export.c -@@ -476,7 +476,7 @@ static struct dentry *ovl_lookup_real_inode(struct super_block *sb, +@@ -482,7 +482,7 @@ static struct dentry *ovl_lookup_real_inode(struct super_block *sb, if (IS_ERR_OR_NULL(this)) return this;
diff --git a/queue/perf-stat-Zero-all-the-ena-and-run-array-slot-stats-.patch b/queue/perf-stat-Zero-all-the-ena-and-run-array-slot-stats-.patch index 24733c8..856ac22 100644 --- a/queue/perf-stat-Zero-all-the-ena-and-run-array-slot-stats-.patch +++ b/queue/perf-stat-Zero-all-the-ena-and-run-array-slot-stats-.patch
@@ -1,4 +1,4 @@ -From 0e0bf1ea1147fcf74eab19c2d3c853cc3740a72f Mon Sep 17 00:00:00 2001 +From e9e98f480f862a37e08e2da8fa100b6b96924b0a Mon Sep 17 00:00:00 2001 From: Jin Yao <yao.jin@linux.intel.com> Date: Thu, 9 Apr 2020 15:07:55 +0800 Subject: [PATCH] perf stat: Zero all the 'ena' and 'run' array slot stats for @@ -25,12 +25,13 @@ Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lore.kernel.org/lkml/20200409070755.17261-1-yao.jin@linux.intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c -index 5f26137b8d60..242476eb808c 100644 +index e2ce6021e6c4..17cd7e4a645e 100644 --- a/tools/perf/util/stat.c +++ b/tools/perf/util/stat.c -@@ -368,8 +368,10 @@ int perf_stat_process_counter(struct perf_stat_config *config, +@@ -358,8 +358,10 @@ int perf_stat_process_counter(struct perf_stat_config *config, * interval mode, otherwise overall avg running * averages will be shown for each interval. */
diff --git a/queue/phy-sun4i-usb-fix-dereference-of-pointer-phy0-before.patch b/queue/phy-sun4i-usb-fix-dereference-of-pointer-phy0-before.patch index fad64c7..b3f860c 100644 --- a/queue/phy-sun4i-usb-fix-dereference-of-pointer-phy0-before.patch +++ b/queue/phy-sun4i-usb-fix-dereference-of-pointer-phy0-before.patch
@@ -1,4 +1,4 @@ -From 38b1927e5bf9bcad4a2e33189ef1c5569f9599ba Mon Sep 17 00:00:00 2001 +From fc3ab61d61ecdf81a4f5559f9620f582cea915ff Mon Sep 17 00:00:00 2001 From: Colin Ian King <colin.king@canonical.com> Date: Thu, 25 Jun 2020 13:44:28 +0100 Subject: [PATCH] phy: sun4i-usb: fix dereference of pointer phy0 before it is @@ -17,6 +17,7 @@ Signed-off-by: Colin Ian King <colin.king@canonical.com> Link: https://lore.kernel.org/r/20200625124428.83564-1-colin.king@canonical.com Signed-off-by: Vinod Koul <vkoul@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c index 856927382248..e5842e48a5e0 100644
diff --git a/queue/powerpc-Fix-circular-dependency-between-percpu.h-and.patch b/queue/powerpc-Fix-circular-dependency-between-percpu.h-and.patch index 5e837cf..6419fe9 100644 --- a/queue/powerpc-Fix-circular-dependency-between-percpu.h-and.patch +++ b/queue/powerpc-Fix-circular-dependency-between-percpu.h-and.patch
@@ -1,4 +1,4 @@ -From 0c83b277ada72b585e6a3e52b067669df15bcedb Mon Sep 17 00:00:00 2001 +From 0ff1262457c3f801594b02ef5e55a9f1b0319075 Mon Sep 17 00:00:00 2001 From: Michael Ellerman <mpe@ellerman.id.au> Date: Tue, 4 Aug 2020 22:44:06 +1000 Subject: [PATCH] powerpc: Fix circular dependency between percpu.h and mmu.h @@ -38,6 +38,7 @@ Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200804130558.292328-1-mpe@ellerman.id.au +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/include/asm/percpu.h b/arch/powerpc/include/asm/percpu.h index dce863a7635c..8e5b7d0b851c 100644
diff --git a/queue/powerpc-book3s64-pkeys-Fix-pkey_access_permitted-for.patch b/queue/powerpc-book3s64-pkeys-Fix-pkey_access_permitted-for.patch index d8cd125..cd8163a 100644 --- a/queue/powerpc-book3s64-pkeys-Fix-pkey_access_permitted-for.patch +++ b/queue/powerpc-book3s64-pkeys-Fix-pkey_access_permitted-for.patch
@@ -1,4 +1,4 @@ -From ec99cd9826aecaa476e2272745989f8f32ef3349 Mon Sep 17 00:00:00 2001 +From cebf29f1fc15d4e5e9ec16b02f355b4d4e8762b9 Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> Date: Sun, 12 Jul 2020 18:50:47 +0530 Subject: [PATCH] powerpc/book3s64/pkeys: Fix pkey_access_permitted() for @@ -124,6 +124,7 @@ [mpe: Add detail to change log, tweak wording & formatting] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200712132047.1038594-1-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 ae7fca40e5b3..66f307e873dc 100644
diff --git a/queue/random32-move-the-pseudo-random-32-bit-definitions-t.patch b/queue/random32-move-the-pseudo-random-32-bit-definitions-t.patch index 97ad817..f9c561b 100644 --- a/queue/random32-move-the-pseudo-random-32-bit-definitions-t.patch +++ b/queue/random32-move-the-pseudo-random-32-bit-definitions-t.patch
@@ -1,4 +1,4 @@ -From 92091c0d226b9c8cadf7628abb88bb1219b137d7 Mon Sep 17 00:00:00 2001 +From 7b3a0693d3b9437ba979dcd4cc0e044c576434bb Mon Sep 17 00:00:00 2001 From: Linus Torvalds <torvalds@linux-foundation.org> Date: Fri, 31 Jul 2020 07:51:14 +0200 Subject: [PATCH] random32: move the pseudo-random 32-bit definitions to @@ -33,6 +33,7 @@ Tested-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/prandom.h b/include/linux/prandom.h new file mode 100644
diff --git a/queue/random32-remove-net_rand_state-from-the-latent-entro.patch b/queue/random32-remove-net_rand_state-from-the-latent-entro.patch index c952a49..f2dfd9f 100644 --- a/queue/random32-remove-net_rand_state-from-the-latent-entro.patch +++ b/queue/random32-remove-net_rand_state-from-the-latent-entro.patch
@@ -1,4 +1,4 @@ -From 83bdc7275e6206f560d247be856bceba3e1ed8f2 Mon Sep 17 00:00:00 2001 +From 030648da3b1521aff570e1afb2afa100578c9931 Mon Sep 17 00:00:00 2001 From: Linus Torvalds <torvalds@linux-foundation.org> Date: Wed, 29 Jul 2020 19:11:00 -0700 Subject: [PATCH] random32: remove net_rand_state from the latent entropy gcc @@ -20,12 +20,13 @@ Cc: Kees Cook <keescook@chromium.org> Cc: Willy Tarreau <w@1wt.eu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/random.h b/include/linux/random.h -index 39aaa1f78f9d..f310897f051d 100644 +index 1033542ec67f..aca83973b023 100644 --- a/include/linux/random.h +++ b/include/linux/random.h -@@ -120,7 +120,7 @@ struct rnd_state { +@@ -117,7 +117,7 @@ struct rnd_state { __u32 s1, s2, s3, s4; };
diff --git a/queue/rcu-Upgrade-rcu_swap_protected-to-rcu_replace_pointe.patch b/queue/rcu-Upgrade-rcu_swap_protected-to-rcu_replace_pointe.patch index ea2ccb2..087a2f1 100644 --- a/queue/rcu-Upgrade-rcu_swap_protected-to-rcu_replace_pointe.patch +++ b/queue/rcu-Upgrade-rcu_swap_protected-to-rcu_replace_pointe.patch
@@ -1,4 +1,4 @@ -From 7d41604974d93de769f58a6b7c0b1a19ee0a1874 Mon Sep 17 00:00:00 2001 +From f3cd2ac527e420636758615f2c0f654d01b0b0d1 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" <paulmck@kernel.org> Date: Mon, 23 Sep 2019 15:05:11 -0700 Subject: [PATCH] rcu: Upgrade rcu_swap_protected() to rcu_replace_pointer() @@ -23,6 +23,7 @@ Cc: Johannes Thumshirn <jthumshirn@suse.de> Cc: Shane M Seymour <shane.seymour@hpe.com> Cc: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index a5359aee7e51..0ddf7543f45d 100644
diff --git a/queue/regmap-debugfs-Don-t-sleep-while-atomic-for-fast_io-.patch b/queue/regmap-debugfs-Don-t-sleep-while-atomic-for-fast_io-.patch index 8caf800..a6d0e7c 100644 --- a/queue/regmap-debugfs-Don-t-sleep-while-atomic-for-fast_io-.patch +++ b/queue/regmap-debugfs-Don-t-sleep-while-atomic-for-fast_io-.patch
@@ -1,4 +1,4 @@ -From 299632e54b2e692d2830af84be51172480dc1e26 Mon Sep 17 00:00:00 2001 +From 70daa8af963958eae8f627089480ef70097f989c Mon Sep 17 00:00:00 2001 From: Douglas Anderson <dianders@chromium.org> Date: Wed, 15 Jul 2020 16:46:15 -0700 Subject: [PATCH] regmap: debugfs: Don't sleep while atomic for fast_io regmaps @@ -25,9 +25,10 @@ Signed-off-by: Douglas Anderson <dianders@chromium.org> Link: https://lore.kernel.org/r/20200715164611.1.I35b3533e8a80efde0cec1cc70f71e1e74b2fa0da@changeid Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c -index e72843fe41df..e16afa27700d 100644 +index e5e1b3a01b1a..061c0d70f75b 100644 --- a/drivers/base/regmap/regmap-debugfs.c +++ b/drivers/base/regmap/regmap-debugfs.c @@ -457,29 +457,31 @@ static ssize_t regmap_cache_only_write_file(struct file *file,
diff --git a/queue/regulator-fix-memory-leak-on-error-path-of-regulator.patch b/queue/regulator-fix-memory-leak-on-error-path-of-regulator.patch index e028539..208ff4a 100644 --- a/queue/regulator-fix-memory-leak-on-error-path-of-regulator.patch +++ b/queue/regulator-fix-memory-leak-on-error-path-of-regulator.patch
@@ -1,4 +1,4 @@ -From 9177514ce34902b3adb2abd490b6ad05d1cfcb43 Mon Sep 17 00:00:00 2001 +From e9e3420b7f215e5bb5313f05a080ff1070aec383 Mon Sep 17 00:00:00 2001 From: Vladimir Zapolskiy <vz@mleia.com> Date: Fri, 24 Jul 2020 03:50:13 +0300 Subject: [PATCH] regulator: fix memory leak on error path of @@ -44,12 +44,13 @@ Cc: Wen Yang <wenyang@linux.alibaba.com> Link: https://lore.kernel.org/r/20200724005013.23278-1-vz@mleia.com Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c -index 196e344a84d3..75ff7c563c5d 100644 +index 25924af15449..997e25a315f7 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c -@@ -5092,7 +5092,6 @@ regulator_register(const struct regulator_desc *regulator_desc, +@@ -4926,7 +4926,6 @@ regulator_register(const struct regulator_desc *regulator_desc, struct regulator_dev *rdev; bool dangling_cfg_gpiod = false; bool dangling_of_gpiod = false; @@ -57,7 +58,7 @@ struct device *dev; int ret, i; -@@ -5221,10 +5220,12 @@ regulator_register(const struct regulator_desc *regulator_desc, +@@ -5042,10 +5041,12 @@ regulator_register(const struct regulator_desc *regulator_desc, } /* register with sysfs */ @@ -70,7 +71,7 @@ /* set regulator constraints */ if (init_data) -@@ -5275,12 +5276,9 @@ regulator_register(const struct regulator_desc *regulator_desc, +@@ -5096,12 +5097,9 @@ regulator_register(const struct regulator_desc *regulator_desc, !rdev->desc->fixed_uV) rdev->is_switch = true; @@ -85,7 +86,7 @@ rdev_init_debugfs(rdev); -@@ -5302,17 +5300,15 @@ regulator_register(const struct regulator_desc *regulator_desc, +@@ -5123,17 +5121,15 @@ regulator_register(const struct regulator_desc *regulator_desc, mutex_unlock(®ulator_list_mutex); wash: kfree(rdev->coupling_desc.coupled_rdevs);
diff --git a/queue/riscv-use-16KB-kernel-stack-on-64-bit.patch b/queue/riscv-use-16KB-kernel-stack-on-64-bit.patch index 4fa07c9..24fd366 100644 --- a/queue/riscv-use-16KB-kernel-stack-on-64-bit.patch +++ b/queue/riscv-use-16KB-kernel-stack-on-64-bit.patch
@@ -1,4 +1,4 @@ -From 0cac21b02ba5f3095fd2dcc77c26a25a0b2432ed Mon Sep 17 00:00:00 2001 +From 2254ad4fa0422f38ca1c066ce7cfaaac8cf0409a Mon Sep 17 00:00:00 2001 From: Andreas Schwab <schwab@suse.de> Date: Mon, 6 Jul 2020 14:32:26 +0200 Subject: [PATCH] riscv: use 16KB kernel stack on 64-bit @@ -15,9 +15,10 @@ Fixes: 7db91e57a0ac ("RISC-V: Task implementation") Cc: stable@vger.kernel.org Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/riscv/include/asm/thread_info.h b/arch/riscv/include/asm/thread_info.h -index 1dd12a0cbb2b..464a2bbc97ea 100644 +index 905372d7eeb8..3df9a82bdbfd 100644 --- a/arch/riscv/include/asm/thread_info.h +++ b/arch/riscv/include/asm/thread_info.h @@ -12,7 +12,11 @@
diff --git a/queue/rxrpc-Fix-trace-string.patch b/queue/rxrpc-Fix-trace-string.patch index cc58b77..52659b4 100644 --- a/queue/rxrpc-Fix-trace-string.patch +++ b/queue/rxrpc-Fix-trace-string.patch
@@ -1,4 +1,4 @@ -From aadf9dcef9d4cd68c73a4ab934f93319c4becc47 Mon Sep 17 00:00:00 2001 +From 72fdfb2196a7cd6748bc1bb1a3b32b72432ad506 Mon Sep 17 00:00:00 2001 From: David Howells <dhowells@redhat.com> Date: Wed, 17 Jun 2020 22:50:33 +0100 Subject: [PATCH] rxrpc: Fix trace string @@ -13,12 +13,13 @@ Fixes: b54a134a7de4 ("rxrpc: Fix handling of enums-to-string translation in tracing") Signed-off-by: David Howells <dhowells@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h -index ba9efdc848f9..059b6e45a028 100644 +index d62ae02900aa..007be31cab31 100644 --- a/include/trace/events/rxrpc.h +++ b/include/trace/events/rxrpc.h -@@ -400,7 +400,7 @@ enum rxrpc_tx_point { +@@ -406,7 +406,7 @@ enum rxrpc_tx_point { EM(rxrpc_cong_begin_retransmission, " Retrans") \ EM(rxrpc_cong_cleared_nacks, " Cleared") \ EM(rxrpc_cong_new_low_nack, " NewLowN") \
diff --git a/queue/sched-Fix-unreliable-rseq-cpu_id-for-new-tasks.patch b/queue/sched-Fix-unreliable-rseq-cpu_id-for-new-tasks.patch index 57c2a9b..cf1056d 100644 --- a/queue/sched-Fix-unreliable-rseq-cpu_id-for-new-tasks.patch +++ b/queue/sched-Fix-unreliable-rseq-cpu_id-for-new-tasks.patch
@@ -1,4 +1,4 @@ -From ce3614daabea8a2d01c1dd17ae41d1ec5e5ae7db Mon Sep 17 00:00:00 2001 +From 4b825de6ec221810548d6423cc75c6cbc83009d4 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Date: Mon, 6 Jul 2020 16:49:10 -0400 Subject: [PATCH] sched: Fix unreliable rseq cpu_id for new tasks @@ -53,12 +53,13 @@ Tested-By: Florian Weimer <fweimer@redhat.com> Cc: stable@vger.kernel.org # v4.18+ Link: https://lkml.kernel.org/r/20200707201505.2632-1-mathieu.desnoyers@efficios.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 950ac45d5480..e15543cb8481 100644 +index 4d2297106c92..dcc54d44fcde 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -2965,6 +2965,7 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p) +@@ -2338,6 +2338,7 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p) * Silence PROVE_RCU. */ raw_spin_lock_irqsave(&p->pi_lock, flags); @@ -66,7 +67,7 @@ /* * We're setting the CPU for the first time, we don't migrate, * so use __set_task_cpu(). -@@ -3029,6 +3030,7 @@ void wake_up_new_task(struct task_struct *p) +@@ -2402,6 +2403,7 @@ void wake_up_new_task(struct task_struct *p) * as we're not fully set-up yet. */ p->recent_used_cpu = task_cpu(p);
diff --git a/queue/sched-consistently-handle-layer3-header-accesses-in-.patch b/queue/sched-consistently-handle-layer3-header-accesses-in-.patch index 6c5e5d0..01f4c20 100644 --- a/queue/sched-consistently-handle-layer3-header-accesses-in-.patch +++ b/queue/sched-consistently-handle-layer3-header-accesses-in-.patch
@@ -1,4 +1,4 @@ -From 0d2ea7b05f80d1b35c164b0c2ec1d98febf9ff92 Mon Sep 17 00:00:00 2001 +From e93221c82dd5f7b043d42202d61aa577d748fa9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com> Date: Fri, 3 Jul 2020 22:26:43 +0200 Subject: [PATCH] sched: consistently handle layer3 header accesses in the @@ -46,6 +46,7 @@ Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> [PG: start with 4.19.134-stable version - we don't have v5.3-rc1~140^2~15^2~3] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 244278d5c222..00fa5d0b5e99 100644
diff --git a/queue/sched-fair-handle-case-of-task_h_load-returning-0.patch b/queue/sched-fair-handle-case-of-task_h_load-returning-0.patch index b4fd9a1..746be0f 100644 --- a/queue/sched-fair-handle-case-of-task_h_load-returning-0.patch +++ b/queue/sched-fair-handle-case-of-task_h_load-returning-0.patch
@@ -1,4 +1,4 @@ -From 95cac26b0841139ba8837b8b8bab5f5dd8172ad2 Mon Sep 17 00:00:00 2001 +From 57469b0ce296217f87497eaa6d66ede1196d078b Mon Sep 17 00:00:00 2001 From: Vincent Guittot <vincent.guittot@linaro.org> Date: Fri, 10 Jul 2020 17:24:26 +0200 Subject: [PATCH] sched/fair: handle case of task_h_load() returning 0 @@ -29,6 +29,7 @@ Link: https://lkml.kernel.org/r/20200710152426.16981-1-vincent.guittot@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [PG: use v5.4.x-stable version instead of mainline.] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 4702f3afa5ac..57e56c8980eb 100644
diff --git a/queue/scsi-treewide-Consolidate-get-put-_unaligned_-bl-e24.patch b/queue/scsi-treewide-Consolidate-get-put-_unaligned_-bl-e24.patch index bf127fc..71ca97a 100644 --- a/queue/scsi-treewide-Consolidate-get-put-_unaligned_-bl-e24.patch +++ b/queue/scsi-treewide-Consolidate-get-put-_unaligned_-bl-e24.patch
@@ -1,4 +1,4 @@ -From a7afff31d56db22647251d76d6af030cd47bd97e Mon Sep 17 00:00:00 2001 +From 45bcc06eaf8545b9c72e75a0e773732ec1f3ca54 Mon Sep 17 00:00:00 2001 From: Bart Van Assche <bvanassche@acm.org> Date: Fri, 13 Mar 2020 13:31:00 -0700 Subject: [PATCH] scsi: treewide: Consolidate {get,put}_unaligned_[bl]e24() @@ -27,9 +27,10 @@ Reviewed-by: Felipe Balbi <balbi@kernel.org> # For drivers/usb/gadget Signed-off-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c -index 2a47c6c5007e..85e9bcbd44b4 100644 +index bf29524cf347..fe86b2623e51 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -142,14 +142,6 @@ static void nvme_rdma_recv_done(struct ib_cq *cq, struct ib_wc *wc); @@ -48,7 +49,7 @@ { return queue - queue->ctrl->queues; diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c -index 37d262a65877..8fcede75e02a 100644 +index 36d906a7f70d..dc193526d4da 100644 --- a/drivers/nvme/target/rdma.c +++ b/drivers/nvme/target/rdma.c @@ -143,12 +143,6 @@ static int num_pages(int len) @@ -65,7 +66,7 @@ { return nvme_is_write(rsp->req.cmd) && diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c -index 7c96c4665178..950d2a85f098 100644 +index f2bc8d037067..492f0d70510f 100644 --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c @@ -216,6 +216,7 @@
diff --git a/queue/serial-mxs-auart-add-missed-iounmap-in-probe-failure.patch b/queue/serial-mxs-auart-add-missed-iounmap-in-probe-failure.patch index e607ec2..11515ee 100644 --- a/queue/serial-mxs-auart-add-missed-iounmap-in-probe-failure.patch +++ b/queue/serial-mxs-auart-add-missed-iounmap-in-probe-failure.patch
@@ -1,4 +1,4 @@ -From d8edf8eb5f6e921fe6389f96d2cd05862730a6ff Mon Sep 17 00:00:00 2001 +From f65bee04e14c79d3adb0bb7d91b1e3bfcb935d68 Mon Sep 17 00:00:00 2001 From: Chuhong Yuan <hslester96@gmail.com> Date: Thu, 9 Jul 2020 21:56:08 +0800 Subject: [PATCH] serial: mxs-auart: add missed iounmap() in probe failure and @@ -15,12 +15,13 @@ Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200709135608.68290-1-hslester96@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c -index b4f835e7de23..b784323a6a7b 100644 +index 4c188f4079b3..63810eefa44b 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c -@@ -1698,21 +1698,21 @@ static int mxs_auart_probe(struct platform_device *pdev) +@@ -1703,21 +1703,21 @@ static int mxs_auart_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq < 0) { ret = irq; @@ -45,7 +46,7 @@ } /* -@@ -1720,7 +1720,7 @@ static int mxs_auart_probe(struct platform_device *pdev) +@@ -1725,7 +1725,7 @@ static int mxs_auart_probe(struct platform_device *pdev) */ ret = mxs_auart_request_gpio_irq(s); if (ret) @@ -54,7 +55,7 @@ auart_port[s->port.line] = s; -@@ -1746,6 +1746,9 @@ static int mxs_auart_probe(struct platform_device *pdev) +@@ -1751,6 +1751,9 @@ static int mxs_auart_probe(struct platform_device *pdev) mxs_auart_free_gpio_irq(s); auart_port[pdev->id] = NULL; @@ -64,7 +65,7 @@ out_disable_clks: if (is_asm9260_auart(s)) { clk_disable_unprepare(s->clk); -@@ -1761,6 +1764,7 @@ static int mxs_auart_remove(struct platform_device *pdev) +@@ -1766,6 +1769,7 @@ static int mxs_auart_remove(struct platform_device *pdev) uart_remove_one_port(&auart_driver, &s->port); auart_port[pdev->id] = NULL; mxs_auart_free_gpio_irq(s);
diff --git a/queue/slimbus-core-Fix-mismatch-in-of_node_get-put.patch b/queue/slimbus-core-Fix-mismatch-in-of_node_get-put.patch index 438bf7a..bb53053 100644 --- a/queue/slimbus-core-Fix-mismatch-in-of_node_get-put.patch +++ b/queue/slimbus-core-Fix-mismatch-in-of_node_get-put.patch
@@ -1,4 +1,4 @@ -From 01360857486c0e4435dea3aa2f78b47213b7cf6a Mon Sep 17 00:00:00 2001 +From 3816b3ffc9dda6cba52f0903f786957bf764a784 Mon Sep 17 00:00:00 2001 From: Saravana Kannan <saravanak@google.com> Date: Mon, 11 May 2020 16:13:34 +0100 Subject: [PATCH] slimbus: core: Fix mismatch in of_node_get/put @@ -13,12 +13,13 @@ Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Link: https://lore.kernel.org/r/20200511151334.362-3-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/slimbus/core.c b/drivers/slimbus/core.c -index 1f3beee74fdf..ae1e248a8fb8 100644 +index b2f07d2043eb..bdfbe64b4641 100644 --- a/drivers/slimbus/core.c +++ b/drivers/slimbus/core.c -@@ -282,6 +282,7 @@ EXPORT_SYMBOL_GPL(slim_register_controller); +@@ -288,6 +288,7 @@ EXPORT_SYMBOL_GPL(slim_register_controller); /* slim_remove_device: Remove the effect of slim_add_device() */ static void slim_remove_device(struct slim_device *sbdev) {
diff --git a/queue/soc-qcom-rpmh-Dirt-can-only-make-you-dirtier-not-cle.patch b/queue/soc-qcom-rpmh-Dirt-can-only-make-you-dirtier-not-cle.patch index c238350..f8347ac 100644 --- a/queue/soc-qcom-rpmh-Dirt-can-only-make-you-dirtier-not-cle.patch +++ b/queue/soc-qcom-rpmh-Dirt-can-only-make-you-dirtier-not-cle.patch
@@ -1,4 +1,4 @@ -From 35bb4b22f606c0cc8eedf567313adc18161b1af4 Mon Sep 17 00:00:00 2001 +From 73ddebb4a747871772678d801da9bfabfeaa54de Mon Sep 17 00:00:00 2001 From: Douglas Anderson <dianders@chromium.org> Date: Fri, 17 Apr 2020 14:15:47 -0700 Subject: [PATCH] soc: qcom: rpmh: Dirt can only make you dirtier, not cleaner @@ -16,12 +16,13 @@ Signed-off-by: Douglas Anderson <dianders@chromium.org> Link: https://lore.kernel.org/r/20200417141531.1.Ia4b74158497213eabad7c3d474c50bfccb3f342e@changeid 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.c b/drivers/soc/qcom/rpmh.c -index 3abbb08cd6e1..d1626a1328d7 100644 +index ae2d1590a611..13e1b450f296 100644 --- a/drivers/soc/qcom/rpmh.c +++ b/drivers/soc/qcom/rpmh.c -@@ -151,10 +151,10 @@ static struct cache_req *cache_rpm_request(struct rpmh_ctrlr *ctrlr, +@@ -150,10 +150,10 @@ static struct cache_req *cache_rpm_request(struct rpmh_ctrlr *ctrlr, break; }
diff --git a/queue/soc-qcom-rpmh-Invalidate-SLEEP-and-WAKE-TCSes-before.patch b/queue/soc-qcom-rpmh-Invalidate-SLEEP-and-WAKE-TCSes-before.patch index 20fbdda..59b07dd 100644 --- a/queue/soc-qcom-rpmh-Invalidate-SLEEP-and-WAKE-TCSes-before.patch +++ b/queue/soc-qcom-rpmh-Invalidate-SLEEP-and-WAKE-TCSes-before.patch
@@ -1,4 +1,4 @@ -From 813ed6ed6759b35d3997017b3e9ef22f52439779 Mon Sep 17 00:00:00 2001 +From a1c5d51021adeda2dce9b483f5d1d352da5d7caa Mon Sep 17 00:00:00 2001 From: Maulik Shah <mkshah@codeaurora.org> Date: Sun, 12 Apr 2020 20:20:01 +0530 Subject: [PATCH] soc: qcom: rpmh: Invalidate SLEEP and WAKE TCSes before @@ -22,6 +22,7 @@ Reviewed-by: Stephen Boyd <swboyd@chromium.org> Link: https://lore.kernel.org/r/1586703004-13674-4-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.c b/drivers/soc/qcom/rpmh.c index 4bf26a296523..ae2d1590a611 100644
diff --git a/queue/soc-qcom-rpmh-Update-dirty-flag-only-when-data-chang.patch b/queue/soc-qcom-rpmh-Update-dirty-flag-only-when-data-chang.patch index 15deb8c..63a32e6 100644 --- a/queue/soc-qcom-rpmh-Update-dirty-flag-only-when-data-chang.patch +++ b/queue/soc-qcom-rpmh-Update-dirty-flag-only-when-data-chang.patch
@@ -1,4 +1,4 @@ -From bb7000677a1b287206c8d4327c62442fa3050a8f Mon Sep 17 00:00:00 2001 +From c6b98ea9a893355b936c6bea959508f1153ef9f3 Mon Sep 17 00:00:00 2001 From: Maulik Shah <mkshah@codeaurora.org> Date: Sun, 12 Apr 2020 20:20:00 +0530 Subject: [PATCH] soc: qcom: rpmh: Update dirty flag only when data changes @@ -22,9 +22,10 @@ Reviewed-by: Stephen Boyd <swboyd@chromium.org> Link: https://lore.kernel.org/r/1586703004-13674-3-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.c b/drivers/soc/qcom/rpmh.c -index eb0ded059d2e..03630aeb4fef 100644 +index 035091fd44b8..4bf26a296523 100644 --- a/drivers/soc/qcom/rpmh.c +++ b/drivers/soc/qcom/rpmh.c @@ -119,6 +119,7 @@ static struct cache_req *cache_rpm_request(struct rpmh_ctrlr *ctrlr, @@ -86,7 +87,7 @@ spin_unlock_irqrestore(&ctrlr->cache_lock, flags); } -@@ -507,7 +511,6 @@ int rpmh_invalidate(const struct device *dev) +@@ -509,7 +513,6 @@ int rpmh_invalidate(const struct device *dev) int ret; invalidate_batch(ctrlr);
diff --git a/queue/soc-qcom-rpmh-rsc-Allow-using-free-WAKE-TCS-for-acti.patch b/queue/soc-qcom-rpmh-rsc-Allow-using-free-WAKE-TCS-for-acti.patch index 5fa2721..8049cdb 100644 --- a/queue/soc-qcom-rpmh-rsc-Allow-using-free-WAKE-TCS-for-acti.patch +++ b/queue/soc-qcom-rpmh-rsc-Allow-using-free-WAKE-TCS-for-acti.patch
@@ -1,4 +1,4 @@ -From 38427e5a47bf83299da930bd474c6cb2632ad810 Mon Sep 17 00:00:00 2001 +From b0c7d93959e0bf11dac7b3e72e0c3cfa11862c39 Mon Sep 17 00:00:00 2001 From: Maulik Shah <mkshah@codeaurora.org> Date: Sun, 12 Apr 2020 20:20:04 +0530 Subject: [PATCH] soc: qcom: rpmh-rsc: Allow using free WAKE TCS for active @@ -21,12 +21,13 @@ Reviewed-by: Stephen Boyd <swboyd@chromium.org> Link: https://lore.kernel.org/r/1586703004-13674-7-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 80e8a9485b6b..cc1293cb15a5 100644 +index c941eddc2769..0ba1f465db12 100644 --- a/drivers/soc/qcom/rpmh-rsc.c +++ b/drivers/soc/qcom/rpmh-rsc.c -@@ -154,7 +154,7 @@ int rpmh_rsc_invalidate(struct rsc_drv *drv) +@@ -148,7 +148,7 @@ int rpmh_rsc_invalidate(struct rsc_drv *drv) static struct tcs_group *get_tcs_for_msg(struct rsc_drv *drv, const struct tcs_request *msg) { @@ -35,7 +36,7 @@ struct tcs_group *tcs; switch (msg->state) { -@@ -175,19 +175,10 @@ static struct tcs_group *get_tcs_for_msg(struct rsc_drv *drv, +@@ -169,19 +169,10 @@ static struct tcs_group *get_tcs_for_msg(struct rsc_drv *drv, * If we are making an active request on a RSC that does not have a * dedicated TCS for active state use, then re-purpose a wake TCS to * send active votes. @@ -56,7 +57,7 @@ return tcs; } -@@ -412,8 +403,16 @@ static int tcs_write(struct rsc_drv *drv, const struct tcs_request *msg) +@@ -406,8 +397,16 @@ static int tcs_write(struct rsc_drv *drv, const struct tcs_request *msg) tcs->req[tcs_id - tcs->offset] = msg; set_bit(tcs_id, drv->tcs_in_use);
diff --git a/queue/soc-qcom-rpmh-rsc-Clear-active-mode-configuration-fo.patch b/queue/soc-qcom-rpmh-rsc-Clear-active-mode-configuration-fo.patch index db9fc4b..454e3dc 100644 --- a/queue/soc-qcom-rpmh-rsc-Clear-active-mode-configuration-fo.patch +++ b/queue/soc-qcom-rpmh-rsc-Clear-active-mode-configuration-fo.patch
@@ -1,4 +1,4 @@ -From 15b3bf61b8d48f8e0ccd9d7f1bcb468b543da396 Mon Sep 17 00:00:00 2001 +From a5bca7a463b47c5edcf02e8976fba87d242e15d1 Mon Sep 17 00:00:00 2001 From: "Raju P.L.S.S.S.N" <rplsssn@codeaurora.org> Date: Sun, 12 Apr 2020 20:20:03 +0530 Subject: [PATCH] soc: qcom: rpmh-rsc: Clear active mode configuration for wake @@ -22,12 +22,13 @@ Reviewed-by: Stephen Boyd <swboyd@chromium.org> Link: https://lore.kernel.org/r/1586703004-13674-6-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 892c82b7e3fb..80e8a9485b6b 100644 +index e278fc11fe5c..c941eddc2769 100644 --- a/drivers/soc/qcom/rpmh-rsc.c +++ b/drivers/soc/qcom/rpmh-rsc.c -@@ -207,6 +207,42 @@ static const struct tcs_request *get_req_from_tcs(struct rsc_drv *drv, +@@ -201,6 +201,42 @@ static const struct tcs_request *get_req_from_tcs(struct rsc_drv *drv, return NULL; } @@ -70,7 +71,7 @@ /** * tcs_tx_done: TX Done interrupt handler */ -@@ -243,6 +279,14 @@ static irqreturn_t tcs_tx_done(int irq, void *p) +@@ -237,6 +273,14 @@ static irqreturn_t tcs_tx_done(int irq, void *p) } trace_rpmh_tx_done(drv, i, req, err); @@ -85,7 +86,7 @@ skip: /* Reclaim the TCS */ write_tcs_reg(drv, RSC_DRV_CMD_ENABLE, i, 0); -@@ -250,6 +294,13 @@ static irqreturn_t tcs_tx_done(int irq, void *p) +@@ -244,6 +288,13 @@ static irqreturn_t tcs_tx_done(int irq, void *p) write_tcs_reg(drv, RSC_DRV_IRQ_CLEAR, 0, BIT(i)); spin_lock(&drv->lock); clear_bit(i, drv->tcs_in_use); @@ -99,7 +100,7 @@ spin_unlock(&drv->lock); if (req) rpmh_tx_done(req, err); -@@ -291,28 +342,6 @@ static void __tcs_buffer_write(struct rsc_drv *drv, int tcs_id, int cmd_id, +@@ -285,28 +336,6 @@ static void __tcs_buffer_write(struct rsc_drv *drv, int tcs_id, int cmd_id, write_tcs_reg(drv, RSC_DRV_CMD_ENABLE, tcs_id, cmd_enable); } @@ -128,7 +129,7 @@ static int check_for_req_inflight(struct rsc_drv *drv, struct tcs_group *tcs, const struct tcs_request *msg) { -@@ -383,10 +412,12 @@ static int tcs_write(struct rsc_drv *drv, const struct tcs_request *msg) +@@ -377,10 +406,12 @@ static int tcs_write(struct rsc_drv *drv, const struct tcs_request *msg) tcs->req[tcs_id - tcs->offset] = msg; set_bit(tcs_id, drv->tcs_in_use);
diff --git a/queue/soundwire-intel-fix-memory-leak-with-devm_kasprintf.patch b/queue/soundwire-intel-fix-memory-leak-with-devm_kasprintf.patch index dcac9ae..4dc76fe 100644 --- a/queue/soundwire-intel-fix-memory-leak-with-devm_kasprintf.patch +++ b/queue/soundwire-intel-fix-memory-leak-with-devm_kasprintf.patch
@@ -1,4 +1,4 @@ -From bf6d6e68d2028a2d82f4c106f50ec75cc1e6ef89 Mon Sep 17 00:00:00 2001 +From 7692295e274ffa67e88c508eb501a916ef802180 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Date: Wed, 17 Jun 2020 11:35:36 -0500 Subject: [PATCH] soundwire: intel: fix memory leak with devm_kasprintf @@ -18,12 +18,13 @@ Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://lore.kernel.org/r/20200617163536.17401-1-pierre-louis.bossart@linux.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c -index 4cfdd074e310..c7422740edd4 100644 +index f83f3b4ed6b1..412a64b29b09 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c -@@ -930,8 +930,9 @@ static int intel_create_dai(struct sdw_cdns *cdns, +@@ -701,8 +701,9 @@ static int intel_create_dai(struct sdw_cdns *cdns, /* TODO: Read supported rates/formats from hardware */ for (i = off; i < (off + num); i++) {
diff --git a/queue/spi-spi-sun6i-sun6i_spi_transfer_one-fix-setting-of-.patch b/queue/spi-spi-sun6i-sun6i_spi_transfer_one-fix-setting-of-.patch index 865bf5a..7284ea1 100644 --- a/queue/spi-spi-sun6i-sun6i_spi_transfer_one-fix-setting-of-.patch +++ b/queue/spi-spi-sun6i-sun6i_spi_transfer_one-fix-setting-of-.patch
@@ -1,4 +1,4 @@ -From ed7815db70d17b1741883f2da8e1d80bc2efe517 Mon Sep 17 00:00:00 2001 +From 87dc96135d0e98ebece7f3f0bd03de8759ead441 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde <mkl@pengutronix.de> Date: Mon, 6 Jul 2020 16:34:34 +0200 Subject: [PATCH] spi: spi-sun6i: sun6i_spi_transfer_one(): fix setting of @@ -26,9 +26,10 @@ Acked-by: Maxime Ripard <mripard@kernel.org> Link: https://lore.kernel.org/r/20200706143443.9855-2-mkl@pengutronix.de Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c -index ecea15534c42..fa11cc0e809b 100644 +index ee2bdaf5b856..2d361af9140e 100644 --- a/drivers/spi/spi-sun6i.c +++ b/drivers/spi/spi-sun6i.c @@ -198,7 +198,7 @@ static int sun6i_spi_transfer_one(struct spi_master *master,
diff --git a/queue/spi-sprd-switch-the-sequence-of-setting-WDG_LOAD_LOW.patch b/queue/spi-sprd-switch-the-sequence-of-setting-WDG_LOAD_LOW.patch index 06ab85c..e19f8c5 100644 --- a/queue/spi-sprd-switch-the-sequence-of-setting-WDG_LOAD_LOW.patch +++ b/queue/spi-sprd-switch-the-sequence-of-setting-WDG_LOAD_LOW.patch
@@ -1,4 +1,4 @@ -From 70884402dc584e71e1103edf16a43527420a2d42 Mon Sep 17 00:00:00 2001 +From 061de8d128c46d5f780be20101526b2697d91ce9 Mon Sep 17 00:00:00 2001 From: Lingling Xu <ling_ling.xu@unisoc.com> Date: Tue, 2 Jun 2020 16:24:15 +0800 Subject: [PATCH] spi: sprd: switch the sequence of setting WDG_LOAD_LOW and @@ -14,6 +14,7 @@ Signed-off-by: Chunyan Zhang <chunyan.zhang@unisoc.com> Link: https://lore.kernel.org/r/20200602082415.5848-1-zhang.lyra@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/spi/spi-sprd-adi.c b/drivers/spi/spi-sprd-adi.c index f1fc2bde6ef3..e41976010dc4 100644
diff --git a/queue/staging-comedi-verify-array-index-is-correct-before-.patch b/queue/staging-comedi-verify-array-index-is-correct-before-.patch index 005a422..aaeed23 100644 --- a/queue/staging-comedi-verify-array-index-is-correct-before-.patch +++ b/queue/staging-comedi-verify-array-index-is-correct-before-.patch
@@ -1,4 +1,4 @@ -From ef75e14a6c935eec82abac07ab68e388514e39bc Mon Sep 17 00:00:00 2001 +From 593a30d6dac974d37cff099bdd79a9901b1a321f Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter@oracle.com> Date: Thu, 9 Jul 2020 13:29:36 +0300 Subject: [PATCH] staging: comedi: verify array index is correct before using @@ -15,6 +15,7 @@ Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Link: https://lore.kernel.org/r/20200709102936.GA20875@mwanda Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c index 45ad4ba92f94..689acd69a1b9 100644
diff --git a/queue/tcp-fix-SO_RCVLOWAT-possible-hangs-under-high-mem-pr.patch b/queue/tcp-fix-SO_RCVLOWAT-possible-hangs-under-high-mem-pr.patch index 6cde977..08d8cd8 100644 --- a/queue/tcp-fix-SO_RCVLOWAT-possible-hangs-under-high-mem-pr.patch +++ b/queue/tcp-fix-SO_RCVLOWAT-possible-hangs-under-high-mem-pr.patch
@@ -1,4 +1,4 @@ -From ba3bb0e76ccd464bb66665a1941fabe55dadb3ba Mon Sep 17 00:00:00 2001 +From ca8a1a12af982fa7a1feb4391fbe3f184265d420 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Tue, 30 Jun 2020 13:51:28 -0700 Subject: [PATCH] tcp: fix SO_RCVLOWAT possible hangs under high mem pressure @@ -12,12 +12,13 @@ Fixes: 03f45c883c6f ("tcp: avoid extra wakeups for SO_RCVLOWAT users") Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c -index f3a0eb139b76..9615e72656d1 100644 +index 0f16cf2794a9..1986560889a0 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -4582,6 +4582,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) +@@ -4517,6 +4517,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) if (unlikely(tcp_try_rmem_schedule(sk, skb, skb->truesize))) { NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFODROP); @@ -25,7 +26,7 @@ tcp_drop(sk, skb); return; } -@@ -4828,6 +4829,7 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) +@@ -4759,6 +4760,7 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) sk_forced_mem_schedule(sk, skb->truesize); else if (tcp_try_rmem_schedule(sk, skb, skb->truesize)) { NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRCVQDROP);
diff --git a/queue/tcp-make-sure-listeners-don-t-initialize-congestion-.patch b/queue/tcp-make-sure-listeners-don-t-initialize-congestion-.patch index 7c0a22b..8b36c79 100644 --- a/queue/tcp-make-sure-listeners-don-t-initialize-congestion-.patch +++ b/queue/tcp-make-sure-listeners-don-t-initialize-congestion-.patch
@@ -1,4 +1,4 @@ -From ce69e563b325f620863830c246a8698ccea52048 Mon Sep 17 00:00:00 2001 +From ebcfc5b9e7279e69ada0e45609734bd9117cf025 Mon Sep 17 00:00:00 2001 From: Christoph Paasch <cpaasch@apple.com> Date: Wed, 8 Jul 2020 16:18:34 -0700 Subject: [PATCH] tcp: make sure listeners don't initialize congestion-control @@ -113,12 +113,13 @@ Signed-off-by: Christoph Paasch <cpaasch@apple.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c -index 861fbd84c9cf..6f0caf9a866d 100644 +index 32df5a808e34..9bd121004d19 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c -@@ -2691,6 +2691,9 @@ int tcp_disconnect(struct sock *sk, int flags) +@@ -2630,6 +2630,9 @@ int tcp_disconnect(struct sock *sk, int flags) tp->window_clamp = 0; tp->delivered = 0; tp->delivered_ce = 0; @@ -129,7 +130,7 @@ tp->is_sack_reneg = 0; tcp_clear_retrans(tp); diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c -index 3172e31987be..62878cf26d9c 100644 +index c445a81d144e..d7a1f2ef6c52 100644 --- a/net/ipv4/tcp_cong.c +++ b/net/ipv4/tcp_cong.c @@ -197,7 +197,7 @@ static void tcp_reinit_congestion_control(struct sock *sk,
diff --git a/queue/tcp-md5-add-missing-memory-barriers-in-tcp_md5_do_ad.patch b/queue/tcp-md5-add-missing-memory-barriers-in-tcp_md5_do_ad.patch index 79e929a..56f3710 100644 --- a/queue/tcp-md5-add-missing-memory-barriers-in-tcp_md5_do_ad.patch +++ b/queue/tcp-md5-add-missing-memory-barriers-in-tcp_md5_do_ad.patch
@@ -1,4 +1,4 @@ -From 6a2febec338df7e7699a52d00b2e1207dcf65b28 Mon Sep 17 00:00:00 2001 +From d3e008c647b732c45c8532905abbf91bbf433186 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Tue, 30 Jun 2020 16:41:01 -0700 Subject: [PATCH] tcp: md5: add missing memory barriers in @@ -25,12 +25,13 @@ Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c -index 810cc164f795..f11166045324 100644 +index 9bd121004d19..18282f5ff66e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c -@@ -4033,10 +4033,13 @@ EXPORT_SYMBOL(tcp_md5_hash_skb_data); +@@ -3809,10 +3809,13 @@ EXPORT_SYMBOL(tcp_md5_hash_skb_data); int tcp_md5_hash_key(struct tcp_md5sig_pool *hp, const struct tcp_md5sig_key *key) { @@ -47,10 +48,10 @@ } EXPORT_SYMBOL(tcp_md5_hash_key); diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c -index ad6435ba6d72..99916fcc15ca 100644 +index 16591cccbeff..4e1252674a1f 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c -@@ -1113,6 +1113,9 @@ int tcp_md5_do_add(struct sock *sk, const union tcp_md5_addr *addr, +@@ -1069,6 +1069,9 @@ int tcp_md5_do_add(struct sock *sk, const union tcp_md5_addr *addr, if (key) { /* Pre-existing entry - just update that one. */ memcpy(key->key, newkey, newkeylen);
diff --git a/queue/tcp-md5-allow-changing-MD5-keys-in-all-socket-states.patch b/queue/tcp-md5-allow-changing-MD5-keys-in-all-socket-states.patch index 26baf5a..4e396fe 100644 --- a/queue/tcp-md5-allow-changing-MD5-keys-in-all-socket-states.patch +++ b/queue/tcp-md5-allow-changing-MD5-keys-in-all-socket-states.patch
@@ -1,4 +1,4 @@ -From 1ca0fafd73c5268e8fc4b997094b8bb2bfe8deea Mon Sep 17 00:00:00 2001 +From d60ecad817145f5316a83251ac738187a1d8c2d5 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Wed, 1 Jul 2020 18:39:33 -0700 Subject: [PATCH] tcp: md5: allow changing MD5 keys in all socket states @@ -43,12 +43,13 @@ Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c -index c33f7c6aff8e..861fbd84c9cf 100644 +index cac96434f0be..86ae03c1c54b 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c -@@ -3246,10 +3246,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, +@@ -3063,10 +3063,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, #ifdef CONFIG_TCP_MD5SIG case TCP_MD5SIG: case TCP_MD5SIG_EXT:
diff --git a/queue/tcp-md5-do-not-send-silly-options-in-SYNCOOKIES.patch b/queue/tcp-md5-do-not-send-silly-options-in-SYNCOOKIES.patch index 94df984..7dffacc 100644 --- a/queue/tcp-md5-do-not-send-silly-options-in-SYNCOOKIES.patch +++ b/queue/tcp-md5-do-not-send-silly-options-in-SYNCOOKIES.patch
@@ -1,4 +1,4 @@ -From e114e1e8ac9d31f25b9dd873bab5d80c1fc482ca Mon Sep 17 00:00:00 2001 +From 95a7f534cb4f5f0129de36e968959eac61b0dc13 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Wed, 1 Jul 2020 12:41:23 -0700 Subject: [PATCH] tcp: md5: do not send silly options in SYNCOOKIES @@ -42,12 +42,13 @@ Cc: Florian Westphal <fw@strlen.de> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c -index a50e1990a845..5f5b2f0b0e60 100644 +index a7c9728d7fca..604fe19ef189 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -700,7 +700,8 @@ static unsigned int tcp_synack_options(const struct sock *sk, +@@ -662,7 +662,8 @@ static unsigned int tcp_synack_options(const struct sock *sk, unsigned int mss, struct sk_buff *skb, struct tcp_out_options *opts, const struct tcp_md5sig_key *md5, @@ -57,7 +58,7 @@ { struct inet_request_sock *ireq = inet_rsk(req); unsigned int remaining = MAX_TCP_OPTION_SPACE; -@@ -715,7 +716,8 @@ static unsigned int tcp_synack_options(const struct sock *sk, +@@ -677,7 +678,8 @@ static unsigned int tcp_synack_options(const struct sock *sk, * rather than TS in order to fit in better with old, * buggy kernels, but that was deemed to be unnecessary. */ @@ -67,7 +68,7 @@ } #endif -@@ -3394,7 +3396,7 @@ struct sk_buff *tcp_make_synack(const struct sock *sk, struct dst_entry *dst, +@@ -3291,7 +3293,7 @@ struct sk_buff *tcp_make_synack(const struct sock *sk, struct dst_entry *dst, #endif skb_set_hash(skb, tcp_rsk(req)->txhash, PKT_HASH_TYPE_L4); tcp_header_size = tcp_synack_options(sk, req, mss, skb, &opts, md5,
diff --git a/queue/tcp-md5-refine-tcp_md5_do_add-tcp_md5_hash_key-barri.patch b/queue/tcp-md5-refine-tcp_md5_do_add-tcp_md5_hash_key-barri.patch index eef4f04..89d38fe 100644 --- a/queue/tcp-md5-refine-tcp_md5_do_add-tcp_md5_hash_key-barri.patch +++ b/queue/tcp-md5-refine-tcp_md5_do_add-tcp_md5_hash_key-barri.patch
@@ -1,4 +1,4 @@ -From f82ad31ff51ecd2870e5021dafb319fab2002c51 Mon Sep 17 00:00:00 2001 +From c7bb39708d11147c451c38695e3d6162904f4fb1 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Wed, 1 Jul 2020 11:43:04 -0700 Subject: [PATCH] tcp: md5: refine tcp_md5_do_add()/tcp_md5_hash_key() barriers @@ -30,12 +30,13 @@ Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [PG: use v5.4.x-stable version w/o data_race as per above info.] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c -index 524ba445e887..86ae03c1c54b 100644 +index 18282f5ff66e..cac96434f0be 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c -@@ -3806,13 +3806,13 @@ EXPORT_SYMBOL(tcp_md5_hash_skb_data); +@@ -3809,13 +3809,13 @@ EXPORT_SYMBOL(tcp_md5_hash_skb_data); int tcp_md5_hash_key(struct tcp_md5sig_pool *hp, const struct tcp_md5sig_key *key) {
diff --git a/queue/thermal-drivers-cpufreq_cooling-Fix-wrong-frequency-.patch b/queue/thermal-drivers-cpufreq_cooling-Fix-wrong-frequency-.patch index 3f9ae78..b49e889 100644 --- a/queue/thermal-drivers-cpufreq_cooling-Fix-wrong-frequency-.patch +++ b/queue/thermal-drivers-cpufreq_cooling-Fix-wrong-frequency-.patch
@@ -1,4 +1,4 @@ -From 0ea5e6455b3e3a791a7416742c684f97fbd818d7 Mon Sep 17 00:00:00 2001 +From 4a6795d3016b0e66862cdc82464cc0e2911698a6 Mon Sep 17 00:00:00 2001 From: Finley Xiao <finley.xiao@rock-chips.com> Date: Fri, 19 Jun 2020 17:08:25 +0800 Subject: [PATCH] thermal/drivers/cpufreq_cooling: Fix wrong frequency @@ -29,6 +29,7 @@ Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [PG: use v5.4.x-stable version instead of mainline.] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index 4c5db59a619b..a4baa5d21ecd 100644
diff --git a/queue/thermal-drivers-imx-Fix-missing-of_node_put-at-probe.patch b/queue/thermal-drivers-imx-Fix-missing-of_node_put-at-probe.patch index 35dcafe..d1828c1 100644 --- a/queue/thermal-drivers-imx-Fix-missing-of_node_put-at-probe.patch +++ b/queue/thermal-drivers-imx-Fix-missing-of_node_put-at-probe.patch
@@ -1,4 +1,4 @@ -From b45fd13be340e4ed0a2a9673ba299eb2a71ba829 Mon Sep 17 00:00:00 2001 +From b648fb551d9c98dc0631adbffce2ff4f6b72d83e Mon Sep 17 00:00:00 2001 From: Anson Huang <Anson.Huang@nxp.com> Date: Thu, 26 Mar 2020 22:29:05 +0800 Subject: [PATCH] thermal/drivers: imx: Fix missing of_node_put() at probe time @@ -11,12 +11,13 @@ Signed-off-by: Anson Huang <Anson.Huang@nxp.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lore.kernel.org/r/1585232945-23368-1-git-send-email-Anson.Huang@nxp.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c -index e761c9b42217..1b84ea674edb 100644 +index bb6754a5342c..85511c1160b7 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c -@@ -649,7 +649,7 @@ MODULE_DEVICE_TABLE(of, of_imx_thermal_match); +@@ -656,7 +656,7 @@ MODULE_DEVICE_TABLE(of, of_imx_thermal_match); static int imx_thermal_register_legacy_cooling(struct imx_thermal_data *data) { struct device_node *np; @@ -25,7 +26,7 @@ data->policy = cpufreq_cpu_get(0); if (!data->policy) { -@@ -664,11 +664,12 @@ static int imx_thermal_register_legacy_cooling(struct imx_thermal_data *data) +@@ -671,11 +671,12 @@ static int imx_thermal_register_legacy_cooling(struct imx_thermal_data *data) if (IS_ERR(data->cdev)) { ret = PTR_ERR(data->cdev); cpufreq_cpu_put(data->policy);
diff --git a/queue/thermal-int3403_thermal-Downgrade-error-message.patch b/queue/thermal-int3403_thermal-Downgrade-error-message.patch index f0339ee..82ce887 100644 --- a/queue/thermal-int3403_thermal-Downgrade-error-message.patch +++ b/queue/thermal-int3403_thermal-Downgrade-error-message.patch
@@ -1,4 +1,4 @@ -From f3d7fb38976b1b0a8462ba1c7cbd404ddfaad086 Mon Sep 17 00:00:00 2001 +From 667d909c52e58ad198d1a0f493b95eb75ce61b43 Mon Sep 17 00:00:00 2001 From: Alex Hung <alex.hung@canonical.com> Date: Mon, 15 Jun 2020 16:39:57 -0600 Subject: [PATCH] thermal: int3403_thermal: Downgrade error message @@ -14,9 +14,10 @@ [ rzhang: fix typo in changelog ] Signed-off-by: Zhang Rui <rui.zhang@intel.com> Link: https://lore.kernel.org/r/20200615223957.183153-1-alex.hung@canonical.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c -index f86cbb125e2f..ec1d58c4ceaa 100644 +index f5749d4418ae..ff94d7f95216 100644 --- a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c @@ -74,7 +74,7 @@ static void int3403_notify(acpi_handle handle,
diff --git a/queue/thermal-ti-soc-thermal-Fix-reversed-condition-in-ti_.patch b/queue/thermal-ti-soc-thermal-Fix-reversed-condition-in-ti_.patch index f78acc1..763d662 100644 --- a/queue/thermal-ti-soc-thermal-Fix-reversed-condition-in-ti_.patch +++ b/queue/thermal-ti-soc-thermal-Fix-reversed-condition-in-ti_.patch
@@ -1,4 +1,4 @@ -From 0f348db01fdf128813fdd659fcc339038fb421a4 Mon Sep 17 00:00:00 2001 +From dc6e69d40494ff08ab94f71cc606ac4823b5ca6d Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter@oracle.com> Date: Tue, 16 Jun 2020 12:19:49 +0300 Subject: [PATCH] thermal: ti-soc-thermal: Fix reversed condition in @@ -12,6 +12,7 @@ Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lore.kernel.org/r/20200616091949.GA11940@mwanda +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c index 85776db4bf34..2ce4b19f312a 100644
diff --git a/queue/timer-Fix-wheel-index-calculation-on-last-level.patch b/queue/timer-Fix-wheel-index-calculation-on-last-level.patch index 6a39686..4e083c5 100644 --- a/queue/timer-Fix-wheel-index-calculation-on-last-level.patch +++ b/queue/timer-Fix-wheel-index-calculation-on-last-level.patch
@@ -1,4 +1,4 @@ -From e2a71bdea81690b6ef11f4368261ec6f5b6891aa Mon Sep 17 00:00:00 2001 +From 4aec9c4af1bf4965c27231186eaa9e397a8c0fdd Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker <frederic@kernel.org> Date: Fri, 17 Jul 2020 16:05:40 +0200 Subject: [PATCH] timer: Fix wheel index calculation on last level @@ -21,12 +21,13 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20200717140551.29076-2-frederic@kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/time/timer.c b/kernel/time/timer.c -index 9a838d38dbe6..df1ff803acc4 100644 +index b2e2991c8c7d..e70451eb2495 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c -@@ -521,8 +521,8 @@ static int calc_wheel_index(unsigned long expires, unsigned long clk) +@@ -519,8 +519,8 @@ static int calc_wheel_index(unsigned long expires, unsigned long clk) * Force expire obscene large timeouts to expire at the * capacity limit of the wheel. */
diff --git a/queue/timer-Prevent-base-clk-from-moving-backward.patch b/queue/timer-Prevent-base-clk-from-moving-backward.patch index 4b18d7e..a185e1e 100644 --- a/queue/timer-Prevent-base-clk-from-moving-backward.patch +++ b/queue/timer-Prevent-base-clk-from-moving-backward.patch
@@ -1,4 +1,4 @@ -From 30c66fc30ee7a98c4f3adf5fb7e213b61884474f Mon Sep 17 00:00:00 2001 +From 837d40cc70906c301dd2012672afd8f5b4f38b36 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker <frederic@kernel.org> Date: Fri, 3 Jul 2020 03:06:57 +0200 Subject: [PATCH] timer: Prevent base->clk from moving backward @@ -29,12 +29,13 @@ Tested-by: Juri Lelli <juri.lelli@redhat.com> Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20200703010657.2302-1-frederic@kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/time/timer.c b/kernel/time/timer.c -index 398e6eadb861..9a838d38dbe6 100644 +index 7c8f465ae02f..b2e2991c8c7d 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c -@@ -584,7 +584,15 @@ trigger_dyntick_cpu(struct timer_base *base, struct timer_list *timer) +@@ -582,7 +582,15 @@ trigger_dyntick_cpu(struct timer_base *base, struct timer_list *timer) * Set the next expiry time and kick the CPU so it can reevaluate the * wheel: */ @@ -51,7 +52,7 @@ wake_up_nohz_cpu(base->cpu); } -@@ -896,10 +904,13 @@ static inline void forward_timer_base(struct timer_base *base) +@@ -894,10 +902,13 @@ static inline void forward_timer_base(struct timer_base *base) * If the next expiry value is > jiffies, then we fast forward to * jiffies otherwise we forward to the next expiry value. */
diff --git a/queue/tpm_tis-extra-chip-ops-check-on-error-path-in-tpm_ti.patch b/queue/tpm_tis-extra-chip-ops-check-on-error-path-in-tpm_ti.patch index 46d79d4..a646093 100644 --- a/queue/tpm_tis-extra-chip-ops-check-on-error-path-in-tpm_ti.patch +++ b/queue/tpm_tis-extra-chip-ops-check-on-error-path-in-tpm_ti.patch
@@ -1,4 +1,4 @@ -From ccf6fb858e17a8f8a914a1c6444d277cfedfeae6 Mon Sep 17 00:00:00 2001 +From 45dd31a24bcec77ba91e3b9fd8b19b63d2dcb829 Mon Sep 17 00:00:00 2001 From: Vasily Averin <vvs@virtuozzo.com> Date: Sat, 13 Jun 2020 17:18:33 +0300 Subject: [PATCH] tpm_tis: extra chip->ops check on error path in @@ -18,12 +18,13 @@ Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.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_tis_core.c b/drivers/char/tpm/tpm_tis_core.c -index 2435216bd10a..65ab1b027949 100644 +index 7e202796782d..e79655a05a76 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c -@@ -1085,7 +1085,7 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, +@@ -1008,7 +1008,7 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, return 0; out_err:
diff --git a/queue/uio_pdrv_genirq-fix-use-without-device-tree-and-no-i.patch b/queue/uio_pdrv_genirq-fix-use-without-device-tree-and-no-i.patch index dc21a31..5d71baf 100644 --- a/queue/uio_pdrv_genirq-fix-use-without-device-tree-and-no-i.patch +++ b/queue/uio_pdrv_genirq-fix-use-without-device-tree-and-no-i.patch
@@ -1,4 +1,4 @@ -From 8486ca2c22b52c04517f752f5db1fe680bc35b90 Mon Sep 17 00:00:00 2001 +From e0e56636b9b77860bbfe0ddf4b147e95e4ee14ac Mon Sep 17 00:00:00 2001 From: Esben Haabendal <esben@geanix.com> Date: Wed, 1 Jul 2020 16:56:58 +0200 Subject: [PATCH] uio_pdrv_genirq: fix use without device tree and no interrupt @@ -22,6 +22,7 @@ Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20200701145659.3978-3-esben@geanix.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c index 3d9fab21a21e..6dea4fc1fc59 100644
diff --git a/queue/usb-chipidea-core-add-wakeup-support-for-extcon.patch b/queue/usb-chipidea-core-add-wakeup-support-for-extcon.patch index 018ebc8..0d2819c 100644 --- a/queue/usb-chipidea-core-add-wakeup-support-for-extcon.patch +++ b/queue/usb-chipidea-core-add-wakeup-support-for-extcon.patch
@@ -1,4 +1,4 @@ -From 876d4e1e8298ad1f94d9e9392fc90486755437b4 Mon Sep 17 00:00:00 2001 +From 3e5b9956e31b8f638d95f1235c16c62d87b960f6 Mon Sep 17 00:00:00 2001 From: Peter Chen <peter.chen@nxp.com> Date: Tue, 7 Jul 2020 14:06:01 +0800 Subject: [PATCH] usb: chipidea: core: add wakeup support for extcon @@ -17,12 +17,13 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com> Link: https://lore.kernel.org/r/20200707060601.31907-2-peter.chen@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c -index 9a7c53d09ab4..bb133245beed 100644 +index 27749ace2d93..fb2e7a611eb4 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c -@@ -1243,6 +1243,29 @@ static void ci_controller_suspend(struct ci_hdrc *ci) +@@ -1188,6 +1188,29 @@ static void ci_controller_suspend(struct ci_hdrc *ci) enable_irq(ci->irq); } @@ -52,7 +53,7 @@ static int ci_controller_resume(struct device *dev) { struct ci_hdrc *ci = dev_get_drvdata(dev); -@@ -1275,6 +1298,7 @@ static int ci_controller_resume(struct device *dev) +@@ -1220,6 +1243,7 @@ static int ci_controller_resume(struct device *dev) enable_irq(ci->irq); if (ci_otg_is_fsm_mode(ci)) ci_otg_fsm_wakeup_by_srp(ci);
diff --git a/queue/usb-dwc2-Fix-error-path-in-gadget-registration.patch b/queue/usb-dwc2-Fix-error-path-in-gadget-registration.patch index df0da58..c04e622 100644 --- a/queue/usb-dwc2-Fix-error-path-in-gadget-registration.patch +++ b/queue/usb-dwc2-Fix-error-path-in-gadget-registration.patch
@@ -1,4 +1,4 @@ -From 06c5954604367a76067b6b76f9a41b954eecbc94 Mon Sep 17 00:00:00 2001 +From a92ea26f474285950dc8f3058f632a1d7fae9d5e Mon Sep 17 00:00:00 2001 From: Marek Szyprowski <m.szyprowski@samsung.com> Date: Thu, 16 Jul 2020 14:09:48 +0200 Subject: [PATCH] usb: dwc2: Fix error path in gadget registration @@ -63,6 +63,7 @@ Acked-by: Minas Harutyunyan <hminas@synopsys.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Felipe Balbi <balbi@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c index e9e0b5d2ab74..05a6fb4c2273 100644
diff --git a/queue/usb-dwc2-Fix-shutdown-callback-in-platform.patch b/queue/usb-dwc2-Fix-shutdown-callback-in-platform.patch index 8e00a6a..150c52f 100644 --- a/queue/usb-dwc2-Fix-shutdown-callback-in-platform.patch +++ b/queue/usb-dwc2-Fix-shutdown-callback-in-platform.patch
@@ -1,4 +1,4 @@ -From 4fdf228cdf6925af45a2066d403821e0977bfddb Mon Sep 17 00:00:00 2001 +From 0f441274ea95bd823d80b314fcf446be3327eb67 Mon Sep 17 00:00:00 2001 From: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com> Date: Sat, 30 May 2020 11:41:50 +0400 Subject: [PATCH] usb: dwc2: Fix shutdown callback in platform @@ -18,12 +18,13 @@ Reviewed-by: Frank Mori Hess <fmh6jj@gmail.com> Signed-off-by: Minas Harutyunyan <hminas@synopsys.com> Signed-off-by: Felipe Balbi <balbi@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c -index c347d93eae64..cb8ddbd53718 100644 +index f1acfdee4ac3..e9e0b5d2ab74 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c -@@ -342,7 +342,8 @@ static void dwc2_driver_shutdown(struct platform_device *dev) +@@ -337,7 +337,8 @@ static void dwc2_driver_shutdown(struct platform_device *dev) { struct dwc2_hsotg *hsotg = platform_get_drvdata(dev);
diff --git a/queue/usb-gadget-function-fix-missing-spinlock-in-f_uac1_l.patch b/queue/usb-gadget-function-fix-missing-spinlock-in-f_uac1_l.patch index 74c33f8..6cb59c6 100644 --- a/queue/usb-gadget-function-fix-missing-spinlock-in-f_uac1_l.patch +++ b/queue/usb-gadget-function-fix-missing-spinlock-in-f_uac1_l.patch
@@ -1,4 +1,4 @@ -From 8778eb0927ddcd3f431805c37b78fa56481aeed9 Mon Sep 17 00:00:00 2001 +From 590a6969a52670cb2fca82c02845cb5d247e8795 Mon Sep 17 00:00:00 2001 From: Zhang Qiang <qiang.zhang@windriver.com> Date: Mon, 6 Jul 2020 13:14:55 +0800 Subject: [PATCH] usb: gadget: function: fix missing spinlock in f_uac1_legacy @@ -14,9 +14,10 @@ Cc: stable <stable@vger.kernel.org> Signed-off-by: Zhang Qiang <qiang.zhang@windriver.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_uac1_legacy.c b/drivers/usb/gadget/function/f_uac1_legacy.c -index 349deae7cabd..e2d7f69128a0 100644 +index 6677ae932de0..06ee6e901808 100644 --- a/drivers/usb/gadget/function/f_uac1_legacy.c +++ b/drivers/usb/gadget/function/f_uac1_legacy.c @@ -336,7 +336,9 @@ static int f_audio_out_ep_complete(struct usb_ep *ep, struct usb_request *req)
diff --git a/queue/usb-gadget-udc-atmel-fix-uninitialized-read-in-debug.patch b/queue/usb-gadget-udc-atmel-fix-uninitialized-read-in-debug.patch index 01ffbbc..abaca2a 100644 --- a/queue/usb-gadget-udc-atmel-fix-uninitialized-read-in-debug.patch +++ b/queue/usb-gadget-udc-atmel-fix-uninitialized-read-in-debug.patch
@@ -1,4 +1,4 @@ -From 30517ffeb3bff842e1355cbc32f1959d9dbb5414 Mon Sep 17 00:00:00 2001 +From 3eea63ee32df17d0e71cc83a6deeec6ad2f0fb81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <mirq-linux@rere.qmqm.pl> Date: Thu, 28 May 2020 20:35:54 +0200 Subject: [PATCH] usb: gadget: udc: atmel: fix uninitialized read in debug @@ -15,12 +15,13 @@ Fixes: 5fb694f96e7c ("usb: gadget: udc: atmel: fix possible oops when unloading module") Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: Felipe Balbi <balbi@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c -index 9153e220848d..9342a3d24963 100644 +index 18372025c452..2d969b7185d4 100644 --- a/drivers/usb/gadget/udc/atmel_usba_udc.c +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c -@@ -865,7 +865,7 @@ static int usba_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req) +@@ -869,7 +869,7 @@ static int usba_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req) u32 status; DBG(DBG_GADGET | DBG_QUEUE, "ep_dequeue: %s, req %p\n",
diff --git a/queue/virt-vbox-Fix-VBGL_IOCTL_VMMDEV_REQUEST_BIG-and-_LOG.patch b/queue/virt-vbox-Fix-VBGL_IOCTL_VMMDEV_REQUEST_BIG-and-_LOG.patch index 02777e9..234edc0 100644 --- a/queue/virt-vbox-Fix-VBGL_IOCTL_VMMDEV_REQUEST_BIG-and-_LOG.patch +++ b/queue/virt-vbox-Fix-VBGL_IOCTL_VMMDEV_REQUEST_BIG-and-_LOG.patch
@@ -1,4 +1,4 @@ -From f794db6841e5480208f0c3a3ac1df445a96b079e Mon Sep 17 00:00:00 2001 +From c45491eba6562dc62dc81d4486589a58e90ce2c0 Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede@redhat.com> Date: Thu, 9 Jul 2020 14:08:51 +0200 Subject: [PATCH] virt: vbox: Fix VBGL_IOCTL_VMMDEV_REQUEST_BIG and _LOG req @@ -32,12 +32,13 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> Link: https://lore.kernel.org/r/20200709120858.63928-2-hdegoede@redhat.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/virt/vboxguest/vboxguest_core.c b/drivers/virt/vboxguest/vboxguest_core.c -index b690a8a4bf9e..8fab04e76c14 100644 +index 2307b0329aec..4eb8ea36093a 100644 --- a/drivers/virt/vboxguest/vboxguest_core.c +++ b/drivers/virt/vboxguest/vboxguest_core.c -@@ -1520,7 +1520,8 @@ int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data) +@@ -1519,7 +1519,8 @@ int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data) /* For VMMDEV_REQUEST hdr->type != VBG_IOCTL_HDR_TYPE_DEFAULT */ if (req_no_size == VBG_IOCTL_VMMDEV_REQUEST(0) || @@ -47,7 +48,7 @@ return vbg_ioctl_vmmrequest(gdev, session, data); if (hdr->type != VBG_IOCTL_HDR_TYPE_DEFAULT) -@@ -1558,6 +1559,7 @@ int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data) +@@ -1557,6 +1558,7 @@ int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data) case VBG_IOCTL_HGCM_CALL(0): return vbg_ioctl_hgcm_call(gdev, session, f32bit, data); case VBG_IOCTL_LOG(0): @@ -96,7 +97,7 @@ if (is_vmmdev_req) buf = vbg_req_alloc(size, VBG_IOCTL_HDR_TYPE_DEFAULT, diff --git a/include/uapi/linux/vboxguest.h b/include/uapi/linux/vboxguest.h -index 9cec58a6a5ea..f79d7abe27db 100644 +index 612f0c7d3558..ded39da305d0 100644 --- a/include/uapi/linux/vboxguest.h +++ b/include/uapi/linux/vboxguest.h @@ -103,7 +103,7 @@ VMMDEV_ASSERT_SIZE(vbg_ioctl_driver_version_info, 24 + 20);
diff --git a/queue/virt-vbox-Fix-guest-capabilities-mask-check.patch b/queue/virt-vbox-Fix-guest-capabilities-mask-check.patch index 500d7fb..14a4530 100644 --- a/queue/virt-vbox-Fix-guest-capabilities-mask-check.patch +++ b/queue/virt-vbox-Fix-guest-capabilities-mask-check.patch
@@ -1,4 +1,4 @@ -From 59d1d2e8e1e7c50d2657d5e4812b53f71f507968 Mon Sep 17 00:00:00 2001 +From dec572735b5740ba6e4969bd337087a590e7ce38 Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede@redhat.com> Date: Thu, 9 Jul 2020 14:08:52 +0200 Subject: [PATCH] virt: vbox: Fix guest capabilities mask check @@ -15,12 +15,13 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> Link: https://lore.kernel.org/r/20200709120858.63928-3-hdegoede@redhat.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/virt/vboxguest/vboxguest_core.c b/drivers/virt/vboxguest/vboxguest_core.c -index 8fab04e76c14..18ebd7a6af98 100644 +index 4eb8ea36093a..95bfdb8ac8a2 100644 --- a/drivers/virt/vboxguest/vboxguest_core.c +++ b/drivers/virt/vboxguest/vboxguest_core.c -@@ -1444,7 +1444,7 @@ static int vbg_ioctl_change_guest_capabilities(struct vbg_dev *gdev, +@@ -1443,7 +1443,7 @@ static int vbg_ioctl_change_guest_capabilities(struct vbg_dev *gdev, or_mask = caps->u.in.or_mask; not_mask = caps->u.in.not_mask;
diff --git a/queue/virtio-virtio_console-add-missing-MODULE_DEVICE_TABL.patch b/queue/virtio-virtio_console-add-missing-MODULE_DEVICE_TABL.patch index aa4c497..2b6d018 100644 --- a/queue/virtio-virtio_console-add-missing-MODULE_DEVICE_TABL.patch +++ b/queue/virtio-virtio_console-add-missing-MODULE_DEVICE_TABL.patch
@@ -1,4 +1,4 @@ -From 897c44f0bae574c5fb318c759b060bebf9dd6013 Mon Sep 17 00:00:00 2001 +From de5ae6b4cacfacc5981d268d4146c8edb16f4fe9 Mon Sep 17 00:00:00 2001 From: Alexander Lobakin <alobakin@pm.me> Date: Tue, 23 Jun 2020 11:09:33 +0000 Subject: [PATCH] virtio: virtio_console: add missing MODULE_DEVICE_TABLE() for @@ -18,12 +18,13 @@ Reviewed-by: Amit Shah <amit@kernel.org> Link: https://lore.kernel.org/r/x7C_CbeJtoGMy258nwAXASYz3xgFMFpyzmUvOyZzRnQrgWCREBjaqBOpAUS7ol4NnZYvSVwmTsCG0Ohyfvta-ygw6HMHcoeKK0C3QFiAO_Q=@pm.me Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c -index 00c5e3acee46..ca691bce9791 100644 +index 3259426f01dc..9ebce2c12c43 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c -@@ -2116,6 +2116,7 @@ static struct virtio_device_id id_table[] = { +@@ -2118,6 +2118,7 @@ static struct virtio_device_id id_table[] = { { VIRTIO_ID_CONSOLE, VIRTIO_DEV_ANY_ID }, { 0 }, }; @@ -31,7 +32,7 @@ static unsigned int features[] = { VIRTIO_CONSOLE_F_SIZE, -@@ -2128,6 +2129,7 @@ static struct virtio_device_id rproc_serial_id_table[] = { +@@ -2130,6 +2131,7 @@ static struct virtio_device_id rproc_serial_id_table[] = { #endif { 0 }, }; @@ -39,7 +40,7 @@ static unsigned int rproc_serial_features[] = { }; -@@ -2280,6 +2282,5 @@ static void __exit fini(void) +@@ -2282,6 +2284,5 @@ static void __exit fini(void) module_init(init); module_exit(fini);
diff --git a/queue/vlan-consolidate-VLAN-parsing-code-and-limit-max-par.patch b/queue/vlan-consolidate-VLAN-parsing-code-and-limit-max-par.patch index 9c5ade5..3a505a8 100644 --- a/queue/vlan-consolidate-VLAN-parsing-code-and-limit-max-par.patch +++ b/queue/vlan-consolidate-VLAN-parsing-code-and-limit-max-par.patch
@@ -1,4 +1,4 @@ -From 469aceddfa3ed16e17ee30533fae45e90f62efd8 Mon Sep 17 00:00:00 2001 +From 94c916298cb5f5308c1fedb33978798ac05f8c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com> Date: Tue, 7 Jul 2020 13:03:25 +0200 Subject: [PATCH] vlan: consolidate VLAN parsing code and limit max parsing @@ -28,9 +28,10 @@ Fixes: d7bf2ebebc2b ("sched: consistently handle layer3 header accesses in the presence of VLANs") Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h -index 427a5b8597c2..41a518336673 100644 +index 00fa5d0b5e99..077e74daf19a 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -25,6 +25,8 @@ @@ -42,7 +43,7 @@ /* * struct vlan_hdr - vlan header * @h_vlan_TCI: priority and VLAN ID -@@ -308,34 +310,6 @@ static inline bool eth_type_vlan(__be16 ethertype) +@@ -319,34 +321,6 @@ static inline bool eth_type_vlan(__be16 ethertype) } } @@ -77,7 +78,7 @@ static inline bool vlan_hw_offload_capable(netdev_features_t features, __be16 proto) { -@@ -605,10 +579,10 @@ static inline int vlan_get_tag(const struct sk_buff *skb, u16 *vlan_tci) +@@ -616,10 +590,10 @@ static inline int vlan_get_tag(const struct sk_buff *skb, u16 *vlan_tci) * Returns the EtherType of the packet, regardless of whether it is * vlan encapsulated (normal or hardware accelerated) or not. */ @@ -90,7 +91,7 @@ /* if type is 802.1Q/AD then the header should already be * present at mac_len - VLAN_HLEN (if mac_len > 0), or at -@@ -623,13 +597,12 @@ static inline __be16 __vlan_get_protocol(struct sk_buff *skb, __be16 type, +@@ -634,13 +608,12 @@ static inline __be16 __vlan_get_protocol(struct sk_buff *skb, __be16 type, vlan_depth = ETH_HLEN; } do { @@ -107,7 +108,7 @@ type = vh->h_vlan_encapsulated_proto; vlan_depth += VLAN_HLEN; } while (eth_type_vlan(type)); -@@ -648,11 +621,25 @@ static inline __be16 __vlan_get_protocol(struct sk_buff *skb, __be16 type, +@@ -659,11 +632,25 @@ static inline __be16 __vlan_get_protocol(struct sk_buff *skb, __be16 type, * Returns the EtherType of the packet, regardless of whether it is * vlan encapsulated (normal or hardware accelerated) or not. */
diff --git a/queue/x86-apic-vector-Force-interupt-handler-invocation-to.patch b/queue/x86-apic-vector-Force-interupt-handler-invocation-to.patch index b64a63d..9a07769 100644 --- a/queue/x86-apic-vector-Force-interupt-handler-invocation-to.patch +++ b/queue/x86-apic-vector-Force-interupt-handler-invocation-to.patch
@@ -1,4 +1,4 @@ -From 008f1d60fe25810d4554916744b0975d76601b64 Mon Sep 17 00:00:00 2001 +From 034bf5fef22c3f47dcd6584928c31dccdb96cd01 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Fri, 6 Mar 2020 14:03:44 +0100 Subject: [PATCH] x86/apic/vector: Force interupt handler invocation to irq @@ -39,12 +39,13 @@ Reported-by: sathyanarayanan.kuppuswamy@linux.intel.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lkml.kernel.org/r/20200306130623.684591280@linutronix.de +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c -index 2c5676b0a6e7..6f6d98da05b9 100644 +index 18c0dca08163..c1857c08706e 100644 --- a/arch/x86/kernel/apic/vector.c +++ b/arch/x86/kernel/apic/vector.c -@@ -556,6 +556,12 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq, +@@ -554,6 +554,12 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq, irqd->chip_data = apicd; irqd->hwirq = virq + i; irqd_set_single_target(irqd);
diff --git a/queue/x86-fpu-Reset-MXCSR-to-default-in-kernel_fpu_begin.patch b/queue/x86-fpu-Reset-MXCSR-to-default-in-kernel_fpu_begin.patch index 3029e11..2f4a471 100644 --- a/queue/x86-fpu-Reset-MXCSR-to-default-in-kernel_fpu_begin.patch +++ b/queue/x86-fpu-Reset-MXCSR-to-default-in-kernel_fpu_begin.patch
@@ -1,4 +1,4 @@ -From 646abfba303b7b670823e0aa64025850498ba986 Mon Sep 17 00:00:00 2001 +From e87892448a51b8bdbc9f96a722cd62cb675f2d31 Mon Sep 17 00:00:00 2001 From: Petteri Aimonen <jpa@git.mail.kapsi.fi> Date: Tue, 16 Jun 2020 11:12:57 +0200 Subject: [PATCH] x86/fpu: Reset MXCSR to default in kernel_fpu_begin() @@ -20,6 +20,7 @@ Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://bugzilla.kernel.org/show_bug.cgi?id=207979 Link: https://lkml.kernel.org/r/20200624114646.28953-2-bp@alien8.de +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/include/asm/fpu/internal.h b/arch/x86/include/asm/fpu/internal.h index 44c48e34d799..00eac7f1529b 100644
diff --git a/queue/xprtrdma-fix-incorrect-header-size-calculations.patch b/queue/xprtrdma-fix-incorrect-header-size-calculations.patch index 12d9233..f1ea657 100644 --- a/queue/xprtrdma-fix-incorrect-header-size-calculations.patch +++ b/queue/xprtrdma-fix-incorrect-header-size-calculations.patch
@@ -1,4 +1,4 @@ -From 912288442cb2f431bf3c8cb097a5de83bc6dbac1 Mon Sep 17 00:00:00 2001 +From e544dc9ee71430eae8cb81992fa8c46f6bc5f079 Mon Sep 17 00:00:00 2001 From: Colin Ian King <colin.king@canonical.com> Date: Wed, 15 Jul 2020 17:26:04 +0100 Subject: [PATCH] xprtrdma: fix incorrect header size calculations @@ -15,9 +15,10 @@ Signed-off-by: Colin Ian King <colin.king@canonical.com> Reviewed-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c -index 935bbef2f7be..453bacc99907 100644 +index ff76926b3d67..77a911d14015 100644 --- a/net/sunrpc/xprtrdma/rpc_rdma.c +++ b/net/sunrpc/xprtrdma/rpc_rdma.c @@ -71,7 +71,7 @@ static unsigned int rpcrdma_max_call_header_size(unsigned int maxsegs) @@ -29,7 +30,7 @@ /* Minimal Read chunk size */ size += sizeof(__be32); /* segment count */ -@@ -94,7 +94,7 @@ static unsigned int rpcrdma_max_reply_header_size(unsigned int maxsegs) +@@ -96,7 +96,7 @@ static unsigned int rpcrdma_max_reply_header_size(unsigned int maxsegs) size = RPCRDMA_HDRLEN_MIN; /* Maximum Write list size */