From: Jiri Benc <redacted>
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-next merge.  Please send me something on
top of that which does what you like.

Thanks.