On Tue, Nov 26, 2019 at 4:24 PM Jason Gunthorpe <jgg@xxxxxxxxxxxx> 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