On Tue, 2023-10-24 at 14:01 -0700, Jakub Kicinski wrote: > On Tue, 24 Oct 2023 22:54:50 +0200 Johannes Berg wrote: > > > > If not, I can resolve this conflict and we'll include it in the next > > > > (and last) wireless-next pull request, which will be going out Thursday > > > > morning (Europe time.) > > > > > > Sounds good! But do you need to do the resolution to put something > > > on top? Otherwise we can deal with the conflict when pulling. > > > > No, not really, nothing left that's not in wireless-next already (I > > think), except maybe some tiny cleanups. > > > > Just trying to make it easier for you, even if it's really not a complex > > conflict :) > > I think "Linus rules" would dictate that cross-merges to hide conflicts > are a bad thing. We don't have much to win so let's stick to that :) Fair enough :) > Hopefully I can deal with the resolution, but if you want to be 100% > sure - you can drop a git-rerere resolution somewhere I can fetch it. No need I think, just the return codes changed in the -next version for better skb drop reasons :) johannes
