# Autogenerated by git request-pull. The following changes since commit bbd8a0d3a3b65d341437f8b99c828fa5cc29c739: Krishna Kumar (1): net: Avoid enqueuing skb for default qdiscs are available in the git repository at: git://dev.medozas.de/linux master Jan Engelhardt (18): netfilter: xtables: remove xt_TOS v0 netfilter: xtables: remove xt_CONNMARK v0 netfilter: xtables: remove xt_MARK v0, v1 netfilter: xtables: remove xt_connmark v0 netfilter: xtables: remove xt_conntrack v0 netfilter: xtables: remove xt_iprange v0 netfilter: xtables: remove xt_mark v0 netfilter: xtables: remove xt_owner v0 netfilter: xtables: remove redirecting header files netfilter: conntrack: switch hook PFs to nfproto netfilter: xtables: switch hook PFs to nfproto netfilter: xtables: switch table AFs to nfproto netfilter: xtables: realign struct xt_target_param netfilter: iptables: remove unused datalen variable netfilter: xtables: use memcmp in unconditional check netfilter: xtables: ignore unassigned hooks in check_entry_size_and_hooks netfilter: xtables: check for unconditionality of policies netfilter: xtables: check for standard verdicts in policies Documentation/feature-removal-schedule.txt | 25 ---- include/linux/netfilter/x_tables.h | 2 +- include/linux/netfilter/xt_CONNMARK.h | 6 - include/linux/netfilter/xt_MARK.h | 17 --- include/linux/netfilter/xt_connmark.h | 5 - include/linux/netfilter/xt_conntrack.h | 36 ----- include/linux/netfilter/xt_mark.h | 5 - include/linux/netfilter_ipv4/Kbuild | 32 ----- include/linux/netfilter_ipv4/ipt_CLASSIFY.h | 7 - include/linux/netfilter_ipv4/ipt_CONNMARK.h | 19 --- include/linux/netfilter_ipv4/ipt_DSCP.h | 18 --- include/linux/netfilter_ipv4/ipt_ECN.h | 4 +- include/linux/netfilter_ipv4/ipt_MARK.h | 18 --- include/linux/netfilter_ipv4/ipt_NFQUEUE.h | 16 --- include/linux/netfilter_ipv4/ipt_TCPMSS.h | 9 -- include/linux/netfilter_ipv4/ipt_TOS.h | 12 -- include/linux/netfilter_ipv4/ipt_comment.h | 10 -- include/linux/netfilter_ipv4/ipt_connbytes.h | 18 --- include/linux/netfilter_ipv4/ipt_connmark.h | 7 - include/linux/netfilter_ipv4/ipt_conntrack.h | 28 ---- include/linux/netfilter_ipv4/ipt_dccp.h | 15 -- include/linux/netfilter_ipv4/ipt_dscp.h | 21 --- include/linux/netfilter_ipv4/ipt_ecn.h | 4 +- include/linux/netfilter_ipv4/ipt_esp.h | 10 -- include/linux/netfilter_ipv4/ipt_hashlimit.h | 14 -- include/linux/netfilter_ipv4/ipt_helper.h | 7 - include/linux/netfilter_ipv4/ipt_iprange.h | 21 --- include/linux/netfilter_ipv4/ipt_length.h | 7 - include/linux/netfilter_ipv4/ipt_limit.h | 8 - include/linux/netfilter_ipv4/ipt_mac.h | 7 - include/linux/netfilter_ipv4/ipt_mark.h | 9 -- include/linux/netfilter_ipv4/ipt_multiport.h | 15 -- include/linux/netfilter_ipv4/ipt_owner.h | 20 --- include/linux/netfilter_ipv4/ipt_physdev.h | 17 --- include/linux/netfilter_ipv4/ipt_pkttype.h | 7 - include/linux/netfilter_ipv4/ipt_policy.h | 23 ---- include/linux/netfilter_ipv4/ipt_recent.h | 21 --- include/linux/netfilter_ipv4/ipt_sctp.h | 105 --------------- include/linux/netfilter_ipv4/ipt_state.h | 15 -- include/linux/netfilter_ipv4/ipt_string.h | 10 -- include/linux/netfilter_ipv4/ipt_tcpmss.h | 7 - include/linux/netfilter_ipv4/ipt_tos.h | 13 -- include/linux/netfilter_ipv6/Kbuild | 12 +-- include/linux/netfilter_ipv6/ip6t_MARK.h | 9 -- include/linux/netfilter_ipv6/ip6t_esp.h | 10 -- include/linux/netfilter_ipv6/ip6t_length.h | 8 - include/linux/netfilter_ipv6/ip6t_limit.h | 8 - include/linux/netfilter_ipv6/ip6t_mac.h | 7 - include/linux/netfilter_ipv6/ip6t_mark.h | 9 -- include/linux/netfilter_ipv6/ip6t_multiport.h | 14 -- include/linux/netfilter_ipv6/ip6t_owner.h | 18 --- include/linux/netfilter_ipv6/ip6t_physdev.h | 17 --- include/linux/netfilter_ipv6/ip6t_policy.h | 23 ---- net/bridge/netfilter/ebtable_filter.c | 6 +- net/bridge/netfilter/ebtable_nat.c | 6 +- net/ipv4/netfilter/arp_tables.c | 44 +++++-- net/ipv4/netfilter/ip_tables.c | 48 +++++--- net/ipv4/netfilter/iptable_filter.c | 8 +- net/ipv4/netfilter/iptable_mangle.c | 12 +- net/ipv4/netfilter/iptable_raw.c | 6 +- net/ipv4/netfilter/iptable_security.c | 8 +- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 8 +- net/ipv4/netfilter/nf_nat_rule.c | 2 +- net/ipv4/netfilter/nf_nat_standalone.c | 8 +- net/ipv6/netfilter/ip6_tables.c | 45 +++++-- net/ipv6/netfilter/ip6table_filter.c | 8 +- net/ipv6/netfilter/ip6table_mangle.c | 12 +- net/ipv6/netfilter/ip6table_raw.c | 6 +- net/ipv6/netfilter/ip6table_security.c | 8 +- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 12 +- net/netfilter/xt_CONNMARK.c | 134 ++------------------ net/netfilter/xt_DSCP.c | 46 ------- net/netfilter/xt_MARK.c | 163 ++---------------------- net/netfilter/xt_connmark.c | 101 ++------------- net/netfilter/xt_conntrack.c | 155 +---------------------- net/netfilter/xt_dscp.c | 17 --- net/netfilter/xt_iprange.c | 45 +------ net/netfilter/xt_mark.c | 86 ++----------- net/netfilter/xt_owner.c | 130 ++----------------- 79 files changed, 210 insertions(+), 1719 deletions(-) delete mode 100644 include/linux/netfilter_ipv4/ipt_CLASSIFY.h delete mode 100644 include/linux/netfilter_ipv4/ipt_CONNMARK.h delete mode 100644 include/linux/netfilter_ipv4/ipt_DSCP.h delete mode 100644 include/linux/netfilter_ipv4/ipt_MARK.h delete mode 100644 include/linux/netfilter_ipv4/ipt_NFQUEUE.h delete mode 100644 include/linux/netfilter_ipv4/ipt_TCPMSS.h delete mode 100644 include/linux/netfilter_ipv4/ipt_TOS.h delete mode 100644 include/linux/netfilter_ipv4/ipt_comment.h delete mode 100644 include/linux/netfilter_ipv4/ipt_connbytes.h delete mode 100644 include/linux/netfilter_ipv4/ipt_connmark.h delete mode 100644 include/linux/netfilter_ipv4/ipt_conntrack.h delete mode 100644 include/linux/netfilter_ipv4/ipt_dccp.h delete mode 100644 include/linux/netfilter_ipv4/ipt_dscp.h delete mode 100644 include/linux/netfilter_ipv4/ipt_esp.h delete mode 100644 include/linux/netfilter_ipv4/ipt_hashlimit.h delete mode 100644 include/linux/netfilter_ipv4/ipt_helper.h delete mode 100644 include/linux/netfilter_ipv4/ipt_iprange.h delete mode 100644 include/linux/netfilter_ipv4/ipt_length.h delete mode 100644 include/linux/netfilter_ipv4/ipt_limit.h delete mode 100644 include/linux/netfilter_ipv4/ipt_mac.h delete mode 100644 include/linux/netfilter_ipv4/ipt_mark.h delete mode 100644 include/linux/netfilter_ipv4/ipt_multiport.h delete mode 100644 include/linux/netfilter_ipv4/ipt_owner.h delete mode 100644 include/linux/netfilter_ipv4/ipt_physdev.h delete mode 100644 include/linux/netfilter_ipv4/ipt_pkttype.h delete mode 100644 include/linux/netfilter_ipv4/ipt_policy.h delete mode 100644 include/linux/netfilter_ipv4/ipt_recent.h delete mode 100644 include/linux/netfilter_ipv4/ipt_sctp.h delete mode 100644 include/linux/netfilter_ipv4/ipt_state.h delete mode 100644 include/linux/netfilter_ipv4/ipt_string.h delete mode 100644 include/linux/netfilter_ipv4/ipt_tcpmss.h delete mode 100644 include/linux/netfilter_ipv4/ipt_tos.h delete mode 100644 include/linux/netfilter_ipv6/ip6t_MARK.h delete mode 100644 include/linux/netfilter_ipv6/ip6t_esp.h delete mode 100644 include/linux/netfilter_ipv6/ip6t_length.h delete mode 100644 include/linux/netfilter_ipv6/ip6t_limit.h delete mode 100644 include/linux/netfilter_ipv6/ip6t_mac.h delete mode 100644 include/linux/netfilter_ipv6/ip6t_mark.h delete mode 100644 include/linux/netfilter_ipv6/ip6t_multiport.h delete mode 100644 include/linux/netfilter_ipv6/ip6t_owner.h delete mode 100644 include/linux/netfilter_ipv6/ip6t_physdev.h delete mode 100644 include/linux/netfilter_ipv6/ip6t_policy.h -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html