projects / linux-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3baea29 b443265)
Merge 6.15-rc4 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Apr 2025 08:32:58 +0000 (10:32 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Apr 2025 08:32:58 +0000 (10:32 +0200)
commit615dca38c2eae55aff80050275931c87a812b48c
tree8674a3a3f66a39bf7c7f2ab733a757e624bd99ectree
parent3baea29dc0a7b561170d7082f831a613ae6aa56ecommit | diff
parentb4432656b36e5cc1d50a1f2dc15357543add530ecommit | diff
Merge 6.15-rc4 into usb-next

We need the USB fixes in here as well, and this resolves the following
merge conflicts that were reported in linux-next:

drivers/usb/chipidea/ci_hdrc_imx.c
drivers/usb/host/xhci.h

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS diff1 | diff2 | blob | history
drivers/usb/chipidea/ci_hdrc_imx.c diff1 | diff2 | blob | history
drivers/usb/class/cdc-wdm.c diff1 | diff2 | blob | history
drivers/usb/host/xhci-ring.c diff1 | diff2 | blob | history
drivers/usb/host/xhci.c diff1 | diff2 | blob | history
drivers/usb/host/xhci.h diff1 | diff2 | blob | history
Linux 6.x block layer and io_uring tree(s)