"Glen Choo via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > I also tested these patches on top of 'seen', and the only conflict I found was > with en/header-split-cache-h-part-3, where ll-merge.c got renamed to merge-ll.c, > so we need to apply the config refactor there (should work with .cocci). Both recursive and ort merge strategies should be able to deal with ll-merge.c <-> merge-ll.c, I think. Thanks.
