[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20160504.005316.762406965746230352.davem@davemloft.net>
Date: Wed, 04 May 2016 00:53:16 -0400 (EDT)
From: David Miller <davem@...emloft.net>
To: jbenc@...hat.com
Cc: tom@...bertland.com, netdev@...r.kernel.org, kernel-team@...com
Subject: Re: [PATCH next-next 2/7] gre: Move utility functions to common
headers
From: Jiri Benc <jbenc@...hat.com>
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.
Powered by blists - more mailing lists