On Tue, Mar 7, 2023 at 12:01 PM Conor Dooley <conor.dooley@xxxxxxxxxxxxx> wrote: > > Cool. Git should resolve that, probably without even generating a > conflict in -next, right? I think it will conflict. Since the cleanup is elsewhere and it may add work for the -next maintainer, it is probably best to take it out in v2. Cheers, Miguel