David S. Miller 68aaf44595 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.

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

2019-08-27 14:23:31 -07:00

..

ipset

netfilter: add missing includes to a number of header-files.

2019-08-13 12:14:39 +02:00

nf_conntrack_amanda.h

netfilter: add missing includes to a number of header-files.

2019-08-13 12:14:39 +02:00

nf_conntrack_common.h

netfilter: remove obsolete need_conntrack stub

2018-09-17 11:40:07 +02:00

nf_conntrack_dccp.h

netfilter: remove "#ifdef __KERNEL__" guards from some headers.

2019-08-13 12:15:28 +02:00

nf_conntrack_ftp.h

netfilter: add missing includes to a number of header-files.

2019-08-13 12:14:39 +02:00

nf_conntrack_h323_asn1.h

netfilter: add missing includes to a number of header-files.

2019-08-13 12:14:39 +02:00

nf_conntrack_h323_types.h

netfilter: add include guard to nf_conntrack_h323_types.h

2019-08-19 13:59:57 +02:00

nf_conntrack_h323.h

netfilter: remove "#ifdef __KERNEL__" guards from some headers.

2019-08-13 12:15:28 +02:00

nf_conntrack_irc.h

netfilter: remove "#ifdef __KERNEL__" guards from some headers.

2019-08-13 12:15:28 +02:00

nf_conntrack_pptp.h

netfilter: remove "#ifdef __KERNEL__" guards from some headers.

2019-08-13 12:15:28 +02:00

nf_conntrack_proto_gre.h

netfilter: remove "#ifdef __KERNEL__" guards from some headers.

2019-08-13 12:15:28 +02:00

nf_conntrack_sane.h

netfilter: remove "#ifdef __KERNEL__" guards from some headers.

2019-08-13 12:15:28 +02:00

nf_conntrack_sctp.h

…

nf_conntrack_sip.h

netfilter: remove "#ifdef __KERNEL__" guards from some headers.

2019-08-13 12:15:28 +02:00

nf_conntrack_snmp.h

netfilter: add missing includes to a number of header-files.

2019-08-13 12:14:39 +02:00

nf_conntrack_tcp.h

…

nf_conntrack_tftp.h

netfilter: add missing includes to a number of header-files.

2019-08-13 12:14:39 +02:00

nf_conntrack_zones_common.h

…

nfnetlink_acct.h

…

nfnetlink_osf.h

netfilter: nft_osf: Add version option support

2019-04-08 23:27:12 +02:00

nfnetlink.h

netfilter: nf_tables: fix suspicious RCU usage in nft_chain_stats_replace()

2018-12-04 01:37:13 +01:00

x_tables.h

netfilter: add missing IS_ENABLED(CONFIG_NETFILTER) checks to some header-files.

2019-08-13 12:15:18 +02:00

xt_hashlimit.h

…

xt_physdev.h

…