On Fri, 5 Feb 2021 23:02:03 -0800 Arjun Roy wrote: > From: Arjun Roy <[email protected]> > > 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 <[email protected]> > Signed-off-by: Eric Dumazet <[email protected]> > Signed-off-by: Soheil Hassas Yeganeh <[email protected]> > Suggested-by: David Ahern <[email protected]> > Suggested-by: Leon Romanovsky <[email protected]> > Suggested-by: Jakub Kicinski <[email protected]>
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".
