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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Fri, 15 Oct 2021 19:03:58 +0200 (CEST)
From:   Justin Iurman <justin.iurman@...ege.be>
To:     Jakub Kicinski <kuba@...nel.org>
Cc:     netdev@...r.kernel.org, davem@...emloft.net,
        yoshfuji@...ux-ipv6.org, dsahern@...nel.org
Subject: Re: [PATCH net 0/2] Correct the IOAM behavior for undefined trace
 type bits

>> (@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/