On Tue, Mar 07, 2023 at 12:56:30PM +0100, Miguel Ojeda wrote: > 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. If you think it will conflict as-is, it's probably gonna conflict either way. You've pointed out several small bits, I'll send a v2 in a few days. Cheers, Conor.
Attachment:
signature.asc
Description: PGP signature
