Message-ID: <55A4C6FA.7090200@cumulusnetworks.com>
Date: Tue, 14 Jul 2015 10:23:22 +0200
From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0
MIME-Version: 1.0
To: Stephen Rothwell <sfr@canb.auug.org.au>,
        David Miller <davem@davemloft.net>, netdev@vger.kernel.org
CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the net-next tree with Linus' tree
References: <20150714114617.1eae8765@canb.auug.org.au>
In-Reply-To: <20150714114617.1eae8765@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 782
Lines: 30

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/