From mboxrd@z Thu Jan  1 00:00:00 1970
From: Pablo Neira Ayuso <pablo@netfilter.org>
Subject: Re: [PATCH 00/35] Netfilter/IPVS updates for net-next
Date: Sat, 17 Oct 2015 15:38:01 +0200
Message-ID: <20151017133801.GA27406@salvia>
References: <1445081590-2924-1-git-send-email-pablo@netfilter.org>
 <20151017.060743.10017622911100028.davem@davemloft.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org
To: David Miller <davem@davemloft.net>
Return-path: <netfilter-devel-owner@vger.kernel.org>
Received: from mail.us.es ([193.147.175.20]:57748 "EHLO mail.us.es"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751841AbbJQNbD (ORCPT <rfc822;netfilter-devel@vger.kernel.org>);
	Sat, 17 Oct 2015 09:31:03 -0400
Content-Disposition: inline
In-Reply-To: <20151017.060743.10017622911100028.davem@davemloft.net>
Sender: netfilter-devel-owner@vger.kernel.org
List-ID: <netfilter-devel.vger.kernel.org>

On Sat, Oct 17, 2015 at 06:07:43AM -0700, David Miller wrote:
> From: Pablo Neira Ayuso <pablo@netfilter.org>
> Date: Sat, 17 Oct 2015 13:32:35 +0200
> 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git HEAD
> 
> Pablo, this gives merge conflicts.
> 
> This is the second or third time in the past few pulls from you that
> there have been merge conflicts, even when I haven't made a single
> change between when you sent the pull request and when I try to
> integrate it into my tree.

I was about to fix this here, sorry.