Switched to a new branch '20251003210127.1021918-1-kuba@kernel.org' Applying: selftests: net: unify the Makefile formats Using index info to reconstruct a base tree... M tools/testing/selftests/drivers/net/bonding/Makefile Falling back to patching base and 3-way merge... Auto-merging tools/testing/selftests/drivers/net/bonding/Makefile CONFLICT (content): Merge conflict in tools/testing/selftests/drivers/net/bonding/Makefile error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config set advice.mergeConflict false" Patch failed at 0001 selftests: net: unify the Makefile formats