From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 10 Mar 2021 12:21:02 +0000 (+0100)
Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v4.4.261~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=419ec5b242d6961ab2df4d68583cc06f38572004;p=thirdparty%2Fkernel%2Fstable-queue.git

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

419ec5b242d6961ab2df4d68583cc06f38572004
diff --cc queue-4.14/series
index e6fbb275074,7ef6d01c124..9717eb1ae99
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@@ -4,7 -4,13 +4,17 @@@ pm-runtime-update-device-status-before-
  usbip-tools-fix-build-error-for-multiple-definition.patch
  alsa-ctxfi-cthw20k2-fix-mask-on-conf-to-allow-4-bits.patch
  rsxx-return-efault-if-copy_to_user-fails.patch
 +dm-table-fix-iterate_devices-based-device-capability-checks.patch
 +dm-table-fix-dax-iterate_devices-based-device-capability-checks.patch
 +dm-table-fix-zoned-iterate_devices-based-device-capability-checks.patch
 +iommu-amd-fix-sleeping-in-atomic-in-increase_address_space.patch
+ mwifiex-pcie-skip-cancel_work_sync-on-reset-failure-.patch
+ platform-x86-acer-wmi-cleanup-acer_cap_foo-defines.patch
+ platform-x86-acer-wmi-cleanup-accelerometer-device-h.patch
+ platform-x86-acer-wmi-add-new-force_caps-module-para.patch
+ platform-x86-acer-wmi-add-acer_cap_set_function_mode.patch
+ platform-x86-acer-wmi-add-support-for-sw_tablet_mode.patch
+ platform-x86-acer-wmi-add-acer_cap_kbd_dock-quirk-fo.patch
+ pci-add-function-1-dma-alias-quirk-for-marvell-9215-.patch
+ misc-eeprom_93xx46-add-quirk-to-support-microchip-93.patch
+ drm-msm-a5xx-remove-overwriting-a5xx_pc_dbg_eco_cntl.patch
diff --cc queue-4.19/series
index 28c155d4528,cb65ca32f8f..d31175d92ac
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@@ -19,7 -19,17 +19,21 @@@ rsxx-return-efault-if-copy_to_user-fail
  dm-verity-fix-fec-for-rs-roots-unaligned-to-block-size.patch
  r8169-fix-resuming-from-suspend-on-rtl8105e-if-machine-runs-on-battery.patch
  net-dsa-add-gro-support-via-gro_cells.patch
 +dm-table-fix-iterate_devices-based-device-capability-checks.patch
 +dm-table-fix-dax-iterate_devices-based-device-capability-checks.patch
 +dm-table-fix-zoned-iterate_devices-based-device-capability-checks.patch
 +iommu-amd-fix-sleeping-in-atomic-in-increase_address_space.patch
+ mwifiex-pcie-skip-cancel_work_sync-on-reset-failure-.patch
+ platform-x86-acer-wmi-cleanup-acer_cap_foo-defines.patch
+ platform-x86-acer-wmi-cleanup-accelerometer-device-h.patch
+ platform-x86-acer-wmi-add-new-force_caps-module-para.patch
+ platform-x86-acer-wmi-add-acer_cap_set_function_mode.patch
+ platform-x86-acer-wmi-add-support-for-sw_tablet_mode.patch
+ platform-x86-acer-wmi-add-acer_cap_kbd_dock-quirk-fo.patch
+ hid-mf-add-support-for-0079-1846-mayflash-dragonrise.patch
+ media-cx23885-add-more-quirks-for-reset-dma-on-some-.patch
+ asoc-intel-bytcr_rt5640-add-quirk-for-archos-cesium-.patch
+ pci-add-function-1-dma-alias-quirk-for-marvell-9215-.patch
+ misc-eeprom_93xx46-add-quirk-to-support-microchip-93.patch
+ drm-msm-a5xx-remove-overwriting-a5xx_pc_dbg_eco_cntl.patch
+ mmc-sdhci-of-dwcmshc-set-sdhci_quirk2_preset_value_b.patch
diff --cc queue-4.4/series
index cfdb3219833,bb692b71ce6..4b8a4e8b815
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@@ -2,4 -2,5 +2,6 @@@ futex-fix-irq-self-deadlock-and-satisfy
  futex-fix-spin_lock-spin_unlock_irq-imbalance.patch
  alsa-ctxfi-cthw20k2-fix-mask-on-conf-to-allow-4-bits.patch
  rsxx-return-efault-if-copy_to_user-fails.patch
 +dm-table-fix-iterate_devices-based-device-capability-checks.patch
+ platform-x86-acer-wmi-add-new-force_caps-module-para.patch
+ pci-add-function-1-dma-alias-quirk-for-marvell-9215-.patch
diff --cc queue-4.9/series
index ac010d76ca3,b29ee7d63db..90e3b949068
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@@ -3,6 -3,6 +3,9 @@@ btrfs-fix-raid6-qstripe-kmap.patc
  usbip-tools-fix-build-error-for-multiple-definition.patch
  alsa-ctxfi-cthw20k2-fix-mask-on-conf-to-allow-4-bits.patch
  rsxx-return-efault-if-copy_to_user-fails.patch
 +dm-table-fix-iterate_devices-based-device-capability-checks.patch
 +dm-table-fix-dax-iterate_devices-based-device-capability-checks.patch
 +iommu-amd-fix-sleeping-in-atomic-in-increase_address_space.patch
+ platform-x86-acer-wmi-add-new-force_caps-module-para.patch
+ pci-add-function-1-dma-alias-quirk-for-marvell-9215-.patch
+ misc-eeprom_93xx46-add-quirk-to-support-microchip-93.patch
diff --cc queue-5.10/series
index a7205e559c8,ed29ddb3eb7..d8ccdeeca60
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@@ -1,8 -1,42 +1,49 @@@
  acpica-fix-race-in-generic_serial_bus-i2c-and-gpio-op_region-parameter-handling.patch
 +asoc-sof-intel-broadwell-fix-mutual-exclusion-with-catpt-driver.patch
 +nvme-pci-mark-kingston-skc2000-as-not-supporting-the-deepest-power-state.patch
 +parisc-enable-mlong-calls-gcc-option-with-config_compile_test.patch
 +arm64-make-cpu_big_endian-depend-on-ld.bfd-or-ld.lld-13.0.0.patch
 +btrfs-export-and-rename-qgroup_reserve_meta.patch
 +btrfs-don-t-flush-from-btrfs_delayed_inode_reserve_metadata.patch
 +iommu-amd-fix-sleeping-in-atomic-in-increase_address_space.patch
+ asoc-intel-sof_rt5682-add-quirk-for-dooly.patch
+ bluetooth-btqca-add-valid-le-states-quirk.patch
+ mwifiex-pcie-skip-cancel_work_sync-on-reset-failure-.patch
+ asoc-intel-sof_sdw-add-quirk-for-new-tigerlake-sdca-.patch
+ bus-ti-sysc-implement-gpmc-debug-quirk-to-drop-platf.patch
+ net-ipa-ignore-channel_not_running-errors.patch
+ platform-x86-acer-wmi-cleanup-acer_cap_foo-defines.patch
+ platform-x86-acer-wmi-cleanup-accelerometer-device-h.patch
+ platform-x86-acer-wmi-add-new-force_caps-module-para.patch
+ platform-x86-acer-wmi-add-acer_cap_set_function_mode.patch
+ platform-x86-acer-wmi-add-support-for-sw_tablet_mode.patch
+ platform-x86-acer-wmi-add-acer_cap_kbd_dock-quirk-fo.patch
+ hid-mf-add-support-for-0079-1846-mayflash-dragonrise.patch
+ media-cx23885-add-more-quirks-for-reset-dma-on-some-.patch
+ acpi-video-add-dmi-quirk-for-gigabyte-gb-bxbt-2807.patch
+ asoc-intel-bytcr_rt5640-add-quirk-for-archos-cesium-.patch
+ usb-cdns3-host-add-.suspend_quirk-for-xhci-plat.c.patch
+ usb-cdns3-host-add-xhci_plat_priv-quirk-xhci_skip_ph.patch
+ usb-cdns3-add-quirk-for-enable-runtime-pm-by-default.patch
+ usb-cdns3-fix-null-pointer-dereference-on-no-platfor.patch
+ pci-add-function-1-dma-alias-quirk-for-marvell-9215-.patch
+ kvm-x86-supplement-__cr4_reserved_bits-with-x86_feat.patch
+ asoc-intel-sof_sdw-add-missing-tgl_hdmi-quirk-for-de.patch
+ scsi-ufs-mediatek-enable-ufshci_quirk_skip_manual_wb.patch
+ scsi-ufs-add-a-quirk-to-permit-overriding-unipro-def.patch
+ misc-eeprom_93xx46-add-quirk-to-support-microchip-93.patch
+ scsi-ufs-introduce-a-quirk-to-allow-only-page-aligne.patch
+ scsi-ufs-ufs-exynos-apply-vendor-specific-values-for.patch
+ scsi-ufs-ufs-exynos-use-ufshcd_quirk_align_sg_with_p.patch
+ drm-msm-a5xx-remove-overwriting-a5xx_pc_dbg_eco_cntl.patch
+ mmc-sdhci-of-dwcmshc-set-sdhci_quirk2_preset_value_b.patch
+ hid-i2c-hid-add-i2c_hid_quirk_no_irq_after_reset-for.patch
+ alsa-usb-audio-add-djm750-to-pioneer-mixer-quirk.patch
+ alsa-usb-audio-add-mixer-quirks-for-pioneer-djm-900n.patch
+ pci-cadence-retrain-link-to-work-around-gen2-trainin.patch
+ asoc-intel-sof_sdw-reorganize-quirks-by-generation.patch
+ asoc-intel-sof_sdw-add-quirk-for-hp-spectre-x360-con.patch
+ scsi-ufs-fix-a-duplicate-dev-quirk-number.patch
+ kvm-svm-clear-the-cr4-register-on-reset.patch
+ nvme-pci-mark-seagate-nytro-xm1440-as-quirk_no_ns_de.patch
+ nvme-pci-add-quirks-for-lexar-256gb-ssd.patch
diff --cc queue-5.11/series
index 81d575b00f0,64de92ee4cc..1a208926f17
--- a/queue-5.11/series
+++ b/queue-5.11/series
@@@ -1,17 -1,21 +1,36 @@@
  acpica-fix-race-in-generic_serial_bus-i2c-and-gpio-op_region-parameter-handling.patch
 +io_uring-fix-inconsistent-lock-state.patch
 +io_uring-deduplicate-core-cancellations-sequence.patch
 +io_uring-unpark-sqpoll-thread-for-cancelation.patch
 +io_uring-deduplicate-failing-task_work_add.patch
 +fs-provide-locked-helper-variant-of-close_fd_get_file.patch
 +io_uring-get-rid-of-intermediate-ioring_op_close-stage.patch
 +io_uring-io-wq-kill-off-now-unused-io_wq_work_no_cancel.patch
 +io_uring-io-wq-return-2-step-work-swap-scheme.patch
 +io_uring-don-t-take-uring_lock-during-iowq-cancel.patch
 +media-cedrus-remove-checking-for-required-controls.patch
 +nvme-pci-mark-kingston-skc2000-as-not-supporting-the-deepest-power-state.patch
 +parisc-enable-mlong-calls-gcc-option-with-config_compile_test.patch
 +arm64-make-cpu_big_endian-depend-on-ld.bfd-or-ld.lld-13.0.0.patch
 +btrfs-export-and-rename-qgroup_reserve_meta.patch
 +btrfs-don-t-flush-from-btrfs_delayed_inode_reserve_metadata.patch
 +iommu-amd-fix-sleeping-in-atomic-in-increase_address_space.patch
+ scsi-ufs-mediatek-enable-ufshci_quirk_skip_manual_wb.patch
+ scsi-ufs-add-a-quirk-to-permit-overriding-unipro-def.patch
+ misc-eeprom_93xx46-add-quirk-to-support-microchip-93.patch
+ scsi-ufs-introduce-a-quirk-to-allow-only-page-aligne.patch
+ scsi-ufs-ufs-exynos-apply-vendor-specific-values-for.patch
+ scsi-ufs-ufs-exynos-use-ufshcd_quirk_align_sg_with_p.patch
+ drm-msm-a5xx-remove-overwriting-a5xx_pc_dbg_eco_cntl.patch
+ mmc-sdhci-of-dwcmshc-set-sdhci_quirk2_preset_value_b.patch
+ hid-i2c-hid-add-i2c_hid_quirk_no_irq_after_reset-for.patch
+ alsa-usb-audio-add-djm750-to-pioneer-mixer-quirk.patch
+ alsa-usb-audio-add-mixer-quirks-for-pioneer-djm-900n.patch
+ hid-ite-enable-quirk_touchpad_on_off_report-on-acer-.patch
+ pci-cadence-retrain-link-to-work-around-gen2-trainin.patch
+ asoc-intel-sof_sdw-reorganize-quirks-by-generation.patch
+ asoc-intel-sof_sdw-add-quirk-for-hp-spectre-x360-con.patch
+ scsi-ufs-fix-a-duplicate-dev-quirk-number.patch
+ kvm-svm-clear-the-cr4-register-on-reset.patch
+ nvme-pci-mark-seagate-nytro-xm1440-as-quirk_no_ns_de.patch
 -nvme-pci-mark-kingston-skc2000-as-not-supporting-the.patch
+ nvme-pci-add-quirks-for-lexar-256gb-ssd.patch
diff --cc queue-5.4/series
index 308c81dfaa8,0d54571652a..8ab6ce4dadf
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@@ -3,4 -3,21 +3,22 @@@ dm-table-fix-iterate_devices-based-devi
  dm-table-fix-dax-iterate_devices-based-device-capability-checks.patch
  dm-table-fix-zoned-iterate_devices-based-device-capability-checks.patch
  acpica-fix-race-in-generic_serial_bus-i2c-and-gpio-op_region-parameter-handling.patch
 +iommu-amd-fix-sleeping-in-atomic-in-increase_address_space.patch
+ mwifiex-pcie-skip-cancel_work_sync-on-reset-failure-.patch
+ platform-x86-acer-wmi-cleanup-acer_cap_foo-defines.patch
+ platform-x86-acer-wmi-cleanup-accelerometer-device-h.patch
+ platform-x86-acer-wmi-add-new-force_caps-module-para.patch
+ platform-x86-acer-wmi-add-acer_cap_set_function_mode.patch
+ platform-x86-acer-wmi-add-support-for-sw_tablet_mode.patch
+ platform-x86-acer-wmi-add-acer_cap_kbd_dock-quirk-fo.patch
+ hid-mf-add-support-for-0079-1846-mayflash-dragonrise.patch
+ media-cx23885-add-more-quirks-for-reset-dma-on-some-.patch
+ acpi-video-add-dmi-quirk-for-gigabyte-gb-bxbt-2807.patch
+ asoc-intel-bytcr_rt5640-add-quirk-for-archos-cesium-.patch
+ pci-add-function-1-dma-alias-quirk-for-marvell-9215-.patch
+ misc-eeprom_93xx46-add-quirk-to-support-microchip-93.patch
+ drm-msm-a5xx-remove-overwriting-a5xx_pc_dbg_eco_cntl.patch
+ mmc-sdhci-of-dwcmshc-set-sdhci_quirk2_preset_value_b.patch
+ hid-i2c-hid-add-i2c_hid_quirk_no_irq_after_reset-for.patch
+ nvme-pci-mark-seagate-nytro-xm1440-as-quirk_no_ns_de.patch
+ nvme-pci-add-quirks-for-lexar-256gb-ssd.patch