David S. Miller 2e2d6f0342 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... net/sched/cls_api.c has overlapping changes to a call to nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL to the 5th argument, and another (from 'net-next') added cb->extack instead of NULL to the 6th argument. net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to code which moved (to mr_table_dump)) in 'net-next'. Thanks to David Ahern for the heads up. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-10-19 11:03:06 -07:00
..
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-10-19 11:03:06 -07:00
hw	net/mlx5: Refactor fragmented buffer struct fields and init flow	2018-10-18 13:13:31 -07:00
sw	Linux 4.18	2018-08-16 13:12:00 -06:00
ulp	RDMA/netdev: Fix netlink support in IPoIB	2018-10-10 17:58:12 -07:00
Kconfig	IB/ucm: fix UCM link error	2018-08-21 16:56:32 -06:00
Makefile	IB/rdmavt: Create module framework and handle driver registration	2016-03-10 20:37:04 -05:00