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

..

netfilter

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

2019-06-25 01:32:59 +02:00

br_arp_nd_proxy.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_device.c

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

2019-06-07 11:00:14 -07:00

br_fdb.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_forward.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_if.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_input.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_ioctl.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_mdb.c

netlink: make validation more configurable for future strictness

2019-04-27 17:07:21 -04:00

br_multicast.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_netfilter_hooks.c

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

2019-06-25 01:32:59 +02:00

br_netfilter_ipv6.c

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

2019-06-25 01:32:59 +02:00

br_netlink_tunnel.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_netlink.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_nf_core.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_private_stp.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_private_tunnel.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_private.h

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

2019-06-07 11:00:14 -07:00

br_stp_bpdu.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_stp_if.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_stp_timer.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_stp.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_switchdev.c

net: switchdev: Replace port attr set SDO with a notification

2019-02-27 12:39:56 -08:00

br_sysfs_br.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_sysfs_if.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_vlan_tunnel.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

br_vlan.c

treewide: Add SPDX license identifier for missed files

2019-05-21 10:50:45 +02:00

br.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

Kconfig

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00

Makefile

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

2017-11-04 09:26:51 +09:00