David S. Miller 70f3522614 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three conflicts, one of which, for marvell10g.c is non-trivial and requires some follow-up from Heiner or someone else. The issue is that Heiner converted the marvell10g driver over to use the generic c45 code as much as possible. However, in 'net' a bug fix appeared which makes sure that a new local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0 is cleared. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-24 12:06:19 -08:00
..
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2019-02-18 11:38:30 -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
br.c	net: bridge: Handle NETDEV_PRE_CHANGEADDR from ports	2018-12-13 18:41:38 -08:00
br_arp_nd_proxy.c	net: bridge: convert neigh_suppress_enabled option to a bit	2018-09-26 10:04:23 -07:00
br_device.c	bridge: support for ndo_fdb_get	2018-12-16 14:42:34 -08:00
br_fdb.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-01-21 14:41:32 -08:00
br_forward.c	net: bridge: Fix ethernet header pointer before check skb forwardable	2019-01-17 21:55:15 -08:00
br_if.c	net: bridge: Issue NETDEV_PRE_CHANGEADDR	2018-12-13 18:41:38 -08:00
br_input.c	net: bridge: add no_linklocal_learn bool option	2018-11-27 15:04:15 -08: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-02-24 12:06:19 -08:00
br_netfilter_hooks.c	netfilter: physdev: relax br_netfilter dependency	2019-01-18 15:02:33 +01:00
br_netfilter_ipv6.c	net: Fix usage of pskb_trim_rcsum	2019-01-18 14:05:14 -08:00
br_netlink.c	net: bridge: remove unneeded variable 'err'	2018-12-18 15:50:13 -08:00
br_netlink_tunnel.c	bridge: netlink: make setlink/dellink notifications more accurate	2017-10-29 11:03:43 +09:00
br_nf_core.c	xfrm: Move dst->path into struct xfrm_dst	2017-11-30 09:54:26 -05:00
br_private.h	net: Add extack argument to ndo_fdb_add()	2019-01-17 15:18:47 -08: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_stp.c	net: bridge: add notifications for the bridge dev on vlan change	2017-11-02 15:53:40 +09: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: add notifications for the bridge dev on vlan change	2017-11-02 15:53:40 +09:00
br_stp_timer.c	net: bridge: Convert timers to use timer_setup()	2017-11-03 15:42:49 +09:00
br_switchdev.c	net: bridge: Stop calling switchdev_port_attr_get()	2019-02-21 14:55:14 -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.c	net: bridge: Fix VLANs memory leak	2019-01-08 16:53:54 -05:00
br_vlan_tunnel.c	bridge: vlan_tunnel: explicitly reset metadata attrs to NULL on failure	2017-02-17 13:33:41 -05:00