Pablo Neira Ayuso 1c5ba67d22 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ... Resolve conflict between d2912cb15b ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500") removing the GPL disclaimer and fe03d47456 ("Update my email address") which updates Jozsef Kadlecsik's email. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>		2019-06-25 01:32:59 +02:00
..
ebt_802_3.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_among.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_arp.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_arpreply.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_dnat.c	netfilter: bridge: convert skb_make_writable to skb_ensure_writable	2019-05-31 18:02:43 +02:00
ebt_ip.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_ip6.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_limit.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_log.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_mark.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_mark_m.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_nflog.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_pkttype.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_redirect.c	netfilter: bridge: convert skb_make_writable to skb_ensure_writable	2019-05-31 18:02:43 +02:00
ebt_snat.c	netfilter: bridge: convert skb_make_writable to skb_ensure_writable	2019-05-31 18:02:43 +02:00
ebt_stp.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_vlan.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
ebtable_broute.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebtable_filter.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebtable_nat.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebtables.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
Kconfig	netfilter: bridge: add connection tracking system	2019-05-30 14:18:18 -07:00
Makefile	netfilter: bridge: add connection tracking system	2019-05-30 14:18:18 -07:00
nf_conntrack_bridge.c	netfilter: bridge: Fix non-untagged fragment packet	2019-06-21 17:21:12 +02:00
nf_log_bridge.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
nft_reject_bridge.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00