Re: [PATCH 6.1 00/92] 6.1.125-rc1 review

[Guenter Roeck]

On 1/15/25 02:36, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 6.1.125 release.
> There are 92 patches in this series, all will be posted as a response
> to this one.  If anyone has any issues with these being applied, please
> let me know.
>
> Responses should be made by Fri, 17 Jan 2025 10:34:58 +0000.
> Anything received after that time might be too late.

Various allmodconfig builds fail. Example:

Building csky:allmodconfig ... failed
--------------
Error log:
ERROR: modpost: "xhci_suspend" [drivers/usb/host/xhci-pci.ko] undefined!
ERROR: modpost: "xhci_resume" [drivers/usb/host/xhci-pci.ko] undefined!
make[2]: [scripts/Makefile.modpost:127: Module.symvers] Error 1 (ignored)

This is because the backport of commit 9734fd7a2777 ("xhci: use pm_ptr()
instead of #ifdef for CONFIG_PM conditionals") is wrong.

9734fd7a2777:

-#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

130eac4170859 (upstream version of 9734fd7a2777):

-#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.pci_poweroff_late = xhci_pci_poweroff_late;
-       xhci_pci_hc_driver.shutdown = xhci_pci_shutdown;
-#endif
+       xhci_pci_hc_driver.pci_suspend = pm_ptr(xhci_pci_suspend);
+       xhci_pci_hc_driver.pci_resume = pm_ptr(xhci_pci_resume);
+       xhci_pci_hc_driver.pci_poweroff_late = pm_ptr(xhci_pci_poweroff_late);
+       xhci_pci_hc_driver.shutdown = pm_ptr(xhci_pci_shutdown);

Guenter