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: ebfd69a3e3 ("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>
ebfd69a3e3
