Re: [net v2] tcp: Explicitly mark reserved field in tcp_zerocopy_receive args.

On Sat, Feb 6, 2021 at 9:20 AM Jakub Kicinski [off-list ref] wrote:

On Sat, 6 Feb 2021 09:19:03 -0800 Jakub Kicinski wrote:

quoted

On Fri,  5 Feb 2021 23:02:03 -0800 Arjun Roy wrote:

quoted

From: Arjun Roy <redacted>

Explicitly define reserved field and require it to be 0-valued.

Fixes: 7eeba1706eba ("tcp: Add receive timestamp support for receive zerocopy.")
Signed-off-by: Arjun Roy <redacted>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Soheil Hassas Yeganeh <redacted>
Suggested-by: David Ahern <redacted>
Suggested-by: Leon Romanovsky <leon@kernel.org>
Suggested-by: Jakub Kicinski <kuba@kernel.org>

Applying: tcp: Explicitly mark reserved field in tcp_zerocopy_receive args.
Using index info to reconstruct a base tree...
M     include/uapi/linux/tcp.h
M     net/ipv4/tcp.c
Falling back to patching base and 3-way merge...
Auto-merging net/ipv4/tcp.c
Auto-merging include/uapi/linux/tcp.h
CONFLICT (content): Merge conflict in include/uapi/linux/tcp.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 tcp: Explicitly mark reserved field in tcp_zerocopy_receive args.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Ah, you just marked it for the wrong tree. Please repost with net-next
in the subject tag, otherwise build bot won't handle it.

Resent with net-next.

Thanks,
-Arjun