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
