* linux-next: manual merge of the rdma tree with the FIXME tree
@ 2017-10-13 10:18 Mark Brown
0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2017-10-13 10:18 UTC (permalink / raw)
To: Doug Ledford, David S. Miller, Allen Pais, Kees Cook
Cc: netdev, Linux-Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 740 bytes --]
Hi Doug,
Today's linux-next merge of the rdma tree got a conflict in:
drivers/net/ethernet/mellanox/mlx4/catas.c
between commit:
d2a0012e7632a5 ("drivers: net: mlx4: use setup_timer() helper.")
from the net-next tree and commit:
55c0fcc3de4605 ("net/mlx4_core: Convert timers to use timer_setup()")
from the rdma tree.
I fixed it up by taking the second commit and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-10-13 10:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-13 10:18 linux-next: manual merge of the rdma tree with the FIXME tree Mark Brown
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).