[PATCH 0/1] fix xhci feature merge issue in current usb-next

[Mathias Nyman <mathias.nyman@linux.intel.com>]

Hi Greg

Two different conflicting features touching xhci got into current usb-next
for 5.19

One adds support for xHC hosts with just one roothub,
second adds support to defer first roothub registration until second
roothub is added.

commit 873f323618c2 ("xhci: prepare for operation w/o shared hcd")
commit b7a4f9b5d0e4 ("xhci: Set HCD flag to defer primary roothub
registration")

We ended up trying to defer roothub registratinog for xHC with just one
roothub.

This patch fixes the issue and goes on top of current usb-next

This patch shouldn't be needed for stable as the new feature to support
one roothub xHC isn't marked for stable either, but setting Fixes flag
in case someone later picks it up for stable.

Mathias Nyman (1):
  xhci: Don't defer primary roothub registration if there is only one
    roothub

 drivers/usb/host/xhci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.25.1