]> git.ipfire.org Git - thirdparty/openwrt.git/commit
starfive: fix 6.12 kernel patch conflict 19039/head
authorShiji Yang <yangshiji66@outlook.com>
Thu, 5 Jun 2025 22:36:16 +0000 (06:36 +0800)
committerÁlvaro Fernández Rojas <noltari@gmail.com>
Fri, 6 Jun 2025 05:42:35 +0000 (07:42 +0200)
commitc947e37e614abf2b02fae306ed92a00e3f98903b
tree633182d4f2c9c0b0c2829d75783d64eb1ee1b45d
parent8b24289a5267e486abd9ccbf4b4ad82f14d545ae
starfive: fix 6.12 kernel patch conflict

The recently committed starfive 6.12 kernel support patchset[1] has
conflict with the 6.12.32 kernel update[2]. Remove upstreamed patch
to fix the issue:

  0031-phy-starfive-jh7110-usb-Fix-usb-2.0-host-detection-f.patch [3]

[1] https://github.com/openwrt/openwrt/pull/18997
[2] https://github.com/openwrt/openwrt/pull/19027
[3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.32&id=2c09a5cbc0100e88b8872b11f4da01a656c97fbc

Fixes: ebfd69a3e373 ("kernel: bump 6.12 to 6.12.32")
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/19039
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
target/linux/starfive/patches-6.12/0031-phy-starfive-jh7110-usb-Fix-usb-2.0-host-detection-f.patch [deleted file]