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

From: Greg KH <[email-masked]>
Date: Fri, 31 Mar 2023 09:52:10 +0200

On Fri, Mar 31, 2023 at 02:01:50PM +1100, Stephen Rothwell wrote:
> 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)

Thanks, this looks good.  I'll resolve it this way when I send the
usb-linus branch to Linus this weekend.

greg k-h