Re: [PULL REQUEST] Please pull rdma.git

[Linus Torvalds <torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>]

On Thu, Mar 17, 2016 at 10:31 AM, Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>
> There is the one merge issue between the net tree and this tree that was
> simple and obvious to fix up.  I've had a phone call with Mellanox about
> how to avoid this in the future (the result of that conversation was
> that when they have a pre-req patch that is going through Dave's tree,
> but the dependent patches are going through my tree, then they should
> submit the pre-req patch to me as well, we can carry identical patches
> in both trees, and when you merge the duplicate patches will just drop
> one and then there will be no merge issue).

That will end up causing just more problems if there are then other
patches on top in either tree.

It would be much better to have the shared pre-requisite not as a
_patch_, but as a separate branch. So that you actually share the
commits, not just the diff.

Other subsystems have been able to do that.

>  drivers/infiniband/hw/mlx5/srq.c                  |  41 +-
..
>  91 files changed, 3647 insertions(+), 1995 deletions(-)
>  create mode 100644 drivers/infiniband/hw/mlx5/gsi.c

My diffstat doesn't match yours, and it's that "srq.c" file in
particular that I have no changes to, and see no changes in your pull
request.

Other than that it looks normal, but it makes me wonder how that diff
was generated.

                  Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html