From: Jakub Kicinski <kuba@kernel.org>
To: Arjun Roy <arjunroy.kdev@gmail.com>
Cc: davem@davemloft.net, netdev@vger.kernel.org, arjunroy@google.com,
edumazet@google.com, soheil@google.com,
David Ahern <dsahern@gmail.com>,
Leon Romanovsky <leon@kernel.org>
Subject: Re: [net v2] tcp: Explicitly mark reserved field in tcp_zerocopy_receive args.
Date: Sat, 6 Feb 2021 09:19:03 -0800 [thread overview]
Message-ID: <20210206091903.3c02f584@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> (raw)
In-Reply-To: <20210206070203.483362-1-arjunroy.kdev@gmail.com>
On Fri, 5 Feb 2021 23:02:03 -0800 Arjun Roy wrote:
> From: Arjun Roy <arjunroy@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 <arjunroy@google.com>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com>
> Suggested-by: David Ahern <dsahern@gmail.com>
> 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".
next prev parent reply other threads:[~2021-02-06 17:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-06 7:02 [net v2] tcp: Explicitly mark reserved field in tcp_zerocopy_receive args Arjun Roy
2021-02-06 16:19 ` David Ahern
2021-02-06 17:19 ` Jakub Kicinski [this message]
2021-02-06 17:20 ` Jakub Kicinski
2021-02-06 20:37 ` Arjun Roy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210206091903.3c02f584@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com \
--to=kuba@kernel.org \
--cc=arjunroy.kdev@gmail.com \
--cc=arjunroy@google.com \
--cc=davem@davemloft.net \
--cc=dsahern@gmail.com \
--cc=edumazet@google.com \
--cc=leon@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=soheil@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).