On Tue, Oct 15, 2019 at 12:35:24PM -0400, Sasha Levin wrote:
> On Tue, Oct 15, 2019 at 05:33:04PM +0200, Greg KH wrote:
> > On Tue, Oct 15, 2019 at 10:19:31AM -0400, Sasha Levin wrote:
> > > On Tue, Oct 15, 2019 at 08:18:09AM +0200, Greg KH wrote:
> > > > 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?
> > >
> > > I... uh... it just applies?
> > >
> > > $ git cherry-pick 1436a78c63495dd94c8d4f84a76d78d5317d481b
> > > [queue-5.3 5f3196259cbe2] iio: light: fix vcnl4000 devicetree hooks
> > > Author: Marco Felsch <m.felsch@xxxxxxxxxxxxxx>
> > > Date: Tue Sep 17 16:56:36 2019 +0200
> > > 1 file changed, 5 insertions(+), 5 deletions(-)
> > >
> > > what do you see as the conflict? line numbers look mostly the same, so
> > > as the context.
> >
> > It's conflicting with another patch already in the queue, try applying
> > it now and see what happens :)
>
> Apparently git resolves this conflict correctly. After cherry-pick, that
> commit looks like this:
>
> diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
> index ca0d27b46ea22..16dacea9eadfa 100644
> --- a/drivers/iio/light/vcnl4000.c
> +++ b/drivers/iio/light/vcnl4000.c
> @@ -398,15 +398,15 @@ static int vcnl4000_probe(struct i2c_client *client,
> static const struct of_device_id vcnl_4000_of_match[] = {
> {
> .compatible = "vishay,vcnl4000",
> - .data = "VCNL4000",
> + .data = (void *)VCNL4000,
> },
> {
> .compatible = "vishay,vcnl4010",
> - .data = "VCNL4010",
> + .data = (void *)VCNL4010,
> },
> {
> - .compatible = "vishay,vcnl4010",
> - .data = "VCNL4020",
> + .compatible = "vishay,vcnl4020",
> + .data = (void *)VCNL4010,
> },
> {
> .compatible = "vishay,vcnl4040",
> @@ -414,7 +414,7 @@ static const struct of_device_id vcnl_4000_of_match[] = {
> },
> {
> .compatible = "vishay,vcnl4200",
> - .data = "VCNL4200",
> + .data = (void *)VCNL4200,
> },
> {},
> };
>
> Unless you have any objections, I'll queue up this version instead.
No objection, please do! I'm on a plane for the next 8+ hours and have
limited git access...
greg k-h
