Re: [PATCH net 0/2] Correct the IOAM behavior for undefined trace type bits

quoted

(@Jakub @David: there will be a conflict for #2 when merging net->net-next, due
to commit [1]. The conflict is only 5-10 lines for #2 (#1 should be fine) inside
the file tools/testing/selftests/net/ioam6.sh, so quite short though possibly
ugly. Sorry for that, I didn't expect to post this one... Had I known, I'd have
made the opposite.)

Hi Jakub,

Hi Justin, net was merged into net-next now, please double check the
resolution. I think it's the same as Stephen's [1]. In the future please

Thanks for that, I just checked and it's indeed OK.

try to include a tree way diff or instructions on how to do the merge.

Noted, thanks again.

Thanks!

[1]
https://lore.kernel.org/all/20211013104227.62c4d3af@canb.auug.org.au/ (local)