linux-kernel - linux-next: manual merge of the usb tree with the usb.current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230331140150.597576b2@canb.auug.org.au>
Date:   Fri, 31 Mar 2023 14:01:50 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Mathias Nyman <mathias.nyman@...ux.intel.com>
Subject: linux-next: manual merge of the usb tree with the usb.current tree

Hi all,

Today's linux-next merge of the usb tree got a conflict in:

  drivers/usb/host/xhci-pci.c

between commit:

  8e77d3d59d7b ("Revert "usb: xhci-pci: Set PROBE_PREFER_ASYNCHRONOUS"")

from the usb.current tree and commit:

  130eac417085 ("xhci: use pm_ptr() instead of #ifdef for CONFIG_PM conditionals")

from the usb tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/usb/host/xhci-pci.c
index 6db07ca419c3,bbbb01282038..000000000000
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@@ -771,11 -967,10 +967,9 @@@ static struct pci_driver xhci_pci_drive
  	/* suspend and resume implemented later */
  
  	.shutdown = 	usb_hcd_pci_shutdown,
- #ifdef CONFIG_PM
  	.driver = {
- 		.pm = &usb_hcd_pci_pm_ops
+ 		.pm = pm_ptr(&usb_hcd_pci_pm_ops),
 -		.probe_type = PROBE_PREFER_ASYNCHRONOUS,
  	},
- #endif
  };
  
  static int __init xhci_pci_init(void)

Content of type "application/pgp-signature" skipped