commit: 8f412a6587d59cd393cafc4d20f15de10c665038 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Sun Jan 19 10:58:25 2025 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Sun Jan 19 10:58:25 2025 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=8f412a65
Linux patch 6.1.125 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> 0000_README | 4 ++++ 1125_linux-6.1.126.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/0000_README b/0000_README index 6cc84406..6d5ed926 100644 --- a/0000_README +++ b/0000_README @@ -547,6 +547,10 @@ Patch: 1124_linux-6.1.125.patch From: https://www.kernel.org Desc: Linux 6.1.125 +Patch: 1125_linux-6.1.126.patch +From: https://www.kernel.org +Desc: Linux 6.1.126 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1125_linux-6.1.126.patch b/1125_linux-6.1.126.patch new file mode 100644 index 00000000..def5ba64 --- /dev/null +++ b/1125_linux-6.1.126.patch @@ -0,0 +1,45 @@ +diff --git a/Makefile b/Makefile +index 9151052c19af2b..916ed3b66536e8 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 6 + PATCHLEVEL = 1 +-SUBLEVEL = 125 ++SUBLEVEL = 126 + EXTRAVERSION = + NAME = Curry Ramen + +diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c +index 1d71e8ef991967..e90ff21b7c5429 100644 +--- 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_dev *dev) + 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_hcd *hcd) + 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);
