From: Jason Gunthorpe <jgg@mellanox.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Doug Ledford <dledford@redhat.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Moni Shoua <monis@mellanox.com>,
Parav Pandit <parav@mellanox.com>,
Leon Romanovsky <leonro@mellanox.com>
Subject: Re: linux-next: manual merge of the rdma tree with the rdma-fixes tree
Date: Fri, 23 Aug 2019 15:02:42 +0000 [thread overview]
Message-ID: <20190823150237.GL12847@mellanox.com> (raw)
In-Reply-To: <20190823122227.4c2b9790@canb.auug.org.au>
On Fri, Aug 23, 2019 at 12:22:27PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> drivers/infiniband/hw/mlx5/mlx5_ib.h
>
> between commit:
>
> 0e6613b41edd ("IB/mlx5: Consolidate use_umr checks into single function")
>
> from the rdma-fixes tree and commit:
>
> 3e1f000ff746 ("IB/mlx5: Support per device q counters in switchdev mode")
>
> from the rdma tree.
>
> I fixed it up (see below) 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.
Looks OK to me, thanks
Jason
next prev parent reply other threads:[~2019-08-23 15:02 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-23 2:22 linux-next: manual merge of the rdma tree with the rdma-fixes tree Stephen Rothwell
2019-08-23 15:02 ` Jason Gunthorpe [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-06 1:37 Stephen Rothwell
2025-03-06 10:24 ` Zhu Yanjun
2025-03-06 11:35 ` Zhu Yanjun
[not found] ` <4d66668a-ff8e-48f6-a5e3-98ada08c5037@linux.dev>
2025-03-06 20:33 ` Stephen Rothwell
2023-09-28 1:38 Stephen Rothwell
2023-09-28 9:59 ` Leon Romanovsky
2022-01-06 0:44 Stephen Rothwell
2021-09-30 1:35 Stephen Rothwell
2021-10-01 13:52 ` Jason Gunthorpe
2018-07-10 1:17 Stephen Rothwell
2018-07-10 5:19 ` Leon Romanovsky
2018-06-27 0:07 Stephen Rothwell
2018-06-27 5:50 ` Leon Romanovsky
2018-05-01 0:10 Stephen Rothwell
2018-05-01 0:55 ` Doug Ledford
2018-05-02 10:22 ` Leon Romanovsky
2018-05-02 14:00 ` Doug Ledford
2018-05-02 17:50 ` Jason Gunthorpe
2018-03-22 0:45 Stephen Rothwell
2018-01-17 1:51 Stephen Rothwell
2018-01-17 1:55 ` Stephen Rothwell
2018-01-17 3:03 ` Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190823150237.GL12847@mellanox.com \
--to=jgg@mellanox.com \
--cc=dledford@redhat.com \
--cc=leonro@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=monis@mellanox.com \
--cc=parav@mellanox.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.