* linux-next: manual merge of the rdma-leon tree with the net-next tree
@ 2017-01-03 1:27 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2017-01-03 1:27 UTC (permalink / raw)
To: Leon Romanovsky, David Miller, Networking; +Cc: linux-next, linux-kernel
Hi Leon,
Today's linux-next merge of the rdma-leon tree got conflicts in:
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/mlx5_ib.h
drivers/infiniband/hw/mlx5/mr.c
drivers/infiniband/hw/mlx5/qp.c
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
drivers/net/ethernet/mellanox/mlx5/core/eq.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
include/linux/mlx5/device.h
include/linux/mlx5/driver.h
include/linux/mlx5/mlx5_ifc.h
between commits in the rdma-leon tree and commits (several of whitch
are the same, or similar, patches) in the net-next tree.
I just dropped the rdma-leon tree for today. Please clean it up.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-01-03 1:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-03 1:27 linux-next: manual merge of the rdma-leon tree with the net-next tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).