From: Jiri Benc <jbenc@redhat.com>
To: Tom Herbert <tom@herbertland.com>
Cc: <davem@davemloft.net>, <netdev@vger.kernel.org>, <kernel-team@fb.com>
Subject: Re: [PATCH next-next 2/7] gre: Move utility functions to common headers
Date: Tue, 3 May 2016 13:29:44 +0200 [thread overview]
Message-ID: <20160503132944.1951cefb@griffin> (raw)
In-Reply-To: <1461975141-954269-3-git-send-email-tom@herbertland.com>
On Fri, 29 Apr 2016 17:12:16 -0700, Tom Herbert wrote:
> - iptunnel_pull_header is taken out of gre_parse_header. This is now
> done by caller. The header length is returned from gre_parse_header
> in an int* argument.
Seems we conflicted here, I've done the same for net.git to fix ICMP
path. I made parse_gre_header return the length instead of adding the
parameter, as it's easier consumed that way (no need for an extra local
variable in gre_err).
How do we resolve the conflict between net and net-next? I'd prefer
gre_parse_header to return the header length. I can submit a patch for
net-next that does this; that would substantially ease the merge.
Jiri
next prev parent reply other threads:[~2016-05-03 11:29 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-30 0:12 [PATCH next-next 0/7] net: Cleanup IPv6 ip tunnels Tom Herbert
2016-04-30 0:12 ` [PATCH next-next 1/7] ipv6: Cleanup IPv6 tunnel receive path Tom Herbert
2016-04-30 0:12 ` [PATCH next-next 2/7] gre: Move utility functions to common headers Tom Herbert
2016-05-03 11:29 ` Jiri Benc [this message]
2016-05-04 4:53 ` David Miller
2016-05-04 8:35 ` Jiri Benc
2016-05-04 16:45 ` David Miller
2016-04-30 0:12 ` [PATCH next-next 3/7] gre6: Cleanup GREv6 receive path, call common GRE functions Tom Herbert
2016-04-30 0:12 ` [PATCH next-next 4/7] ipv6: Create ip6_tnl_xmit Tom Herbert
2016-04-30 0:12 ` [PATCH next-next 5/7] gre: Create common functions for transmit Tom Herbert
2016-04-30 0:12 ` [PATCH net-next 6/7] ipv6: Generic tunnel cleanup Tom Herbert
2016-04-30 0:12 ` [PATCH next-next 7/7] gre6: Cleanup GREv6 transmit path, call common GRE functions Tom Herbert
2016-04-30 1:00 ` [PATCH next-next 0/7] net: Cleanup IPv6 ip tunnels Alexander Duyck
2016-05-02 19:32 ` Tom Herbert
2016-05-02 19:42 ` Alexander Duyck
2016-05-02 23:23 ` David Miller
2016-05-03 2:03 ` Alexander Duyck
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=20160503132944.1951cefb@griffin \
--to=jbenc@redhat.com \
--cc=davem@davemloft.net \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
--cc=tom@herbertland.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).