Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Content-Type: multipart/mixed; boundary="------------ZsTzgEaXjvQsTn7mKotqVps5"
Message-ID: <5007b52c-dd16-dbf6-8d64-b9701bfa498b@tessares.net>
Date:   Fri, 16 Jun 2023 21:33:15 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.12.0
Subject: Re: [PATCH v4 4/4] selftests: net: fcnal-test: check if FIPS mode is
 enabled: manual merge
Content-Language: en-GB
To:     Magali Lemes <magali.lemes@canonical.com>
Cc:     davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
        pabeni@redhat.com, shuah@kernel.org, dsahern@gmail.com,
        andrei.gherzan@canonical.com, netdev@vger.kernel.org,
        David Ahern <dsahern@kernel.org>,
        linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Guillaume Nault <gnault@redhat.com>
References: <20230613123222.631897-1-magali.lemes@canonical.com>
 <20230613123222.631897-5-magali.lemes@canonical.com>
From:   Matthieu Baerts <matthieu.baerts@tessares.net>
In-Reply-To: <20230613123222.631897-5-magali.lemes@canonical.com>
Precedence: bulk

This is a multi-part message in MIME format.
--------------ZsTzgEaXjvQsTn7mKotqVps5
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

Hi Magali,

On 13/06/2023 14:32, Magali Lemes wrote:
> There are some MD5 tests which fail when the kernel is in FIPS mode,
> since MD5 is not FIPS compliant. Add a check and only run those tests
> if FIPS mode is not enabled.
> 
> Fixes: f0bee1ebb5594 ("fcnal-test: Add TCP MD5 tests")
> Fixes: 5cad8bce26e01 ("fcnal-test: Add TCP MD5 tests for VRF")
> Reviewed-by: David Ahern <dsahern@kernel.org>
> Signed-off-by: Magali Lemes <magali.lemes@canonical.com>

Thank you for your patch!

FYI, we got a small conflict when merging 'net' in 'net-next' in the
MPTCP tree due to this patch applied in 'net':

  d7a2fc1437f7 ("selftests: net: fcnal-test: check if FIPS mode is enabled")

and this one from 'net-next':

  dd017c72dde6 ("selftests: fcnal: Test SO_DONTROUTE on TCP sockets.")

----- Generic Message -----
The best is to avoid conflicts between 'net' and 'net-next' trees but if
they cannot be avoided when preparing patches, a note about how to fix
them is much appreciated.

The conflict has been resolved on our side[1] and the resolution we
suggest is attached to this email. Please report any issues linked to
this conflict resolution as it might be used by others. If you worked on
the mentioned patches, don't hesitate to ACK this conflict resolution.
---------------------------

Regarding this conflict, I simply took the modifications from both sides.

Cheers,
Matt

[1] https://github.com/multipath-tcp/mptcp_net-next/commit/502f061b9a02
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
--------------ZsTzgEaXjvQsTn7mKotqVps5
Content-Type: text/x-patch; charset=UTF-8;
 name="502f061b9a02bc02a62d4e136e65514211dc63c5.patch"
Content-Disposition: attachment;
 filename="502f061b9a02bc02a62d4e136e65514211dc63c5.patch"
Content-Transfer-Encoding: base64

ZGlmZiAtLWNjIHRvb2xzL3Rlc3Rpbmcvc2VsZnRlc3RzL25ldC9mY25hbC10ZXN0LnNoCmlu
ZGV4IDA1YjVjNGFmN2EwOCxlZTY4ODBhYzNlNWUuLmQzMmExNGJhMDY5YQotLS0gYS90b29s
cy90ZXN0aW5nL3NlbGZ0ZXN0cy9uZXQvZmNuYWwtdGVzdC5zaAorKysgYi90b29scy90ZXN0
aW5nL3NlbGZ0ZXN0cy9uZXQvZmNuYWwtdGVzdC5zaApAQEAgLTEyODMsMTAgLTEyMjMsNyAr
MTI5MCwxMCBAQEAgaXB2NF90Y3Bfbm92cmYoCiAgCXJ1bl9jbWQgbmV0dGVzdCAtZCAke05T
QV9ERVZ9IC1yICR7YX0KICAJbG9nX3Rlc3RfYWRkciAke2F9ICQ/IDEgIk5vIHNlcnZlciwg
ZGV2aWNlIGNsaWVudCwgbG9jYWwgY29ubiIKICAKLSAJaXB2NF90Y3BfbWQ1X25vdnJmCisg
CVsgIiRmaXBzX2VuYWJsZWQiID0gIjEiIF0gfHwgaXB2NF90Y3BfbWQ1X25vdnJmCiArCiAr
CWlwdjRfdGNwX2RvbnRyb3V0ZSAwCiArCWlwdjRfdGNwX2RvbnRyb3V0ZSAyCiAgfQogIAog
IGlwdjRfdGNwX3ZyZigpCg==

--------------ZsTzgEaXjvQsTn7mKotqVps5--