On Wed, Apr 15, 2015 at 6:54 AM, Or Gerlitz <[email protected]> wrote: > There were two trivial conflicts between the mlx4 changes to another mlx4 > series which is present in net-next, I resolved them and you can pull the > fixed series from my git tree,SB.
Not sure how you expect this to work. It is a hassle for both maintainers if you are sending conflicting patches to different trees. Do you want some of the mlx4 changes to go via Dave's tree and some to go via my/Doug's tree? If so do you expect us to rebase onto Dave's tree? Because I don't want to do that when I either need to rebase onto some random point of net-next or some random point of Linus's tree in the middle of the merge window. - R. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
