Re: [RFC 0/5] LLMinus: LLM-Assisted Merge Conflict Resolution

Sasha Levin
2025-12-21T16:10:12Z

On Fri, Dec 19, 2025 at 01:16:24PM -0500, Sasha Levin wrote:
>Another point raised at the summit was the value of linux-next's "fs-next"
>branch - filesystem maintainers benefit from having their own integration
>branch focused on fs/ issues. Currently, creating similar branches for other
>subsystems would overwhelm the linux-next maintainer with additional merge
>work. LLMinus could change this equation, enabling more subsystem-specific
>integration branches without proportionally increasing human effort.

I've been toying with this one for the past day.

I've started by letting LLMinus learn merge conflict resolutions on linux-next,
so that it could use it as references later. At that point, very little is
needed to have an LLM resolve different variations of the same conflict (that
just appears different because we mix-and-match various trees).

I assigned categories to the various trees used by -next (see
https://gist.github.com/sashalevin/163df4ae1163e0e22a97edc40e14b7f5) and built
a simple wrapper script to generate per-category integration branches, letting
LLMinus resolve conflicts whenever we hit one.

The resulting branches were pushed to
https://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux-next.git/refs/ .
Each category has a %s-next branch, and a larger all-next branch which merges
all of them together and is the equivalent of linux-next.

Please let me know what you think!

--
Thanks,
Sasha