Hi Stanislav, On Tue, 19 Feb 2019 16:45:46 -0800 Stanislav Fomichev wrote: > > OTOH, I don't understand why is there a conflict? bpf and bpf-next > adding tests in the same place/file? Those can be trivially resolved > when bpf and bpf-next are merged in the next window. Yes, and yes :-) -- Cheers, Stephen Rothwell