Hi, There's currently a small conflict between nf-next and net-next, specifically, the most recent pipapo fix for nf and the retpoline updates for the set infrastructure. I'm going to rebase the nf-next to send a simple pull request for net-next. So I'm rebase nf-next, please rebase any pending work in your working copies too. Sorry for the inconvenience.
