[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAOFY-A0BCDNy1VE_cauuYhwWUZ3=u9mtCVPS3O5kbPFKxGm7yw@mail.gmail.com>
Date: Sat, 6 Feb 2021 12:37:18 -0800
From: Arjun Roy <arjunroy@...gle.com>
To: Jakub Kicinski <kuba@...nel.org>
Cc: Arjun Roy <arjunroy.kdev@...il.com>,
David Miller <davem@...emloft.net>,
netdev <netdev@...r.kernel.org>,
Eric Dumazet <edumazet@...gle.com>,
Soheil Hassas Yeganeh <soheil@...gle.com>,
David Ahern <dsahern@...il.com>,
Leon Romanovsky <leon@...nel.org>
Subject: Re: [net v2] tcp: Explicitly mark reserved field in
tcp_zerocopy_receive args.
On Sat, Feb 6, 2021 at 9:20 AM Jakub Kicinski <kuba@...nel.org> wrote:
>
> 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 <arjunroy@...gle.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@...gle.com>
> > > Signed-off-by: Eric Dumazet <edumazet@...gle.com>
> > > Signed-off-by: Soheil Hassas Yeganeh <soheil@...gle.com>
> > > Suggested-by: David Ahern <dsahern@...il.com>
> > > Suggested-by: Leon Romanovsky <leon@...nel.org>
> > > Suggested-by: Jakub Kicinski <kuba@...nel.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
Powered by blists - more mailing lists