summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
Diffstat (limited to 'include/uapi')
0 files changed, 0 insertions, 0 deletions
0'>2017-02-02Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller1-2/+4 2017-02-02netfilter: allow logging from non-init namespacesMichal Kubeček2-2/+2 2017-02-02netfilter: add and use nf_ct_set helperFlorian Westphal3-6/+3 2017-02-02skbuff: add and use skb_nfct helperFlorian Westphal4-8/+8 2017-02-02netfilter: reset netfilter state when duplicating packetFlorian Westphal1-1/+1 2017-02-02netfilter: conntrack: no need to pass ctinfo to error handlerFlorian Westphal1-6/+6