From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>,
Networking <netdev@vger•kernel.org>,
Bala-Vignesh-Reddy <reddybalavignesh9979@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the net-next tree with the mm-nonmm-unstable tree
Date: Fri, 5 Dec 2025 12:28:26 +1100 [thread overview]
Message-ID: <20251205122826.090fd398@canb.auug.org.au> (raw)
In-Reply-To: <20251124125006.3953f1d5@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2161 bytes --]
Hi all,
On Mon, 24 Nov 2025 12:50:06 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the net-next tree got conflicts in:
>
> tools/testing/selftests/drivers/net/gro.c
> tools/testing/selftests/drivers/net/hw/toeplitz.c
>
> between commit:
>
> 7edd42093cb0 ("selftests: complete kselftest include centralization")
>
> from the mm-nonmm-unstable tree and commits:
>
> 89268f7dbca1 ("selftests: net: relocate gro and toeplitz tests to drivers/net")
> fdb0267d565a ("selftests: drv-net: add a Python version of the GRO test")
> 9cf9aa77a1f6 ("selftests: drv-net: hw: convert the Toeplitz test to Python")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
>
> diff --cc tools/testing/selftests/drivers/net/gro.c
> index 76aa75469a8c,995b492f5bcb..000000000000
> --- a/tools/testing/selftests/drivers/net/gro.c
> +++ b/tools/testing/selftests/drivers/net/gro.c
> @@@ -57,7 -57,8 +57,8 @@@
> #include <string.h>
> #include <unistd.h>
>
> -#include "../../kselftest.h"
> +#include "kselftest.h"
> + #include "../../net/lib/ksft.h"
>
> #define DPORT 8000
> #define SPORT 1500
> diff --cc tools/testing/selftests/drivers/net/hw/toeplitz.c
> index 4b58152d5a49,afc5f910b006..000000000000
> --- a/tools/testing/selftests/drivers/net/hw/toeplitz.c
> +++ b/tools/testing/selftests/drivers/net/hw/toeplitz.c
> @@@ -52,7 -52,8 +52,8 @@@
> #include <sys/types.h>
> #include <unistd.h>
>
> -#include "../../../kselftest.h"
> +#include "kselftest.h"
> + #include "../../../net/lib/ksft.h"
>
> #define TOEPLITZ_KEY_MIN_LEN 40
> #define TOEPLITZ_KEY_MAX_LEN 60
This is now a conflict between the mm-nonmm-stable tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-12-05 1:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-24 1:50 linux-next: manual merge of the net-next tree with the mm-nonmm-unstable tree Stephen Rothwell
2025-12-05 1:28 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-25 23:30 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251205122826.090fd398@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=reddybalavignesh9979@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox