On Mon, Jun 08, 2020 at 04:41:14PM -0400, Sasha Levin wrote:
> On Mon, Jun 08, 2020 at 02:24:16PM +0200, gregkh@xxxxxxxxxxxxxxxxxxx wrote:
> >
> > The patch below does not apply to the 4.14-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@xxxxxxxxxxxxxxx>.
> >
> > thanks,
> >
> > greg k-h
> >
> > ------------------ original commit in Linus's tree ------------------
> >
> > > From 18dfb5326370991c81a6d1ed6d1aeee055cb8c05 Mon Sep 17 00:00:00 2001
> > From: Mathieu Othacehe <m.othacehe@xxxxxxxxx>
> > Date: Sun, 3 May 2020 11:29:55 +0200
> > Subject: [PATCH] iio: vcnl4000: Fix i2c swapped word reading.
> >
> > The bytes returned by the i2c reading need to be swapped
> > unconditionally. Otherwise, on be16 platforms, an incorrect value will be
> > returned.
> >
> > Taking the slow path via next merge window as its been around a while
> > and we have a patch set dependent on this which would be held up.
> >
> > Fixes: 62a1efb9f868 ("iio: add vcnl4000 combined ALS and proximity sensor")
> > Signed-off-by: Mathieu Othacehe <m.othacehe@xxxxxxxxx>
> > Cc: <Stable@xxxxxxxxxxxxxxx>
> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
>
> There were some context conflicts due to renaming of the lock (and it
> not existing on 4.4). I've fixed it and queued for 4.14-4.4.
Thanks, but I think you forgot to push your local version of the queue
to git.kernel.org :(
