From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 20 Apr 2020 09:17:12 +0000 (+0200)
Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v4.19.117~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6223c04ef04bec4f08053438919cca79d925141;p=thirdparty%2Fkernel%2Fstable-queue.git

Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue
---

a6223c04ef04bec4f08053438919cca79d925141
diff --cc queue-4.14/series
index a4a39a68b39,70f86d5a352..335300ef8da
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@@ -121,4 -121,7 +121,8 @@@ alsa-usb-audio-don-t-override-ignore_ct
  tracing-fix-the-race-between-registering-snapshot-event-trigger-and-triggering-snapshot-operation.patch
  btrfs-check-commit-root-generation-in-should_ignore_root.patch
  mac80211_hwsim-use-kstrndup-in-place-of-kasprintf.patch
 +ext4-do-not-zeroout-extents-beyond-i_disksize.patch
+ dm-flakey-check-for-null-arg_name-in-parse_features.patch
+ kvm-x86-host-feature-ssbd-doesn-t-imply-guest-featur.patch
+ scsi-target-remove-boilerplate-code.patch
+ scsi-target-fix-hang-when-multiple-threads-try-to-de.patch
diff --cc queue-4.19/series
index ef55ba4f04e,a864125103a..99c4ebcf5f5
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@@ -25,4 -25,6 +25,7 @@@ mac80211_hwsim-use-kstrndup-in-place-of
  usb-dwc3-gadget-don-t-enable-interrupt-when-disablin.patch
  usb-dwc3-gadget-don-t-clear-flags-before-transfer-en.patch
  drm-amd-powerplay-force-the-trim-of-the-mclk-dpm_levels-if-od-is-enabled.patch
 +ext4-do-not-zeroout-extents-beyond-i_disksize.patch
+ kvm-x86-host-feature-ssbd-doesn-t-imply-guest-featur.patch
+ scsi-target-remove-boilerplate-code.patch
+ scsi-target-fix-hang-when-multiple-threads-try-to-de.patch
diff --cc queue-4.4/series
index 4d1ac5ed661,49c3cd7375e..0392eae0393
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@@ -63,4 -63,5 +63,6 @@@ asoc-intel-mrfld-fix-incorrect-check-on
  asoc-intel-mrfld-return-error-codes-when-an-error-occurs.patch
  alsa-usb-audio-don-t-override-ignore_ctl_error-value-from-the-map.patch
  mac80211_hwsim-use-kstrndup-in-place-of-kasprintf.patch
 +ext4-do-not-zeroout-extents-beyond-i_disksize.patch
+ dm-flakey-check-for-null-arg_name-in-parse_features.patch
+ kvm-x86-host-feature-ssbd-doesn-t-imply-guest-featur.patch
diff --cc queue-4.9/series
index a1a571750f9,cd520409f40..c3ea10aa2a6
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@@ -76,4 -76,7 +76,8 @@@ asoc-intel-mrfld-return-error-codes-whe
  alsa-usb-audio-don-t-override-ignore_ctl_error-value-from-the-map.patch
  btrfs-check-commit-root-generation-in-should_ignore_root.patch
  mac80211_hwsim-use-kstrndup-in-place-of-kasprintf.patch
 +ext4-do-not-zeroout-extents-beyond-i_disksize.patch
+ dm-flakey-check-for-null-arg_name-in-parse_features.patch
+ kvm-x86-host-feature-ssbd-doesn-t-imply-guest-featur.patch
+ scsi-target-remove-boilerplate-code.patch
+ scsi-target-fix-hang-when-multiple-threads-try-to-de.patch
diff --cc queue-5.4/series
index 3ccb2174d14,aec9627d65f..81c4a731c73
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@@ -51,7 -51,5 +51,9 @@@ net-mlx5e-use-preactivate-hook-to-set-t
  drm-amd-powerplay-force-the-trim-of-the-mclk-dpm_levels-if-od-is-enabled.patch
  drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch
  i2c-designware-platdrv-remove-dpm_flag_smart_suspend-flag-on-byt-and-cht.patch
 +ext4-do-not-zeroout-extents-beyond-i_disksize.patch
 +irqchip-ti-sci-inta-fix-processing-of-masked-irqs.patch
 +x86-resctrl-preserve-cdp-enable-over-cpu-hotplug.patch
 +x86-resctrl-fix-invalid-attempt-at-removing-the-default-resource-group.patch
+ scsi-target-remove-boilerplate-code.patch
+ scsi-target-fix-hang-when-multiple-threads-try-to-de.patch
diff --cc queue-5.5/series
index 31eb612bdda,1a36cdb265f..c5c0ee0979e
--- a/queue-5.5/series
+++ b/queue-5.5/series
@@@ -56,7 -56,5 +56,9 @@@ drm-amd-powerplay-force-the-trim-of-the
  drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch
  i2c-designware-platdrv-remove-dpm_flag_smart_suspend-flag-on-byt-and-cht.patch
  drm-i915-perf-do-not-clear-pollin-for-small-user-read-buffers.patch
 +ext4-do-not-zeroout-extents-beyond-i_disksize.patch
 +irqchip-ti-sci-inta-fix-processing-of-masked-irqs.patch
 +x86-resctrl-preserve-cdp-enable-over-cpu-hotplug.patch
 +x86-resctrl-fix-invalid-attempt-at-removing-the-default-resource-group.patch
+ scsi-target-remove-boilerplate-code.patch
+ scsi-target-fix-hang-when-multiple-threads-try-to-de.patch
diff --cc queue-5.6/series
index 05eedd9aeca,91f5ed443de..e44906f15df
--- a/queue-5.6/series
+++ b/queue-5.6/series
@@@ -61,9 -61,4 +61,10 @@@ drm-amdgpu-fix-the-hw-hang-during-perfo
  i2c-designware-platdrv-remove-dpm_flag_smart_suspend-flag-on-byt-and-cht.patch
  drm-nouveau-sec2-gv100-add-missing-module_firmware.patch
  drm-i915-perf-do-not-clear-pollin-for-small-user-read-buffers.patch
 +rcu-don-t-acquire-lock-in-nmi-handler-in-rcu_nmi_enter_common.patch
 +ext4-do-not-zeroout-extents-beyond-i_disksize.patch
 +irqchip-ti-sci-inta-fix-processing-of-masked-irqs.patch
 +proc-time-namespace-show-clock-symbolic-names-in-proc-pid-timens_offsets.patch
 +x86-resctrl-preserve-cdp-enable-over-cpu-hotplug.patch
 +x86-resctrl-fix-invalid-attempt-at-removing-the-default-resource-group.patch
+ scsi-target-iscsi-calling-iscsit_stop_session-inside.patch