From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCH next-next 2/7] gre: Move utility functions to common headers Date: Wed, 04 May 2016 12:45:04 -0400 (EDT) Message-ID: <20160504.124504.2088570192760277514.davem@davemloft.net> References: <20160503132944.1951cefb@griffin> <20160504.005316.762406965746230352.davem@davemloft.net> <20160504103549.228c9e8a@griffin> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: tom@herbertland.com, netdev@vger.kernel.org, kernel-team@fb.com To: jbenc@redhat.com Return-path: Received: from shards.monkeyblade.net ([149.20.54.216]:39684 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754199AbcEDQpI (ORCPT ); Wed, 4 May 2016 12:45:08 -0400 In-Reply-To: <20160504103549.228c9e8a@griffin> Sender: netdev-owner@vger.kernel.org List-ID: 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 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. > > The patch http://patchwork.ozlabs.org/patch/617940/ still applies and > does the right thing even post merge. > > Note that the merge reintroduced the bug fixed by b7f8fe251e46 (the > mentioned patch fixes this, too). Awesome, I'll use that, thanks Jiri.