On Sat, 6 Feb 2021 09:19:03 -0800 Jakub Kicinski wrote:
> On Fri, 5 Feb 2021 23:02:03 -0800 Arjun Roy wrote:
> > From: Arjun Roy <arjun...@google.com>
> >
> > 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 <arjun...@google.com>
> > Signed-off-by: Eric Dumazet <eduma...@google.com>
> > Signed-off-by: Soheil Hassas Yeganeh <soh...@google.com>
> > Suggested-by: David Ahern <dsah...@gmail.com>
> > Suggested-by: Leon Romanovsky <l...@kernel.org>
> > Suggested-by: Jakub Kicinski <k...@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.
