lkml.org 
[lkml]   [2018]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the rdma tree with Linus' tree
Hi Jason,

On Mon, 6 Aug 2018 13:41:42 -0600 Jason Gunthorpe <jgg@mellanox.com> 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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2018-08-06 23:51    [W:0.036 / U:1.796 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site