From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 25 Apr 2022 10:30:34 +0000 (+0200)
Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v4.9.312~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6122026630fe585020538ed869fc61d4fdf2eed;p=thirdparty%2Fkernel%2Fstable-queue.git

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

c6122026630fe585020538ed869fc61d4fdf2eed
diff --cc queue-4.14/series
index 0098dbef67e,23d0a1daef0..6f8d1144f86
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@@ -19,5 -19,4 +19,6 @@@ brcmfmac-sdio-fix-undefined-behavior-du
  drm-msm-mdp5-check-the-return-of-kzalloc.patch
  net-macb-restart-tx-only-if-queue-pointer-is-lagging.patch
  stat-fix-inconsistency-between-struct-stat-and-struc.patch
 +ata-pata_marvell-check-the-bmdma_addr-beforing-reading.patch
 +dma-at_xdmac-fix-a-missing-check-on-list-iterator.patch
+ powerpc-perf-fix-power9-event-alternatives.patch
diff --cc queue-4.19/series
index 9ee0d7feed8,9a855707290..cfa10c23975
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@@ -26,5 -26,6 +26,8 @@@ dpaa_eth-fix-missing-of_node_put-in-dpa
  drm-msm-mdp5-check-the-return-of-kzalloc.patch
  net-macb-restart-tx-only-if-queue-pointer-is-lagging.patch
  stat-fix-inconsistency-between-struct-stat-and-struc.patch
 +ata-pata_marvell-check-the-bmdma_addr-beforing-reading.patch
 +dma-at_xdmac-fix-a-missing-check-on-list-iterator.patch
+ drm-panel-raspberrypi-touchscreen-avoid-null-deref-i.patch
+ drm-panel-raspberrypi-touchscreen-initialise-the-bri.patch
+ powerpc-perf-fix-power9-event-alternatives.patch
diff --cc queue-5.10/series
index f9ac328ab35,a4afce3003c..40366d86501
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@@ -48,10 -48,11 +48,18 @@@ scsi-qedi-fix-failed-disconnect-handlin
  stat-fix-inconsistency-between-struct-stat-and-struc.patch
  nvme-add-a-quirk-to-disable-namespace-identifiers.patch
  nvme-pci-disable-namespace-identifiers-for-qemu-cont.patch
 +edac-synopsys-read-the-error-count-from-the-correct-register.patch
 +mm-hugetlb-allow-for-high-userspace-addresses.patch
 +oom_kill.c-futex-delay-the-oom-reaper-to-allow-time-for-proper-futex-cleanup.patch
 +mm-mmu_notifier.c-fix-race-in-mmu_interval_notifier_remove.patch
 +ata-pata_marvell-check-the-bmdma_addr-beforing-reading.patch
 +dma-at_xdmac-fix-a-missing-check-on-list-iterator.patch
 +net-atlantic-invert-deep-par-in-pm-functions-preventing-null-derefs.patch
+ sched-pelt-fix-attach_entity_load_avg-corner-case.patch
+ perf-core-fix-perf_mmap-fail-when-config_perf_use_vm.patch
+ drm-panel-raspberrypi-touchscreen-avoid-null-deref-i.patch
+ drm-panel-raspberrypi-touchscreen-initialise-the-bri.patch
+ kvm-ppc-fix-tce-handling-for-vfio.patch
+ drm-vc4-use-pm_runtime_resume_and_get-to-fix-pm_runt.patch
+ powerpc-perf-fix-power9-event-alternatives.patch
+ perf-report-set-perf_sample_data_src-bit-for-arm-spe.patch
diff --cc queue-5.15/series
index bc761162613,29e2573eb2b..aafdb539e6e
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@@ -74,13 -74,15 +74,25 @@@ vfs-filename_create-fix-incorrect-inten
  nvme-add-a-quirk-to-disable-namespace-identifiers.patch
  nvme-pci-disable-namespace-identifiers-for-the-maxio.patch
  nvme-pci-disable-namespace-identifiers-for-qemu-cont.patch
 +edac-synopsys-read-the-error-count-from-the-correct-register.patch
 +mm-memory-failure.c-skip-huge_zero_page-in-memory_failure.patch
 +memcg-sync-flush-only-if-periodic-flush-is-delayed.patch
 +mm-hugetlb-allow-for-high-userspace-addresses.patch
 +oom_kill.c-futex-delay-the-oom-reaper-to-allow-time-for-proper-futex-cleanup.patch
 +mm-mmu_notifier.c-fix-race-in-mmu_interval_notifier_remove.patch
 +ata-pata_marvell-check-the-bmdma_addr-beforing-reading.patch
 +dma-at_xdmac-fix-a-missing-check-on-list-iterator.patch
 +dmaengine-imx-sdma-fix-init-of-uart-scripts.patch
 +net-atlantic-invert-deep-par-in-pm-functions-preventing-null-derefs.patch
+ input-omap4-keypad-fix-pm_runtime_get_sync-error-che.patch
+ scsi-sr-do-not-leak-information-in-ioctl.patch
+ sched-pelt-fix-attach_entity_load_avg-corner-case.patch
+ perf-core-fix-perf_mmap-fail-when-config_perf_use_vm.patch
+ drm-panel-raspberrypi-touchscreen-avoid-null-deref-i.patch
+ drm-panel-raspberrypi-touchscreen-initialise-the-bri.patch
+ kvm-ppc-fix-tce-handling-for-vfio.patch
+ drm-vc4-use-pm_runtime_resume_and_get-to-fix-pm_runt.patch
+ powerpc-perf-fix-power9-event-alternatives.patch
+ powerpc-perf-fix-power10-event-alternatives.patch
+ perf-script-always-allow-field-data_src-for-auxtrace.patch
+ perf-report-set-perf_sample_data_src-bit-for-arm-spe.patch
diff --cc queue-5.17/series
index 2d30b51b2e8,67338fc55cb..d1a2c344c1f
--- a/queue-5.17/series
+++ b/queue-5.17/series
@@@ -85,13 -85,19 +85,29 @@@ nvme-add-a-quirk-to-disable-namespace-i
  nvme-pci-disable-namespace-identifiers-for-the-maxio.patch
  nvme-pci-disable-namespace-identifiers-for-qemu-cont.patch
  irq_work-use-kasan_record_aux_stack_noalloc-record-c.patch
 +edac-synopsys-read-the-error-count-from-the-correct-register.patch
 +mm-memory-failure.c-skip-huge_zero_page-in-memory_failure.patch
 +memcg-sync-flush-only-if-periodic-flush-is-delayed.patch
 +mm-hugetlb-allow-for-high-userspace-addresses.patch
 +oom_kill.c-futex-delay-the-oom-reaper-to-allow-time-for-proper-futex-cleanup.patch
 +mm-mmu_notifier.c-fix-race-in-mmu_interval_notifier_remove.patch
 +ata-pata_marvell-check-the-bmdma_addr-beforing-reading.patch
 +dma-at_xdmac-fix-a-missing-check-on-list-iterator.patch
 +dmaengine-imx-sdma-fix-init-of-uart-scripts.patch
 +net-atlantic-invert-deep-par-in-pm-functions-preventing-null-derefs.patch
+ drm-radeon-fix-logic-inversion-in-radeon_sync_resv.patch
+ io_uring-free-iovec-if-file-assignment-fails.patch
+ input-omap4-keypad-fix-pm_runtime_get_sync-error-che.patch
+ scsi-sr-do-not-leak-information-in-ioctl.patch
+ sched-pelt-fix-attach_entity_load_avg-corner-case.patch
+ perf-core-fix-perf_mmap-fail-when-config_perf_use_vm.patch
+ drm-panel-raspberrypi-touchscreen-avoid-null-deref-i.patch
+ drm-panel-raspberrypi-touchscreen-initialise-the-bri.patch
+ powerpc-time-always-set-decrementer-in-timer_interru.patch
+ kvm-ppc-fix-tce-handling-for-vfio.patch
+ drm-vc4-use-pm_runtime_resume_and_get-to-fix-pm_runt.patch
+ powerpc-perf-fix-power9-event-alternatives.patch
+ powerpc-perf-fix-power10-event-alternatives.patch
+ arm-xen-fix-some-refcount-leaks.patch
+ perf-script-always-allow-field-data_src-for-auxtrace.patch
+ perf-report-set-perf_sample_data_src-bit-for-arm-spe.patch
diff --cc queue-5.4/series
index 487f34f6e98,882bf5abc7f..725ba03f4f0
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@@ -33,7 -33,8 +33,12 @@@ drm-msm-mdp5-check-the-return-of-kzallo
  net-macb-restart-tx-only-if-queue-pointer-is-lagging.patch
  scsi-qedi-fix-failed-disconnect-handling.patch
  stat-fix-inconsistency-between-struct-stat-and-struc.patch
 +edac-synopsys-read-the-error-count-from-the-correct-register.patch
 +oom_kill.c-futex-delay-the-oom-reaper-to-allow-time-for-proper-futex-cleanup.patch
 +ata-pata_marvell-check-the-bmdma_addr-beforing-reading.patch
 +dma-at_xdmac-fix-a-missing-check-on-list-iterator.patch
+ drm-panel-raspberrypi-touchscreen-avoid-null-deref-i.patch
+ drm-panel-raspberrypi-touchscreen-initialise-the-bri.patch
+ kvm-ppc-fix-tce-handling-for-vfio.patch
+ drm-vc4-use-pm_runtime_resume_and_get-to-fix-pm_runt.patch
+ powerpc-perf-fix-power9-event-alternatives.patch