From: Jason Gunthorpe <jgg@nvidia.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Doug Ledford <dledford@redhat.com>,
Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>,
Guo Zhi <qtxuning1999@sjtu.edu.cn>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
Subject: Re: linux-next: manual merge of the rdma tree with the rdma-fixes tree
Date: Fri, 1 Oct 2021 10:52:12 -0300 [thread overview]
Message-ID: <20211001135212.GR964074@nvidia.com> (raw)
In-Reply-To: <20210930113518.4b9f55e6@canb.auug.org.au>
On Thu, Sep 30, 2021 at 11:35:18AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> drivers/infiniband/hw/hfi1/ipoib_tx.c
>
> between commit:
>
> 7d5cfafe8b40 ("RDMA/hfi1: Fix kernel pointer leak")
>
> from the rdma-fixes tree and commit:
>
> f5dc70a0e142 ("IB/hfi1: Tune netdev xmit cachelines")
>
> 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.
It looks OK, thanks
Jason
next prev parent reply other threads:[~2021-10-01 13:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-30 1:35 linux-next: manual merge of the rdma tree with the rdma-fixes tree Stephen Rothwell
2021-10-01 13:52 ` 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
2019-08-23 2:22 Stephen Rothwell
2019-08-23 15:02 ` 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=20211001135212.GR964074@nvidia.com \
--to=jgg@nvidia.com \
--cc=dennis.dalessandro@cornelisnetworks.com \
--cc=dledford@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mike.marciniszyn@cornelisnetworks.com \
--cc=qtxuning1999@sjtu.edu.cn \
--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 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).