From: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> 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. If you can't be certain there won't be merge conflicts, do a test pull into a clone of my tree to see what happens. Or, if you think the merge conflict is simple enough for me to deal with, mention and explain it in the header posting for the patch series. Please fix this up and resend your pull request. 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
