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

Conflict resolution of af_smc.c from Stephen Rothwell.

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

2019-04-17 11:26:25 -07:00

..

netfilter

bridge: broute: make broute a real ebtables table

2019-04-12 01:47:50 +02:00

br_arp_nd_proxy.c

bridge: reduce size of input cb to 16 bytes

2019-04-12 01:47:27 +02:00

br_device.c

bridge: support for ndo_fdb_get

2018-12-16 14:42:34 -08:00

br_fdb.c

rhashtable: use bit_spin_locks to protect hash bucket.

2019-04-07 19:12:12 -07:00

br_forward.c

net: bridge: update multicast stats from maybe_deliver()

2019-04-04 10:49:27 -07:00

br_if.c

net: bridge: use netif_is_bridge_port()

2019-03-29 13:48:40 -07:00

br_input.c

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

2019-04-17 11:26:25 -07:00

br_ioctl.c

net: bridge: add notifications for the bridge dev on vlan change

2017-11-02 15:53:40 +09:00

br_mdb.c

net: switchdev: Add extack argument to switchdev_port_obj_add()

2018-12-12 16:34:21 -08:00

br_multicast.c

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

2019-04-17 11:26:25 -07:00

br_netfilter_hooks.c

netfilter: bridge: set skb transport_header before entering NF_INET_PRE_ROUTING

2019-03-18 16:21:54 +01:00

br_netfilter_ipv6.c

netfilter: bridge: set skb transport_header before entering NF_INET_PRE_ROUTING

2019-03-18 16:21:54 +01:00

br_netlink_tunnel.c

bridge: netlink: make setlink/dellink notifications more accurate

2017-10-29 11:03:43 +09:00

br_netlink.c

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

2019-04-17 11:26:25 -07:00

br_nf_core.c

xfrm: Move dst->path into struct xfrm_dst

2017-11-30 09:54:26 -05:00

br_private_stp.h

net: bridge: add helper to set topology change

2016-12-10 21:27:23 -05:00

br_private_tunnel.h

bridge: netlink: make setlink/dellink notifications more accurate

2017-10-29 11:03:43 +09:00

br_private.h

bridge: broute: make broute a real ebtables table

2019-04-12 01:47:50 +02:00

br_stp_bpdu.c

net: introduce __skb_put_[zero, data, u8]

2017-06-20 13:30:14 -04:00

br_stp_if.c

net: bridge: optimize backup_port fdb convergence

2019-04-04 17:39:47 -07:00

br_stp_timer.c

net: bridge: Convert timers to use timer_setup()

2017-11-03 15:42:49 +09:00

br_stp.c

net: bridge: add notifications for the bridge dev on vlan change

2017-11-02 15:53:40 +09: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

net: bridge: mark hash_elasticity as obsolete

2018-12-05 17:01:51 -08:00

br_sysfs_if.c

net: bridge: remove redundant checks for null p->dev and p->br

2018-11-25 10:25:43 -08:00

br_vlan_tunnel.c

rhashtable: use bit_spin_locks to protect hash bucket.

2019-04-07 19:12:12 -07:00

br_vlan.c

rhashtable: use bit_spin_locks to protect hash bucket.

2019-04-07 19:12:12 -07:00

br.c

net: bridge: Handle NETDEV_PRE_CHANGEADDR from ports

2018-12-13 18:41:38 -08:00

Kconfig

docs: fix some broken documentation references

2018-09-20 11:09:53 -06:00

Makefile

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

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