From: Greg Kroah-Hartman Date: Sun, 19 Jan 2025 08:05:53 +0000 (+0100) Subject: move 6.1 queue back in place X-Git-Tag: v6.6.73~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a346ab8ff4bce6d19335128cd287bae8886659c;p=thirdparty%2Fkernel%2Fstable-queue.git move 6.1 queue back in place --- diff --git a/temp-6.1/bpf-fix-bpf_sk_select_reuseport-memory-leak.patch b/queue-6.1/bpf-fix-bpf_sk_select_reuseport-memory-leak.patch similarity index 100% rename from temp-6.1/bpf-fix-bpf_sk_select_reuseport-memory-leak.patch rename to queue-6.1/bpf-fix-bpf_sk_select_reuseport-memory-leak.patch diff --git a/temp-6.1/drm-v3d-ensure-job-pointer-is-set-to-null-after-job-.patch b/queue-6.1/drm-v3d-ensure-job-pointer-is-set-to-null-after-job-.patch similarity index 100% rename from temp-6.1/drm-v3d-ensure-job-pointer-is-set-to-null-after-job-.patch rename to queue-6.1/drm-v3d-ensure-job-pointer-is-set-to-null-after-job-.patch diff --git a/temp-6.1/gtp-destroy-device-along-with-udp-socket-s-netns-dis.patch b/queue-6.1/gtp-destroy-device-along-with-udp-socket-s-netns-dis.patch similarity index 100% rename from temp-6.1/gtp-destroy-device-along-with-udp-socket-s-netns-dis.patch rename to queue-6.1/gtp-destroy-device-along-with-udp-socket-s-netns-dis.patch diff --git a/temp-6.1/gtp-use-exit_batch_rtnl-method.patch b/queue-6.1/gtp-use-exit_batch_rtnl-method.patch similarity index 100% rename from temp-6.1/gtp-use-exit_batch_rtnl-method.patch rename to queue-6.1/gtp-use-exit_batch_rtnl-method.patch diff --git a/temp-6.1/gtp-use-for_each_netdev_rcu-in-gtp_genl_dump_pdp.patch b/queue-6.1/gtp-use-for_each_netdev_rcu-in-gtp_genl_dump_pdp.patch similarity index 100% rename from temp-6.1/gtp-use-for_each_netdev_rcu-in-gtp_genl_dump_pdp.patch rename to queue-6.1/gtp-use-for_each_netdev_rcu-in-gtp_genl_dump_pdp.patch diff --git a/temp-6.1/hwmon-tmp513-fix-division-of-negative-numbers.patch b/queue-6.1/hwmon-tmp513-fix-division-of-negative-numbers.patch similarity index 100% rename from temp-6.1/hwmon-tmp513-fix-division-of-negative-numbers.patch rename to queue-6.1/hwmon-tmp513-fix-division-of-negative-numbers.patch diff --git a/temp-6.1/i2c-mux-demux-pinctrl-check-initial-mux-selection-to.patch b/queue-6.1/i2c-mux-demux-pinctrl-check-initial-mux-selection-to.patch similarity index 100% rename from temp-6.1/i2c-mux-demux-pinctrl-check-initial-mux-selection-to.patch rename to queue-6.1/i2c-mux-demux-pinctrl-check-initial-mux-selection-to.patch diff --git a/temp-6.1/i2c-rcar-fix-nack-handling-when-being-a-target.patch b/queue-6.1/i2c-rcar-fix-nack-handling-when-being-a-target.patch similarity index 100% rename from temp-6.1/i2c-rcar-fix-nack-handling-when-being-a-target.patch rename to queue-6.1/i2c-rcar-fix-nack-handling-when-being-a-target.patch diff --git a/temp-6.1/net-add-exit_batch_rtnl-method.patch b/queue-6.1/net-add-exit_batch_rtnl-method.patch similarity index 100% rename from temp-6.1/net-add-exit_batch_rtnl-method.patch rename to queue-6.1/net-add-exit_batch_rtnl-method.patch diff --git a/temp-6.1/net-ethernet-ti-cpsw_ale-fix-cpsw_ale_get_field.patch b/queue-6.1/net-ethernet-ti-cpsw_ale-fix-cpsw_ale_get_field.patch similarity index 100% rename from temp-6.1/net-ethernet-ti-cpsw_ale-fix-cpsw_ale_get_field.patch rename to queue-6.1/net-ethernet-ti-cpsw_ale-fix-cpsw_ale_get_field.patch diff --git a/temp-6.1/net-mlx5-clear-port-select-structure-when-fail-to-cr.patch b/queue-6.1/net-mlx5-clear-port-select-structure-when-fail-to-cr.patch similarity index 100% rename from temp-6.1/net-mlx5-clear-port-select-structure-when-fail-to-cr.patch rename to queue-6.1/net-mlx5-clear-port-select-structure-when-fail-to-cr.patch diff --git a/temp-6.1/net-mlx5-fix-rdma-tx-steering-prio.patch b/queue-6.1/net-mlx5-fix-rdma-tx-steering-prio.patch similarity index 100% rename from temp-6.1/net-mlx5-fix-rdma-tx-steering-prio.patch rename to queue-6.1/net-mlx5-fix-rdma-tx-steering-prio.patch diff --git a/temp-6.1/net-xilinx-axienet-fix-irq-coalescing-packet-count-o.patch b/queue-6.1/net-xilinx-axienet-fix-irq-coalescing-packet-count-o.patch similarity index 100% rename from temp-6.1/net-xilinx-axienet-fix-irq-coalescing-packet-count-o.patch rename to queue-6.1/net-xilinx-axienet-fix-irq-coalescing-packet-count-o.patch diff --git a/temp-6.1/nfp-bpf-prevent-integer-overflow-in-nfp_bpf_event_ou.patch b/queue-6.1/nfp-bpf-prevent-integer-overflow-in-nfp_bpf_event_ou.patch similarity index 100% rename from temp-6.1/nfp-bpf-prevent-integer-overflow-in-nfp_bpf_event_ou.patch rename to queue-6.1/nfp-bpf-prevent-integer-overflow-in-nfp_bpf_event_ou.patch diff --git a/temp-6.1/openvswitch-fix-lockup-on-tx-to-unregistering-netdev.patch b/queue-6.1/openvswitch-fix-lockup-on-tx-to-unregistering-netdev.patch similarity index 100% rename from temp-6.1/openvswitch-fix-lockup-on-tx-to-unregistering-netdev.patch rename to queue-6.1/openvswitch-fix-lockup-on-tx-to-unregistering-netdev.patch diff --git a/temp-6.1/pktgen-avoid-out-of-bounds-access-in-get_imix_entrie.patch b/queue-6.1/pktgen-avoid-out-of-bounds-access-in-get_imix_entrie.patch similarity index 100% rename from temp-6.1/pktgen-avoid-out-of-bounds-access-in-get_imix_entrie.patch rename to queue-6.1/pktgen-avoid-out-of-bounds-access-in-get_imix_entrie.patch diff --git a/temp-6.1/revert-mtd-spi-nor-core-replace-dummy-buswidth-from-.patch b/queue-6.1/revert-mtd-spi-nor-core-replace-dummy-buswidth-from-.patch similarity index 100% rename from temp-6.1/revert-mtd-spi-nor-core-replace-dummy-buswidth-from-.patch rename to queue-6.1/revert-mtd-spi-nor-core-replace-dummy-buswidth-from-.patch diff --git a/temp-6.1/series b/queue-6.1/series similarity index 91% rename from temp-6.1/series rename to queue-6.1/series index 5b7f003a6d..a7f70c1345 100644 --- a/temp-6.1/series +++ b/queue-6.1/series @@ -1,4 +1,3 @@ -partial-revert-of-xhci-use-pm_ptr-instead-ifdef-for-config_pm-conditionals.patch net-ethernet-ti-cpsw_ale-fix-cpsw_ale_get_field.patch bpf-fix-bpf_sk_select_reuseport-memory-leak.patch openvswitch-fix-lockup-on-tx-to-unregistering-netdev.patch diff --git a/temp-6.1/partial-revert-of-xhci-use-pm_ptr-instead-ifdef-for-config_pm-conditionals.patch b/temp-6.1/partial-revert-of-xhci-use-pm_ptr-instead-ifdef-for-config_pm-conditionals.patch deleted file mode 100644 index 0756bf271c..0000000000 --- a/temp-6.1/partial-revert-of-xhci-use-pm_ptr-instead-ifdef-for-config_pm-conditionals.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: Ron Economos -Date: Sat, 18 Jan 2025 04:24:09 -0800 -Subject: Partial revert of xhci: use pm_ptr() instead #ifdef for CONFIG_PM conditionals -To: Greg Kroah-Hartman , stable@vger.kernel.org -Cc: Pavel Machek , linux-kernel@vger.kernel.org, Ron Economos -Message-ID: <20250118122409.4052121-1-re@w6rz.net> - -commit 9734fd7a2777 ("xhci: use pm_ptr() instead of #ifdef for CONFIG_PM -conditionals") did not quite work properly in the 6.1.y branch where it was -applied to fix a build error when CONFIG_PM was set as it left the following -build errors still present: - - ERROR: modpost: "xhci_suspend" [drivers/usb/host/xhci-pci.ko] undefined! - ERROR: modpost: "xhci_resume" [drivers/usb/host/xhci-pci.ko] undefined! - -Fix this up by properly placing the #ifdef CONFIG_PM in the xhci-pci.c and -hcd.h files to handle this correctly. - -Link: https://lore.kernel.org/r/133dbfa0-4a37-4ae0-bb95-1a35f668ec11@w6rz.net -Signed-off-by: Ron Economos -Link: https://lore.kernel.org/r/d0919169-ee06-4bdd-b2e3-2f776db90971@roeck-us.net -Reported-by: Guenter Roeck -[ Trimmed the partial revert down to an even smaller bit to only be what - is required to fix the build error - gregkh] -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/host/xhci-pci.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/usb/host/xhci-pci.c -+++ b/drivers/usb/host/xhci-pci.c -@@ -571,6 +571,7 @@ static void xhci_pci_remove(struct pci_d - pci_set_power_state(dev, PCI_D3hot); - } - -+#ifdef CONFIG_PM - /* - * In some Intel xHCI controllers, in order to get D3 working, - * through a vendor specific SSIC CONFIG register at offset 0x883c, -@@ -720,6 +721,7 @@ static void xhci_pci_shutdown(struct usb - if (xhci->quirks & XHCI_SPURIOUS_WAKEUP) - pci_set_power_state(pdev, PCI_D3hot); - } -+#endif /* CONFIG_PM */ - - /*-------------------------------------------------------------------------*/ - -@@ -769,9 +771,11 @@ static struct pci_driver xhci_pci_driver - static int __init xhci_pci_init(void) - { - xhci_init_driver(&xhci_pci_hc_driver, &xhci_pci_overrides); -+#ifdef CONFIG_PM - xhci_pci_hc_driver.pci_suspend = xhci_pci_suspend; - xhci_pci_hc_driver.pci_resume = xhci_pci_resume; - xhci_pci_hc_driver.shutdown = xhci_pci_shutdown; -+#endif - return pci_register_driver(&xhci_pci_driver); - } - module_init(xhci_pci_init);