Several conntrack extensions maintain their own sysctl handling, which is the reason why conntrack has four different sysctl anchors in netns_ct. Placing all the sysctl handling into a single location allows to avoid the code duplication. Florian Westphal (6): netfilter: conntrack: un-export seq_print_acct netfilter: conntrack: add mnemonics for sysctl table netfilter: conntrack: merge acct and helper sysctl table with main one netfilter: conntrack: merge ecache and timestamp sysctl tables with main one netfilter: conntrack: remove empty pernet fini stubs netfilter: netns: shrink netns_ct struct include/net/netfilter/nf_conntrack_acct.h | 6 - include/net/netfilter/nf_conntrack_ecache.h | 6 - include/net/netfilter/nf_conntrack_helper.h | 3 include/net/netfilter/nf_conntrack_timestamp.h | 13 --- include/net/netns/conntrack.h | 6 - net/netfilter/nf_conntrack_acct.c | 89 ---------------------- net/netfilter/nf_conntrack_core.c | 28 +----- net/netfilter/nf_conntrack_ecache.c | 66 ---------------- net/netfilter/nf_conntrack_helper.c | 69 ----------------- net/netfilter/nf_conntrack_standalone.c | 101 ++++++++++++++++++++++--- net/netfilter/nf_conntrack_timestamp.c | 70 ----------------- 11 files changed, 106 insertions(+), 351 deletions(-)