From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 12 Aug 2024 10:32:38 +0000 (+0200)
Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v6.1.105~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2681e930c1d778de233358abd2c1567170b4fa6b;p=thirdparty%2Fkernel%2Fstable-queue.git

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

2681e930c1d778de233358abd2c1567170b4fa6b
diff --cc queue-5.10/series
index 7e3a785dd21,f2c5b359c1b..fb9f2b84b44
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@@ -314,8 -314,8 +314,13 @@@ alsa-line6-fix-racy-access-to-midibuf.p
  alsa-hda-add-hp-mp9-g4-retail-system-ams-to-force-connect-list.patch
  alsa-hda-hdmi-yet-more-pin-fix-for-hp-elitedesk-800-g4.patch
  usb-vhci-hcd-do-not-drop-references-before-new-references-are-gained.patch
 +usb-serial-debug-do-not-echo-input-by-default.patch
 +usb-gadget-core-check-for-unset-descriptor.patch
 +usb-gadget-u_serial-set-start_delayed-during-suspend.patch
 +scsi-ufs-core-fix-hba-last_dme_cmd_tstamp-timestamp-updating-logic.patch
 +tick-broadcast-move-per-cpu-pointer-access-into-the-atomic-section.patch
+ ntp-clamp-maxerror-and-esterror-to-operating-range.patch
+ scsi-mpt3sas-remove-scsi_dma_map-error-messages.patch
+ scsi-mpt3sas-avoid-iommu-page-faults-on-report-zones.patch
+ irqchip-meson-gpio-support-more-than-8-channels-gpio.patch
+ irqchip-meson-gpio-convert-meson_gpio_irq_controller.patch
diff --cc queue-5.15/series
index c829a7541fa,8082793ff54..f72e250bab9
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@@ -443,9 -443,10 +443,16 @@@ alsa-hda-add-hp-mp9-g4-retail-system-am
  alsa-hda-hdmi-yet-more-pin-fix-for-hp-elitedesk-800-g4.patch
  usb-vhci-hcd-do-not-drop-references-before-new-references-are-gained.patch
  usb-serial-debug-do-not-echo-input-by-default.patch
 +usb-gadget-core-check-for-unset-descriptor.patch
 +usb-gadget-u_serial-set-start_delayed-during-suspend.patch
 +scsi-mpi3mr-avoid-iommu-page-faults-on-report-zones.patch
 +scsi-ufs-core-fix-hba-last_dme_cmd_tstamp-timestamp-updating-logic.patch
 +tick-broadcast-move-per-cpu-pointer-access-into-the-atomic-section.patch
 +vhost-vdpa-switch-to-use-vmf_insert_pfn-in-the-fault-handler.patch
+ ntp-clamp-maxerror-and-esterror-to-operating-range.patch
+ clocksource-reduce-the-default-clocksource_watchdog-.patch
+ torture-enable-clocksource-watchdog-with-tsc-watchdo.patch
+ clocksource-scale-the-watchdog-read-retries-automati.patch
+ clocksource-fix-brown-bag-boolean-thinko-in-cs_watch.patch
+ irqchip-meson-gpio-support-more-than-8-channels-gpio.patch
+ irqchip-meson-gpio-convert-meson_gpio_irq_controller.patch
diff --cc queue-5.4/series
index 6fd763193e0,94e6e00c826..db6c31e2411
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@@ -230,7 -230,6 +230,10 @@@ alsa-line6-fix-racy-access-to-midibuf.p
  alsa-hda-add-hp-mp9-g4-retail-system-ams-to-force-connect-list.patch
  alsa-hda-hdmi-yet-more-pin-fix-for-hp-elitedesk-800-g4.patch
  usb-vhci-hcd-do-not-drop-references-before-new-references-are-gained.patch
 +usb-serial-debug-do-not-echo-input-by-default.patch
 +usb-gadget-core-check-for-unset-descriptor.patch
 +scsi-ufs-core-fix-hba-last_dme_cmd_tstamp-timestamp-updating-logic.patch
 +tick-broadcast-move-per-cpu-pointer-access-into-the-atomic-section.patch
+ ntp-clamp-maxerror-and-esterror-to-operating-range.patch
+ scsi-mpt3sas-remove-scsi_dma_map-error-messages.patch
+ scsi-mpt3sas-avoid-iommu-page-faults-on-report-zones.patch
diff --cc queue-6.1/series
index c19eb663ac3,cf6c7f228c4..39934b37b31
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@@ -92,10 -92,7 +92,14 @@@ alsa-hda-realtek-add-framework-laptop-1
  alsa-hda-hdmi-yet-more-pin-fix-for-hp-elitedesk-800-g4.patch
  usb-vhci-hcd-do-not-drop-references-before-new-references-are-gained.patch
  usb-serial-debug-do-not-echo-input-by-default.patch
 +usb-gadget-core-check-for-unset-descriptor.patch
 +usb-gadget-u_serial-set-start_delayed-during-suspend.patch
 +usb-gadget-u_audio-check-return-codes-from-usb_ep_enable-and-config_ep_by_speed.patch
 +scsi-mpi3mr-avoid-iommu-page-faults-on-report-zones.patch
 +scsi-ufs-core-fix-hba-last_dme_cmd_tstamp-timestamp-updating-logic.patch
 +tick-broadcast-move-per-cpu-pointer-access-into-the-atomic-section.patch
 +vhost-vdpa-switch-to-use-vmf_insert_pfn-in-the-fault-handler.patch
+ ntp-clamp-maxerror-and-esterror-to-operating-range.patch
+ torture-enable-clocksource-watchdog-with-tsc-watchdo.patch
+ clocksource-scale-the-watchdog-read-retries-automati.patch
+ clocksource-fix-brown-bag-boolean-thinko-in-cs_watch.patch
diff --cc queue-6.6/series
index cfb9f594a69,8a1ede12018..aa62dbfc270
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@@ -116,12 -116,6 +116,15 @@@ alsa-hda-realtek-add-framework-laptop-1
  alsa-hda-hdmi-yet-more-pin-fix-for-hp-elitedesk-800-g4.patch
  usb-vhci-hcd-do-not-drop-references-before-new-references-are-gained.patch
  usb-serial-debug-do-not-echo-input-by-default.patch
 +usb-gadget-core-check-for-unset-descriptor.patch
 +usb-gadget-midi2-fix-the-response-for-fb-info-with-block-0xff.patch
 +usb-gadget-u_serial-set-start_delayed-during-suspend.patch
 +usb-gadget-u_audio-check-return-codes-from-usb_ep_enable-and-config_ep_by_speed.patch
 +scsi-mpi3mr-avoid-iommu-page-faults-on-report-zones.patch
 +scsi-ufs-core-do-not-set-link-to-off-state-while-waking-up-from-hibernation.patch
 +scsi-ufs-core-fix-hba-last_dme_cmd_tstamp-timestamp-updating-logic.patch
 +tick-broadcast-move-per-cpu-pointer-access-into-the-atomic-section.patch
 +vhost-vdpa-switch-to-use-vmf_insert_pfn-in-the-fault-handler.patch
+ ntp-clamp-maxerror-and-esterror-to-operating-range.patch
+ clocksource-scale-the-watchdog-read-retries-automati.patch
+ clocksource-fix-brown-bag-boolean-thinko-in-cs_watch.patch