On Wed, Apr 18, 2018 at 11:56:36AM +0100, Mark Rutland wrote: > On Tue, Apr 17, 2018 at 02:10:03PM +0200, Greg KH wrote: > > This patch doesn't apply at all as it conflicts with commit > > d7c5f8c815466fc00785bbff20f25b39643abe01 which was commit 5f16a046f8e1 > > ("arm64: futex: Fix undefined behaviour with FUTEX_OP_OPARG_SHIFT > > usage") upstream. > > > > Any chance you can provide a correct backport of this? > > The below is rebased atop of the conflicting patch (I based it on > v4.9.94). Luckily it's just a trivial conflict in the function > prototype. > > Is this the right way to resend this? That works, now queued up, thanks. greg k-h