From: Sasha Levin Date: Thu, 17 Sep 2020 01:40:12 +0000 (-0400) Subject: Rearrange patches to avoid introducing locking imbalance X-Git-Tag: v4.19.146~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fb168d5a37ea0e1ddcc54f5486974329b9dca80;p=thirdparty%2Fkernel%2Fstable-queue.git Rearrange patches to avoid introducing locking imbalance Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/series b/queue-4.14/series index ec0da1437df..c850d82d489 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -1,7 +1,6 @@ arm-dts-socfpga-fix-register-entry-for-timer3-on-arr.patch rdma-rxe-fix-memleak-in-rxe_mem_init_user.patch rdma-rxe-drop-pointless-checks-in-rxe_init_ports.patch -iio-adc-mcp3422-fix-locking-on-error-path.patch scsi-libsas-set-data_dir-as-dma_none-if-libata-marks.patch rdma-core-fix-reported-speed-and-width.patch mmc-sdhci-msm-add-retries-when-all-tuning-phases-are.patch @@ -22,6 +21,7 @@ cpufreq-intel_pstate-refuse-to-turn-off-with-hwp-ena.patch alsa-hda-fix-a-runtime-pm-issue-in-sof-when-integrat.patch gcov-disable-gcov-build-with-gcc-10.patch iio-adc-mcp3422-fix-locking-scope.patch +iio-adc-mcp3422-fix-locking-on-error-path.patch iio-adc-ti-ads1015-fix-conversion-when-config_pm-is-not-set.patch iio-light-ltr501-fix-timestamp-alignment-issue.patch iio-accel-bmc150-accel-fix-timestamp-alignment-and-prevent-data-leak.patch diff --git a/queue-4.19/series b/queue-4.19/series index 681347c8c46..3a1849caced 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -6,7 +6,6 @@ rdma-rxe-fix-memleak-in-rxe_mem_init_user.patch rdma-rxe-drop-pointless-checks-in-rxe_init_ports.patch rdma-bnxt_re-do-not-report-transparent-vlan-from-qp1.patch drm-sun4i-fix-dsi-dcs-long-write-function.patch -iio-adc-mcp3422-fix-locking-on-error-path.patch scsi-libsas-set-data_dir-as-dma_none-if-libata-marks.patch rdma-core-fix-reported-speed-and-width.patch mmc-sdhci-msm-add-retries-when-all-tuning-phases-are.patch @@ -37,6 +36,7 @@ drm-amdgpu-fix-bug-in-reporting-voltage-for-cik.patch iommu-amd-do-not-use-iommuv2-functionality-when-sme-.patch gcov-disable-gcov-build-with-gcc-10.patch iio-adc-mcp3422-fix-locking-scope.patch +iio-adc-mcp3422-fix-locking-on-error-path.patch iio-adc-ti-ads1015-fix-conversion-when-config_pm-is-not-set.patch iio-light-ltr501-fix-timestamp-alignment-issue.patch iio-accel-bmc150-accel-fix-timestamp-alignment-and-prevent-data-leak.patch diff --git a/queue-4.4/series b/queue-4.4/series index 1185fd8bb2e..5fa68177547 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -1,5 +1,4 @@ arm-dts-socfpga-fix-register-entry-for-timer3-on-arr.patch -iio-adc-mcp3422-fix-locking-on-error-path.patch scsi-libsas-set-data_dir-as-dma_none-if-libata-marks.patch drivers-net-wan-lapbether-added-needed_tailroom.patch firestream-fix-memleak-in-fs_open.patch @@ -9,6 +8,7 @@ drivers-net-wan-hdlc_cisco-add-hard_header_len.patch alsa-hda-fix-a-runtime-pm-issue-in-sof-when-integrat.patch gcov-disable-gcov-build-with-gcc-10.patch iio-adc-mcp3422-fix-locking-scope.patch +iio-adc-mcp3422-fix-locking-on-error-path.patch iio-light-ltr501-fix-timestamp-alignment-issue.patch iio-accel-bmc150-accel-fix-timestamp-alignment-and-prevent-data-leak.patch iio-accel-mma8452-fix-timestamp-alignment-and-prevent-data-leak.patch diff --git a/queue-4.9/series b/queue-4.9/series index 7d70b143e50..9fc29bd4058 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -1,7 +1,6 @@ arm-dts-socfpga-fix-register-entry-for-timer3-on-arr.patch rdma-rxe-fix-memleak-in-rxe_mem_init_user.patch rdma-rxe-drop-pointless-checks-in-rxe_init_ports.patch -iio-adc-mcp3422-fix-locking-on-error-path.patch scsi-libsas-set-data_dir-as-dma_none-if-libata-marks.patch drivers-net-wan-lapbether-added-needed_tailroom.patch nfc-st95hf-fix-memleak-in-st95hf_in_send_cmd.patch @@ -14,6 +13,7 @@ drivers-net-wan-hdlc_cisco-add-hard_header_len.patch alsa-hda-fix-a-runtime-pm-issue-in-sof-when-integrat.patch gcov-disable-gcov-build-with-gcc-10.patch iio-adc-mcp3422-fix-locking-scope.patch +iio-adc-mcp3422-fix-locking-on-error-path.patch iio-adc-ti-ads1015-fix-conversion-when-config_pm-is-not-set.patch iio-light-ltr501-fix-timestamp-alignment-issue.patch iio-accel-bmc150-accel-fix-timestamp-alignment-and-prevent-data-leak.patch diff --git a/queue-5.4/series b/queue-5.4/series index e33bd8acd62..570c10b8ba5 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -15,6 +15,7 @@ drm-sun4i-add-missing-put_device-call-in-sun8i_r40_t.patch arm64-dts-imx8mq-fix-tmu-interrupt-property.patch drm-sun4i-fix-dsi-dcs-long-write-function.patch iio-adc-mcp3422-fix-locking-on-error-path.patch +iio-adc-mcp3422-fix-locking-scope.patch scsi-libsas-set-data_dir-as-dma_none-if-libata-marks.patch rdma-core-fix-reported-speed-and-width.patch scsi-megaraid_sas-don-t-call-disable_irq-from-proces.patch @@ -71,7 +72,6 @@ alsa-hda-fix-a-runtime-pm-issue-in-sof-when-integrat.patch drm-amdgpu-fix-bug-in-reporting-voltage-for-cik.patch iommu-amd-do-not-use-iommuv2-functionality-when-sme-.patch gcov-disable-gcov-build-with-gcc-10.patch -iio-adc-mcp3422-fix-locking-scope.patch iio-adc-ti-ads1015-fix-conversion-when-config_pm-is-not-set.patch iio-cros_ec-set-gyroscope-default-frequency-to-25hz.patch iio-light-ltr501-fix-timestamp-alignment-issue.patch diff --git a/queue-5.8/series b/queue-5.8/series index ed2f1745de1..8401da9bf24 100644 --- a/queue-5.8/series +++ b/queue-5.8/series @@ -24,7 +24,6 @@ drm-sun4i-add-missing-put_device-call-in-sun8i_r40_t.patch arm64-dts-imx8mq-fix-tmu-interrupt-property.patch drm-sun4i-fix-dsi-dcs-long-write-function.patch scsi-qla2xxx-fix-regression-on-sparc64.patch -iio-adc-mcp3422-fix-locking-on-error-path.patch scsi-libsas-set-data_dir-as-dma_none-if-libata-marks.patch drm-virtio-fix-unblank.patch rdma-core-fix-unsafe-linked-list-traversal-after-fai.patch @@ -107,6 +106,7 @@ iommu-amd-do-not-force-direct-mapping-when-sme-is-ac.patch iommu-amd-do-not-use-iommuv2-functionality-when-sme-.patch gcov-disable-gcov-build-with-gcc-10.patch iio-adc-mcp3422-fix-locking-scope.patch +iio-adc-mcp3422-fix-locking-on-error-path.patch iio-adc-ti-ads1015-fix-conversion-when-config_pm-is-not-set.patch iio-cros_ec-set-gyroscope-default-frequency-to-25hz.patch iio-light-ltr501-fix-timestamp-alignment-issue.patch