* linux-next: manual merge of the net-next tree with the mm-nonmm-unstable tree
@ 2025-11-25 23:30 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2025-11-25 23:30 UTC (permalink / raw)
To: David Miller, Jakub Kicinski, Paolo Abeni, Andrew Morton
Cc: Bala-Vignesh-Reddy, Networking, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1327 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
tools/testing/selftests/drivers/net/hw/toeplitz.c
between commit:
f48b6111ba40 ("selftests: complete kselftest include centralization")
from the mm-nonmm-unstable tree and commit:
aa91dbf3eda2 ("selftests: hw-net: toeplitz: read the RSS key directly from C")
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.
--
Cheers,
Stephen Rothwell
diff --cc tools/testing/selftests/drivers/net/hw/toeplitz.c
index 4b58152d5a49,a4d04438c313..000000000000
--- a/tools/testing/selftests/drivers/net/hw/toeplitz.c
+++ b/tools/testing/selftests/drivers/net/hw/toeplitz.c
@@@ -52,7 -52,11 +52,11 @@@
#include <sys/types.h>
#include <unistd.h>
+ #include <ynl.h>
+ #include "ethtool-user.h"
+
-#include "../../../kselftest.h"
+#include "kselftest.h"
+ #include "../../../net/lib/ksft.h"
#define TOEPLITZ_KEY_MIN_LEN 40
#define TOEPLITZ_KEY_MAX_LEN 60
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* linux-next: manual merge of the net-next tree with the mm-nonmm-unstable tree
@ 2025-11-24 1:50 Stephen Rothwell
2025-12-05 1:28 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2025-11-24 1:50 UTC (permalink / raw)
To: David Miller, Jakub Kicinski, Paolo Abeni, Andrew Morton
Cc: Networking, Bala-Vignesh-Reddy, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1891 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the net-next tree with the mm-nonmm-unstable tree
2025-11-24 1:50 Stephen Rothwell
@ 2025-12-05 1:28 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2025-12-05 1:28 UTC (permalink / raw)
To: Andrew Morton
Cc: David Miller, Jakub Kicinski, Paolo Abeni, Networking,
Bala-Vignesh-Reddy, Linux Kernel Mailing List,
Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-12-05 1:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-25 23:30 linux-next: manual merge of the net-next tree with the mm-nonmm-unstable tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-11-24 1:50 Stephen Rothwell
2025-12-05 1:28 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox