On Fri, Sep 13, 2019 at 11:27:14AM +0200, Pablo Neira Ayuso wrote: > On Fri, Sep 13, 2019 at 09:13:14AM +0100, Jeremy Sowden wrote: > > diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c > > index 88d4127df863..410809c669e1 100644 > > --- a/net/netfilter/nf_conntrack_standalone.c > > +++ b/net/netfilter/nf_conntrack_standalone.c > > @@ -1167,7 +1167,6 @@ static int __init nf_conntrack_standalone_init(void) > > if (ret < 0) > > goto out_start; > > > > - BUILD_BUG_ON(SKB_NFCT_PTRMASK != NFCT_PTRMASK); > > Why do you need to remove this? All good, this has been consolidated in this patch. So I'm replying myself.