Hi Jason,

On Mon, 6 Aug 2018 13:41:42 -0600 Jason Gunthorpe [off-list ref] wrote:

The resolution should end up like this:

        srcu_key = srcu_read_lock(&file->device->disassociate_srcu);

        if (!verify_command_mask(file, command, extended)) {
                ret = -EOPNOTSUPP;
                goto out;
        }

(ie take the hunk from for-next, discard the for-rc stuff)

As commit 22fa27fbc64d01cbbe1e4da751e64cc22d24a6e4 also removed the
'file->ucontext' stuff

Thanks, I have fixed up my resolution today.

-- 
Cheers,
Stephen Rothwell