Message ID | 20191127002431.GA4861@ziepe.ca (mailing list archive) |
---|---|
State | Superseded |
Commit | d76886972823ce456c0c61cd2284e85668e2131e |
Headers | show |
Series | [GIT,PULL] Please pull RDMA subsystem changes | expand |
On Tue, Nov 26, 2019 at 4:24 PM Jason Gunthorpe <jgg@mellanox.com> wrote: > > There is one conflict with v5.4, the hunk should be resolved in favor of > rdma.git Ok, so no need for the (now two!) xa_erase() calls to be the "xa_erase_irq()" one? Linus
The pull request you sent on Wed, 27 Nov 2019 00:24:40 +0000:
> git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git tags/for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d76886972823ce456c0c61cd2284e85668e2131e
Thank you!
On Wed, Nov 27, 2019 at 10:19:52AM -0800, Linus Torvalds wrote: > On Tue, Nov 26, 2019 at 4:24 PM Jason Gunthorpe <jgg@mellanox.com> wrote: > > > > There is one conflict with v5.4, the hunk should be resolved in favor of > > rdma.git > > Ok, so no need for the (now two!) xa_erase() calls to be the > "xa_erase_irq()" one? Two? Yes dropping the irq is right. -rc still had the irq call xa_store, but that part was removed in this code in -next. This conflict is because the fixes sent to -rc accidently missed that -rc still had the irq and had a wrong xa_store. I wanted to include the combined diff here, but git doesn't want to show it to me :\ $ git show -c for-linus-merged drivers/infiniband/hw/mlx5/mr.c $ git show --cc for-linus-merged drivers/infiniband/hw/mlx5/mr.c It looks OK in your tree, thanks Jason