From: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> 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. -- 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