From: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> Date: Thu, 10 Nov 2016 01:31:17 +0100 > I think I cannot help to address this conflict myself. > > 8fbfef7f505b is in my nf tree, while 489111e5c25b is in net-next. So > you will hit this conflict by when you pull net into net-next. > > So please keep this patch from Stephen to resolve the conflict in your > radar to solve this. I will, thank you. -- 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
