From: Jiri Benc
Date: Wed, 4 May 2016 10:35:49 +0200
> On Wed, 04 May 2016 00:53:16 -0400 (EDT), David Miller wrote:
>> From: Jiri Benc
>> Date: Tue, 3 May 2016 13:29:44 +0200
>>
>> > How do we resolve the conflict between net and net-next? I'd prefer
>> > gre_parse_header to return the header
On Wed, 04 May 2016 00:53:16 -0400 (EDT), David Miller wrote:
> From: Jiri Benc
> Date: Tue, 3 May 2016 13:29:44 +0200
>
> > 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;
From: Jiri Benc
Date: Tue, 3 May 2016 13:29:44 +0200
> 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, I just did the net --> net
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
