On Sat, Oct 17, 2015 at 06:07:43AM -0700, David Miller wrote: > From: Pablo Neira Ayuso <pa...@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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
