David S. Miller 6b6cbc1471 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts were simply overlapping changes.  In the net/ipv4/route.c
case the code had simply moved around a little bit and the same fix
was made in both 'net' and 'net-next'.

In the net/sched/sch_generic.c case a fix in 'net' happened at
the same time that a new argument was added to qdisc_hash_add().

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-04-15 21:16:30 -04:00

..

ipset

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

ipvs

netlink: pass extended ACK struct where available

2017-04-13 13:58:22 -04:00

core.c

…

Kconfig

…

Makefile

…

nf_conntrack_acct.c

…

nf_conntrack_amanda.c

…

nf_conntrack_broadcast.c

…

nf_conntrack_core.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-03-23 16:41:27 -07:00

nf_conntrack_ecache.c

netfilter: invoke synchronize_rcu after set the _hook_ to NULL

2017-03-27 13:47:28 +02:00

nf_conntrack_expect.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-04-15 21:16:30 -04:00

nf_conntrack_extend.c

netfilter: nf_ct_ext: fix possible panic after nf_ct_extend_unregister

2017-03-27 13:47:29 +02:00

nf_conntrack_ftp.c

…

nf_conntrack_h323_asn1.c

…

nf_conntrack_h323_main.c

…

nf_conntrack_h323_types.c

…

nf_conntrack_helper.c

netfilter: helper: Add the rcu lock when call __nf_conntrack_helper_find

2017-04-08 23:52:15 +02:00

nf_conntrack_irc.c

…

nf_conntrack_l3proto_generic.c

…

nf_conntrack_labels.c

…

nf_conntrack_netbios_ns.c

…

nf_conntrack_netlink.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-04-15 21:16:30 -04:00

nf_conntrack_pptp.c

…

nf_conntrack_proto_dccp.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

nf_conntrack_proto_generic.c

…

nf_conntrack_proto_gre.c

…

nf_conntrack_proto_sctp.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

nf_conntrack_proto_tcp.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

nf_conntrack_proto_udp.c

…

nf_conntrack_proto.c

…

nf_conntrack_sane.c

…

nf_conntrack_seqadj.c

…

nf_conntrack_sip.c

…

nf_conntrack_snmp.c

…

nf_conntrack_standalone.c

…

nf_conntrack_tftp.c

…

nf_conntrack_timeout.c

…

nf_conntrack_timestamp.c

…

nf_dup_netdev.c

…

nf_internals.h

…

nf_log_common.c

…

nf_log_netdev.c

…

nf_log.c

…

nf_nat_amanda.c

…

nf_nat_core.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

nf_nat_ftp.c

…

nf_nat_helper.c

…

nf_nat_irc.c

…

nf_nat_proto_common.c

…

nf_nat_proto_dccp.c

…

nf_nat_proto_sctp.c

netfilter: nf_nat_sctp: fix ICMP packet to be dropped accidently

2017-03-08 18:04:06 +01:00

nf_nat_proto_tcp.c

…

nf_nat_proto_udp.c

…

nf_nat_proto_unknown.c

…

nf_nat_redirect.c

netfilter: make it safer during the inet6_dev->addr_list traversal

2017-04-08 23:52:16 +02:00

nf_nat_sip.c

…

nf_nat_tftp.c

…

nf_queue.c

…

nf_sockopt.c

…

nf_synproxy_core.c

…

nf_tables_api.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

nf_tables_core.c

…

nf_tables_inet.c

…

nf_tables_netdev.c

…

nf_tables_trace.c

…

nfnetlink_acct.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

nfnetlink_cthelper.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

nfnetlink_cttimeout.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

nfnetlink_log.c

netfilter: refcounter conversions

2017-03-17 12:49:43 +01:00

nfnetlink_queue.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

nfnetlink.c

netlink: pass extended ACK struct where available

2017-04-13 13:58:22 -04:00

nft_bitwise.c

…

nft_byteorder.c

…

nft_cmp.c

…

nft_compat.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

nft_counter.c

netfilter: provide nft_ctx in object init function

2017-03-13 13:42:00 +01:00

nft_ct.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-03-23 16:41:27 -07:00

nft_dup_netdev.c

…

nft_dynset.c

netfilter: nf_tables: add nft_set_lookup()

2017-03-06 18:23:23 +01:00

nft_exthdr.c

…

nft_fib_inet.c

…

nft_fib.c

netfilter: nft_fib: Support existence check

2017-03-13 13:45:36 +01:00

nft_fwd_netdev.c

…

nft_hash.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-04-15 21:16:30 -04:00

nft_immediate.c

…

nft_limit.c

netfilter: limit: use per-rule spinlock to improve the scalability

2017-03-13 19:30:31 +01:00

nft_log.c

…

nft_lookup.c

netfilter: nf_tables: add nft_set_lookup()

2017-03-06 18:23:23 +01:00

nft_masq.c

netfilter: nf_tables: validate the expr explicitly after init successfully

2017-03-06 18:22:12 +01:00

nft_meta.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-03-23 16:41:27 -07:00

nft_nat.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-03-23 16:41:27 -07:00

nft_numgen.c

…

nft_objref.c

netfilter: nf_tables: add nft_set_lookup()

2017-03-06 18:23:23 +01:00

nft_payload.c

…

nft_queue.c

…

nft_quota.c

netfilter: provide nft_ctx in object init function

2017-03-13 13:42:00 +01:00

nft_range.c

…

nft_redir.c

netfilter: nf_tables: validate the expr explicitly after init successfully

2017-03-06 18:22:12 +01:00

nft_reject_inet.c

netfilter: nf_tables: validate the expr explicitly after init successfully

2017-03-06 18:22:12 +01:00

nft_reject.c

netfilter: nf_tables: validate the expr explicitly after init successfully

2017-03-06 18:22:12 +01:00

nft_rt.c

…

nft_set_bitmap.c

netfilter: nft_set_bitmap: keep a list of dummy elements

2017-03-13 13:34:21 +01:00

nft_set_hash.c

…

nft_set_rbtree.c

netfilter: nft_set_rbtree: use per-set rwlock to improve the scalability

2017-03-13 19:30:43 +01:00

x_tables.c

…

xt_addrtype.c

…

xt_AUDIT.c

…

xt_bpf.c

…

xt_cgroup.c

…

xt_CHECKSUM.c

…

xt_CLASSIFY.c

…

xt_cluster.c

…

xt_comment.c

…

xt_connbytes.c

…

xt_connlabel.c

…

xt_connlimit.c

…

xt_connmark.c

…

xt_CONNSECMARK.c

…

xt_conntrack.c

…

xt_cpu.c

…

xt_CT.c

…

xt_dccp.c

…

xt_devgroup.c

…

xt_dscp.c

…

xt_DSCP.c

…

xt_ecn.c

…

xt_esp.c

…

xt_hashlimit.c

…

xt_helper.c

…

xt_hl.c

…

xt_HL.c

…

xt_HMARK.c

…

xt_IDLETIMER.c

…

xt_ipcomp.c

…

xt_iprange.c

…

xt_ipvs.c

…

xt_l2tp.c

…

xt_LED.c

…

xt_length.c

…

xt_limit.c

netfilter: limit: use per-rule spinlock to improve the scalability

2017-03-13 19:30:31 +01:00

xt_LOG.c

…

xt_mac.c

…

xt_mark.c

…

xt_multiport.c

…

xt_nat.c

…

xt_NETMAP.c

…

xt_nfacct.c

…

xt_NFLOG.c

…

xt_NFQUEUE.c

…

xt_osf.c

…

xt_owner.c

…

xt_physdev.c

…

xt_pkttype.c

…

xt_policy.c

…

xt_quota.c

…

xt_rateest.c

…

xt_RATEEST.c

…

xt_realm.c

…

xt_recent.c

…

xt_REDIRECT.c

…

xt_repldata.h

…

xt_sctp.c

…

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: xt_TCPMSS: add more sanity tests on tcph->doff

2017-04-08 22:24:19 +02:00

xt_TCPOPTSTRIP.c

…

xt_tcpudp.c

…

xt_TEE.c

…

xt_time.c

…

xt_TPROXY.c

netfilter: make it safer during the inet6_dev->addr_list traversal

2017-04-08 23:52:16 +02:00

xt_TRACE.c

…

xt_u32.c

…