David S. Miller 6bb8824732 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... net/ipv6/ip6_gre.c is a case of parallel adds. include/trace/events/tcp.h is a little bit more tricky. The removal of in-trace-macro ifdefs in 'net' paralleled with moving show_tcp_state_name and friends over to include/trace/events/sock.h in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-29 15:42:26 -05:00
..
cmd.h
cq.h	Updates for 4.15 kernel merge window	2017-11-15 14:54:53 -08:00
device.h	net/mlx5: Add MLX5_SET16 and MLX5_GET16	2017-11-04 21:24:42 -07:00
doorbell.h	IB/mlx5: Use blue flame register allocator in mlx5_ib	2017-01-09 20:25:08 +02:00
driver.h	Third pull request for 4.15-rc	2017-12-28 23:06:01 -08:00
fs.h	net/mlx5: Separate ingress/egress namespaces for each vport	2017-12-29 00:43:52 +02:00
mlx5_ifc_fpga.h	net/mlx5: Accel, Add IPSec acceleration interface	2017-06-27 16:36:47 +03:00
mlx5_ifc.h	net/mlx5: Fix rate limit packet pacing naming and struct	2017-12-19 23:23:58 +02:00
port.h	net/mlx5: QPTS and QPDPM register firmware command support	2017-11-04 21:26:21 -07:00
qp.h	net/mlx5e: Add 802.1ad VLAN insertion support	2017-11-09 13:27:35 +09:00
srq.h	net/mlx5: Add XRQ support	2017-08-29 08:30:20 -04:00
transobj.h
vport.h	net/mlx5: Add raw ethernet local loopback firmware command	2017-07-24 10:26:16 -04:00