openstlinux/linux-st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
23cdf8752b26d4edbd60a6293bca492d83192d4d
linux-st/net/netfilter
History
David S. Miller 13091aa305 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Honestly all the conflicts were simple overlapping changes,
nothing really interesting to report.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-06-17 20:20:36 -07:00
..
ipset
treewide: Add SPDX license identifier - Makefile/Kconfig
2019-05-21 10:50:46 +02:00
ipvs
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-06-07 11:00:14 -07:00
core.c
netfilter: replace skb_make_writable with skb_ensure_writable
2019-05-31 18:02:48 +02:00
Kconfig
treewide: Add SPDX license identifier - Makefile/Kconfig
2019-05-21 10:50:46 +02:00
Makefile
netfilter: x_tables: merge ip and ipv6 masquerade modules
2019-04-11 20:59:29 +02:00
nf_conncount.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
nf_conntrack_acct.c
…
nf_conntrack_amanda.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
2019-05-30 11:26:32 -07:00
nf_conntrack_broadcast.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-06-07 11:00:14 -07:00
nf_conntrack_core.c
netfilter: never get/set skb->tstamp
2019-04-22 10:34:30 +02:00
nf_conntrack_ecache.c
…
nf_conntrack_expect.c
netfilter: replace NF_NAT_NEEDED with IS_ENABLED(CONFIG_NF_NAT)
2019-04-08 23:02:52 +02:00
nf_conntrack_extend.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
2019-05-30 11:26:32 -07:00
nf_conntrack_ftp.c
netfilter: add API to manage NAT helpers.
2019-04-30 14:19:55 +02:00
nf_conntrack_h323_asn1.c
netfilter: nf_conntrack_h323: restore boundary check correctness
2019-05-06 00:36:17 +02:00
nf_conntrack_h323_main.c
netfilter: nf_conntrack_h323: Remove deprecated config check
2019-05-06 15:15:09 +02:00
nf_conntrack_h323_types.c
…
nf_conntrack_helper.c
netfilter: add API to manage NAT helpers.
2019-04-30 14:19:55 +02:00
nf_conntrack_irc.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
2019-05-30 11:26:32 -07:00
nf_conntrack_labels.c
…
nf_conntrack_netbios_ns.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
2019-05-30 11:26:32 -07:00
nf_conntrack_netlink.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
2019-05-13 08:55:15 -07:00
nf_conntrack_pptp.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
nf_conntrack_proto_dccp.c
netlink: make validation more configurable for future strictness
2019-04-27 17:07:21 -04:00
nf_conntrack_proto_generic.c
netfilter: conntrack: remove l4proto init and get_net callbacks
2019-01-18 15:02:34 +01:00
nf_conntrack_proto_gre.c
treewide: Add SPDX license identifier for missed files
2019-05-21 10:50:45 +02:00
nf_conntrack_proto_icmp.c
netfilter: conntrack: don't set related state for different outer address
2019-04-13 14:52:57 +02:00
nf_conntrack_proto_icmpv6.c
netfilter: conntrack: don't set related state for different outer address
2019-04-13 14:52:57 +02:00
nf_conntrack_proto_sctp.c
netfilter: conntrack, nat: prefer skb_ensure_writable
2019-05-31 18:02:45 +02:00
nf_conntrack_proto_tcp.c
netlink: make validation more configurable for future strictness
2019-04-27 17:07:21 -04:00
nf_conntrack_proto_udp.c
netfilter: conntrack: remove l4proto init and get_net callbacks
2019-01-18 15:02:34 +01:00
nf_conntrack_proto.c
netfilter: nf_conntrack_bridge: register inet conntrack for bridge
2019-05-30 14:18:18 -07:00
nf_conntrack_sane.c
netfilter: add API to manage NAT helpers.
2019-04-30 14:19:55 +02:00
nf_conntrack_seqadj.c
netfilter: conntrack, nat: prefer skb_ensure_writable
2019-05-31 18:02:45 +02:00
nf_conntrack_sip.c
netfilter: add API to manage NAT helpers.
2019-04-30 14:19:55 +02:00
nf_conntrack_snmp.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
2019-05-30 11:26:32 -07:00
nf_conntrack_standalone.c
netfilter: conntrack: limit sysctl setting for boolean options
2019-04-30 14:18:56 +02:00
nf_conntrack_tftp.c
netfilter: add API to manage NAT helpers.
2019-04-30 14:19:55 +02:00
nf_conntrack_timeout.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 77
2019-05-24 17:37:51 +02:00
nf_conntrack_timestamp.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 77
2019-05-24 17:37:51 +02:00
nf_dup_netdev.c
…
nf_flow_table_core.c
netfilter: nf_flow_table: remove unnecessary variable in flow_offload_tuple
2019-05-31 18:02:42 +02:00
nf_flow_table_inet.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
nf_flow_table_ip.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
2019-05-23 14:45:36 -07:00
nf_internals.h
bridge: netfilter: unroll NF_HOOK helper in bridge input path
2019-04-12 01:47:39 +02:00
nf_log_common.c
…
nf_log_netdev.c
…
nf_log.c
treewide: Add SPDX license identifier for missed files
2019-05-21 10:50:45 +02:00
nf_nat_amanda.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
2019-05-30 11:26:32 -07:00
nf_nat_core.c
netlink: make validation more configurable for future strictness
2019-04-27 17:07:21 -04:00
nf_nat_ftp.c
netfilter: nf_nat: register NAT helpers.
2019-04-30 14:19:55 +02:00
nf_nat_helper.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2019-06-01 16:21:19 -07:00
nf_nat_irc.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
2019-05-30 11:26:32 -07:00
nf_nat_masquerade.c
netfilter: nf_nat_masquerade: unify ipv4/6 notifier registration
2019-04-11 20:59:34 +02:00
nf_nat_proto.c
netfilter: conntrack, nat: prefer skb_ensure_writable
2019-05-31 18:02:45 +02:00
nf_nat_redirect.c
net: ipv4: provide __rcu annotation for ifa_list
2019-06-02 18:08:36 -07:00
nf_nat_sip.c
netfilter: ipv4: prefer skb_ensure_writable
2019-05-31 18:02:46 +02:00
nf_nat_tftp.c
netfilter: nf_nat: register NAT helpers.
2019-04-30 14:19:55 +02:00
nf_queue.c
netfilter: nf_queue: fix reinject verdict handling
2019-05-21 16:10:30 +02:00
nf_sockopt.c
…
nf_synproxy_core.c
netfilter: replace skb_make_writable with skb_ensure_writable
2019-05-31 18:02:48 +02:00
nf_tables_api.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2019-06-01 16:21:19 -07:00
nf_tables_core.c
netfilter: nf_tables: check the result of dereferencing base_chain->stats
2019-03-01 14:34:24 +01:00
nf_tables_set_core.c
netfilter: nf_tables: fix implicit include of module.h
2019-04-30 13:35:26 +02:00
nf_tables_trace.c
…
nfnetlink_acct.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 77
2019-05-24 17:37:51 +02:00
nfnetlink_cthelper.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 77
2019-05-24 17:37:51 +02:00
nfnetlink_cttimeout.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 77
2019-05-24 17:37:51 +02:00
nfnetlink_log.c
netfilter: never get/set skb->tstamp
2019-04-22 10:34:30 +02:00
nfnetlink_osf.c
netfilter: use in_dev_for_each_ifa_rcu
2019-06-02 18:06:26 -07:00
nfnetlink_queue.c
netfilter: replace skb_make_writable with skb_ensure_writable
2019-05-31 18:02:48 +02:00
nfnetlink.c
netlink: make validation more configurable for future strictness
2019-04-27 17:07:21 -04:00
nft_bitwise.c
netfilter: nf_tables: add direct calls for all builtin expressions
2019-01-18 15:02:33 +01:00
nft_byteorder.c
netfilter: nf_tables: add direct calls for all builtin expressions
2019-01-18 15:02:33 +01:00
nft_chain_filter.c
…
nft_chain_nat.c
netfilter: nat: add inet family nat support
2019-04-08 23:01:39 +02:00
nft_chain_route.c
netfilter: nf_tables: merge route type into core
2019-04-08 23:01:42 +02:00
nft_cmp.c
netfilter: nf_tables: add direct calls for all builtin expressions
2019-01-18 15:02:33 +01:00
nft_compat.c
netlink: make validation more configurable for future strictness
2019-04-27 17:07:21 -04:00
nft_connlimit.c
…
nft_counter.c
netfilter: nft_counter: remove wrong __percpu of nft_counter_resest()'s arg
2019-01-28 11:32:43 +01:00
nft_ct.c
netfilter: nft_ct: Add ct id support
2019-04-30 14:19:57 +02:00
nft_dup_netdev.c
…
nft_dynset.c
netfilter: nf_tables: relocate header content to consumer
2019-04-30 13:35:17 +02:00
nft_exthdr.c
netfilter: nf_tables: prefer skb_ensure_writable
2019-05-31 18:02:46 +02:00
nft_fib_inet.c
…
nft_fib_netdev.c
…
nft_fib.c
netfilter: nft_fib: Fix existence check support
2019-05-21 16:10:38 +02:00
nft_flow_offload.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
2019-05-23 14:45:36 -07:00
nft_fwd_netdev.c
…
nft_hash.c
Revert "netfilter: nft_hash: add map lookups for hashing operations"
2019-01-18 15:59:47 +01:00
nft_immediate.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-02-08 15:00:17 -08:00
nft_limit.c
…
nft_log.c
…
nft_lookup.c
netfilter: nf_tables: bogus EBUSY when deleting set after flush
2019-03-11 13:19:24 +01:00
nft_masq.c
netfilter: nf_nat_masquerade: unify ipv4/6 notifier registration
2019-04-11 20:59:34 +02:00
nft_meta.c
netfilter: nft_meta: Add NFT_META_I/OIFKIND meta type
2019-01-18 15:58:20 +01:00
nft_nat.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422
2019-06-05 17:37:15 +02:00
nft_numgen.c
…
nft_objref.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422
2019-06-05 17:37:15 +02:00
nft_osf.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
nft_payload.c
netfilter: nf_tables: prefer skb_ensure_writable
2019-05-31 18:02:46 +02:00
nft_queue.c
…
nft_quota.c
netfilter: nf_tables: prepare nft_object for lookups via hashtable
2019-01-18 15:02:32 +01:00
nft_range.c
netfilter: nf_tables: add direct calls for all builtin expressions
2019-01-18 15:02:33 +01:00
nft_redir.c
netfilter: nft_redir: add inet support
2019-04-08 23:03:01 +02:00
nft_reject_inet.c
…
nft_reject.c
…
nft_rt.c
netfilter: nf_tables: add direct calls for all builtin expressions
2019-01-18 15:02:33 +01:00
nft_set_bitmap.c
…
nft_set_hash.c
netfilter: nft_set_hash: remove nft_hash_key()
2019-02-27 11:08:32 +01:00
nft_set_rbtree.c
netfilter: nft_set_rbtree: check for inactive element after flag mismatch
2019-03-18 16:21:09 +01:00
nft_socket.c
…
nft_tproxy.c
…
nft_tunnel.c
netlink: make validation more configurable for future strictness
2019-04-27 17:07:21 -04:00
nft_xfrm.c
…
utils.c
netfilter: ipv6: avoid indirect calls for IPV6=y case
2019-02-04 18:21:12 +01:00
x_tables.c
netfilter: make two functions static
2019-04-08 23:28:33 +02:00
xt_addrtype.c
netfilter: ipv6: avoid indirect calls for IPV6=y case
2019-02-04 18:21:12 +01:00
xt_AUDIT.c
…
xt_bpf.c
…
xt_cgroup.c
…
xt_CHECKSUM.c
…
xt_CLASSIFY.c
…
xt_cluster.c
…
xt_comment.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
xt_connbytes.c
…
xt_connlabel.c
netfilter: connlabels: fix spelling mistake "trackling" -> "tracking"
2019-04-30 14:19:57 +02:00
xt_connlimit.c
…
xt_connmark.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13
2019-05-21 11:28:45 +02:00
xt_CONNSECMARK.c
…
xt_conntrack.c
…
xt_cpu.c
…
xt_CT.c
netfilter: Export nf_ct_{set,destroy}_timeout()
2019-03-28 16:53:29 -07:00
xt_dccp.c
…
xt_devgroup.c
…
xt_dscp.c
…
xt_DSCP.c
netfilter: replace skb_make_writable with skb_ensure_writable
2019-05-31 18:02:48 +02:00
xt_ecn.c
…
xt_esp.c
…
xt_hashlimit.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
xt_helper.c
…
xt_hl.c
…
xt_HL.c
netfilter: xt_HL: prefer skb_ensure_writable
2019-05-31 18:02:47 +02:00
xt_HMARK.c
…
xt_IDLETIMER.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 336
2019-06-05 17:37:07 +02:00
xt_ipcomp.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
2019-05-30 11:26:32 -07:00
xt_iprange.c
…
xt_ipvs.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
xt_l2tp.c
…
xt_LED.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 164
2019-05-30 11:26:38 -07:00
xt_length.c
…
xt_limit.c
…
xt_LOG.c
…
xt_mac.c
…
xt_mark.c
…
xt_MASQUERADE.c
netfilter: nf_nat_masquerade: unify ipv4/6 notifier registration
2019-04-11 20:59:34 +02:00
xt_multiport.c
…
xt_nat.c
netfilter: nat: remove nf_nat_l3proto.h and nf_nat_core.h
2019-02-27 10:54:08 +01:00
xt_NETMAP.c
…
xt_nfacct.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 72
2019-05-24 17:36:47 +02:00
xt_NFLOG.c
…
xt_NFQUEUE.c
…
xt_osf.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13
2019-05-21 11:28:45 +02:00
xt_owner.c
netfilter: xt_owner: Add supplementary groups option
2019-05-31 18:02:41 +02:00
xt_physdev.c
netfilter: physdev: relax br_netfilter dependency
2019-01-18 15:02:33 +01:00
xt_pkttype.c
…
xt_policy.c
…
xt_quota.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
xt_rateest.c
…
xt_RATEEST.c
…
xt_realm.c
…
xt_recent.c
netfilter: xt_recent: Use struct_size() in kvzalloc()
2019-02-12 00:39:39 +01:00
xt_REDIRECT.c
…
xt_repldata.h
…
xt_sctp.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
xt_SECMARK.c
…
xt_set.c
…
xt_socket.c
…
xt_state.c
…
xt_statistic.c
…
xt_string.c
…
xt_tcpmss.c
…
xt_TCPMSS.c
netfilter: tcpmss, optstrip: prefer skb_ensure_writable
2019-05-31 18:02:48 +02:00
xt_TCPOPTSTRIP.c
netfilter: tcpmss, optstrip: prefer skb_ensure_writable
2019-05-31 18:02:48 +02:00
xt_tcpudp.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
xt_TEE.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 3
2019-05-21 11:28:40 +02:00
xt_time.c
netfilter: never get/set skb->tstamp
2019-04-22 10:34:30 +02:00
xt_TPROXY.c
…
xt_TRACE.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
xt_u32.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00