From: Stephen Rothwell <redacted>
Date: Wed, 27 Mar 2013 11:57:43 +1100

Today's linux-next merge of the net-next tree got a conflict in
include/net/ipip.h between commit 330305cc4a6b ("pv4: Fix ip-header
identification for gso packets") from Linus' tree and commit c54419321455
("GRE: Refactor GRE tunneling code") from the net-next tree.

I just dropped the file (as the latter change did) and can carry the fix
as necessary (no action is required).

Thanks, I'll take care of this when I next merge.