Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757607AbcCDCRx (ORCPT ); Thu, 3 Mar 2016 21:17:53 -0500 Received: from www62.your-server.de ([213.133.104.62]:34082 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755086AbcCDCRv (ORCPT ); Thu, 3 Mar 2016 21:17:51 -0500 Message-ID: <56D8F044.4080004@iogearbox.net> Date: Fri, 04 Mar 2016 03:17:40 +0100 From: Daniel Borkmann User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Stephen Rothwell , David Miller , netdev@vger.kernel.org CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Benc Subject: Re: linux-next: manual merge of the net-next tree with the net tree References: <20160304130949.47a94ac8@canb.auug.org.au> In-Reply-To: <20160304130949.47a94ac8@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated-Sender: daniel@iogearbox.net Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 517 Lines: 21 On 03/04/2016 03:09 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/vxlan.c > > between commit: > > 4024fcf70556 ("vxlan: fix missing options_len update on RX with collect metadata") > > from the net tree and commit: > > 3288af0892e3 ("vxlan: move GBP header parsing to a separate function") > > from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Looks good, thanks!