Re: [PATCH v8 00/23] net/tcp: Add TCP-AO support

From: Dmitry Safonov
Date: Thu Jul 20 2023 - 16:41:37 EST


On 7/20/23 18:53, Jakub Kicinski wrote:
> On Wed, 19 Jul 2023 21:26:05 +0100 Dmitry Safonov wrote:
>> This is version 8 of TCP-AO support. I base it on master and there
>> weren't any conflicts on my tentative merge to linux-next.
>
> doesn't apply

Yeah, it did yesterday on next-20230719, but today's next-20230720 has
commit 5e5265522a9a ("tcp: annotate data-races around
tcp_rsk(req)->txhash"), which has a conflict.

I'll resend rebased v8.1-next

Thanks,
Dmitry