From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964771AbbBBJJg (ORCPT ); Mon, 2 Feb 2015 04:09:36 -0500 Received: from mail-wi0-f177.google.com ([209.85.212.177]:41905 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932704AbbBBJJe (ORCPT ); Mon, 2 Feb 2015 04:09:34 -0500 Message-ID: <54CF3ECA.2040704@6wind.com> Date: Mon, 02 Feb 2015 10:09:30 +0100 From: Nicolas Dichtel Reply-To: nicolas.dichtel@6wind.com Organization: 6WIND User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.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, Thomas Graf Subject: Re: linux-next: manual merge of the net-next tree with the net tree References: <20150202133354.06329e97@canb.auug.org.au> In-Reply-To: <20150202133354.06329e97@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 02/02/2015 03:33, Stephen Rothwell a écrit : > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in > drivers/net/vxlan.c between commit 33564bbb2cf1 ("vxlan: setup the > right link netns in newlink hdlr") from the net tree and commit > ac5132d1a03f ("vxlan: Only bind to sockets with compatible flags > enabled") from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Acked-by: Nicolas Dichtel