Re: [PATCH] Revert "xhci: Limit USB2 port wake support for AMD Promontory hosts"

[Greg KH]

On Tue, Aug 22, 2017 at 05:14:47PM +0800, Kai-Heng Feng wrote:
> This reverts commit dec08194ffeccfa1cf085906b53d301930eae18f.
> 
> Commit dec08194ffec ("xhci: Limit USB2 port wake support for AMD Promontory
> hosts") makes all high speed USB ports on ASUS PRIME B350M-A cease to
> function after enabling runtime PM.
> 
> All boards with this chipsets will be affected, so revert the commit.
> 
> Conflicts:
> 	drivers/usb/host/xhci-pci.c
> 	drivers/usb/host/xhci.h

Why are these "Conflicts:" lines here, you did fix up the issues, so
there shouldn't be any more conflicts.

And if you revert this, don't we still have the original problem here?

thanks,

greg k-h