[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20260105173624.43fe986b@kernel.org>
Date: Mon, 5 Jan 2026 17:36:24 -0800
From: Jakub Kicinski <kuba@...nel.org>
To: Xu Du <xudu@...hat.com>
Cc: davem@...emloft.net, edumazet@...gle.com, pabeni@...hat.com,
horms@...nel.org, shuah@...nel.org, netdev@...r.kernel.org,
linux-kselftest@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH net-next v3 0/8] selftest: Extend tun/virtio coverage
for GSO over UDP tunnel
On Mon, 5 Jan 2026 11:44:35 +0800 Xu Du wrote:
> v2 -> v3:
> - Re-send the patch series becasue Patchwork don't update them
Not sure what this means, but:
1 - please do not repost patches sooner than 24h after previous
posting, per
https://www.kernel.org/doc/html/next/process/maintainer-netdev.html
2 - the patches do not apply to net-next:
Applying: selftest: tun: Format tun.c existing code
Applying: selftest: tun: Introduce tuntap_helpers.h header for TUN/TAP testing
Applying: selftest: tun: Refactor tun_delete to use tuntap_helpers
Applying: selftest: tap: Refactor tap test to use tuntap_helpers
Using index info to reconstruct a base tree...
M tools/testing/selftests/net/tap.c
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/net/tap.c
CONFLICT (content): Merge conflict in tools/testing/selftests/net/tap.c
Recorded preimage for 'tools/testing/selftests/net/tap.c'
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0004 selftest: tap: Refactor tap test to use tuntap_helpers
Powered by blists - more mailing lists