From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikolay Aleksandrov Subject: Re: linux-next: manual merge of the net-next tree with Linus' tree Date: Tue, 14 Jul 2015 10:23:22 +0200 Message-ID: <55A4C6FA.7090200@cumulusnetworks.com> References: <20150714114617.1eae8765@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f177.google.com ([209.85.212.177]:38184 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751961AbbGNIXZ (ORCPT ); Tue, 14 Jul 2015 04:23:25 -0400 Received: by wicmv11 with SMTP id mv11so7642689wic.1 for ; Tue, 14 Jul 2015 01:23:24 -0700 (PDT) In-Reply-To: <20150714114617.1eae8765@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell , David Miller , netdev@vger.kernel.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org On 07/14/2015 03:46 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/bridge/br_mdb.c > > between commit: > > f1158b74e54f ("bridge: mdb: zero out the local br_ip variable before use") > > from Linus' tree and commit: > > 74fe61f17e99 ("bridge: mdb: add vlan support for user entries") > > from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > Looks good to me, thanks Stephen! Cheers, Nik