From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756690AbbGQAtN (ORCPT ); Thu, 16 Jul 2015 20:49:13 -0400 Received: from ozlabs.org ([103.22.144.67]:46336 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756588AbbGQAtL (ORCPT ); Thu, 16 Jul 2015 20:49:11 -0400 Date: Fri, 17 Jul 2015 10:49:08 +1000 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Nikolay Aleksandrov , Satish Ashok Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20150717104908.1f16d4c0@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/bridge/br_mdb.c between commit: 5ebc784625ea ("bridge: mdb: fix double add notification") from the net tree and commit: 09cf0211f970 ("bridge: mdb: fill state in br_mdb_notify") from the net-next tree. I fixed it up (I removed the br_mdb_notify call as per the former patch) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the net-next tree with the net tree Date: Fri, 17 Jul 2015 10:49:08 +1000 Message-ID: <20150717104908.1f16d4c0@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Sender: linux-kernel-owner@vger.kernel.org To: David Miller , netdev@vger.kernel.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Nikolay Aleksandrov , Satish Ashok List-Id: linux-next.vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/bridge/br_mdb.c between commit: 5ebc784625ea ("bridge: mdb: fix double add notification") from the net tree and commit: 09cf0211f970 ("bridge: mdb: fill state in br_mdb_notify") from the net-next tree. I fixed it up (I removed the br_mdb_notify call as per the former patch) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/