On Mon, Oct 14, 2019 at 11:04:19PM -0400, Sasha Levin wrote:
> On Mon, Oct 14, 2019 at 06:11:42PM +0200, gregkh@xxxxxxxxxxxxxxxxxxx wrote:
> >
> > The patch below does not apply to the 5.3-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 1436a78c63495dd94c8d4f84a76d78d5317d481b Mon Sep 17 00:00:00 2001
> > From: Marco Felsch <m.felsch@xxxxxxxxxxxxxx>
> > Date: Tue, 17 Sep 2019 16:56:36 +0200
> > Subject: [PATCH] iio: light: fix vcnl4000 devicetree hooks
> >
> > Since commit ebd457d55911 ("iio: light: vcnl4000 add devicetree hooks")
> > the of_match_table is supported but the data shouldn't be a string.
> > Instead it shall be one of 'enum vcnl4000_device_ids'. Also the matching
> > logic for the vcnl4020 was wrong. Since the data retrieve mechanism is
> > still based on the i2c_device_id no failures did appeared till now.
> >
> > Fixes: ebd457d55911 ("iio: light: vcnl4000 add devicetree hooks")
> > Signed-off-by: Marco Felsch <m.felsch@xxxxxxxxxxxxxx>
> > Reviewed-by: Angus Ainslie (Purism) angus@xxxxxxxx
> > Cc: <Stable@xxxxxxxxxxxxxxx>
> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
>
> Greg, I'm not sure why you dropped this one?
>
> I've queued it up for 5.3.
It doesn't apply to my 5.3 tree, and now that you added it, it still
doesn't apply :(
So I'm going to drop it now. How did this apply on your side?
thanks,
greg k-h
