* merge conflict between rdma-next and net-next
@ 2017-10-19 6:24 Leon Romanovsky
0 siblings, 0 replies; only message in thread
From: Leon Romanovsky @ 2017-10-19 6:24 UTC (permalink / raw)
To: Doug Ledford, David S. Miller
Cc: RDMA mailing list, linux-netdev, Tariq Toukan, Saeed Mahameed
[-- Attachment #1: Type: text/plain, Size: 378 bytes --]
Hi Doug and Dave,
In the absence of linux-next, I want to warn you that there is a trivial
merge conflict between rdma-next and net-next in drivers/net/ethernet/mellanox/mlx4/catas.c
The origin of the merge conflict is the following patch https://patchwork.kernel.org/patch/9986131/
applied to rdma-next. It is part of tree-wide conversion to timer_setup() interface.
Thanks
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-10-19 6:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-19 6:24 merge conflict between rdma-next and net-next Leon Romanovsky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox