From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: [PATCH 00/35] Netfilter/IPVS updates for net-next
Date: Sun, 18 Oct 2015 23:05:13 -0700 (PDT)
Message-ID: <20151018.230513.392668334662725134.davem@davemloft.net>
References: <1445089730-1935-1-git-send-email-pablo@netfilter.org>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org
To: pablo@netfilter.org
Return-path: <netfilter-devel-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([149.20.54.216]:49553 "EHLO
	shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751618AbbJSFs5 (ORCPT
	<rfc822;netfilter-devel@vger.kernel.org>);
	Mon, 19 Oct 2015 01:48:57 -0400
In-Reply-To: <1445089730-1935-1-git-send-email-pablo@netfilter.org>
Sender: netfilter-devel-owner@vger.kernel.org
List-ID: <netfilter-devel.vger.kernel.org>

From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Sat, 17 Oct 2015 15:48:50 +0200

> This is exactly the same pull request, including the conflict
> resolution for net/bridge/br_netfilter_hooks.c.

Pulled, thanks Pablo.