On Tue, Nov 29, 2022 at 08:15:10AM -0800, Jakub Kicinski wrote: > On Tue, 29 Nov 2022 10:50:01 +0100 Steffen Klassert wrote: > > > Please tag for bpf-next > > > > This is a change to xfrm ipsec, so it should go > > through the ipsec-next tree, unless there is > > a good reason for handling that different. > > Yeah, this is borderline. Do the patches apply cleanly to Linus's tree? > If so maybe they can be posted as a PR and both trees can pull them in, > avoiding any unnecessary back and forth... Now, after the last PR was merged, the ipsec-next tree is empty, and we are close to the end of this development cycle. So I don't expect conflicts if that patchset goes in before the merge window. If the bpf-next tree wants to take the v2 version, just let me know. Otherwise I consider taking it into ipsec-next.
