Commit0912d3f595("kernel: bump 6.12 to 6.12.29") was merged right after bcm27xx 6.12 support commits, causing conflicts. Refresh patches and removed upstreamed patch in v6.12.29: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=a5f162727b91e480656da1876247a91f651f76de Fixes:0912d3f595("kernel: bump 6.12 to 6.12.29") Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>