From: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> Date: Fri, 21 Aug 2015 06:32:29 +0200 > This is second pull request includes the conflict resolution patch that > resulted from the updates that we got for the conntrack template through > kmalloc. No changes with regards to the previously sent 15 patches. ... > You can pull these changes from: > > git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git This looks better, pulled, thanks! -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html