Re: FAILED: patch "[PATCH] iio: light: fix vcnl4000 devicetree hooks" failed to apply to 5.3-stable tree

[Sasha Levin <sashal@kernel.org>]

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@linuxfoundation.org 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@vger.kernel.org>.
>> >
>> > thanks,
>> >
>> > greg k-h
>> >
>> > ------------------ original commit in Linus's tree ------------------
>> >
>> > > From 1436a78c63495dd94c8d4f84a76d78d5317d481b Mon Sep 17 00:00:00 2001
>> > From: Marco Felsch <m.felsch@pengutronix.de>
>> > 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@pengutronix.de>
>> > Reviewed-by: Angus Ainslie (Purism) angus@akkea.ca
>> > Cc: <Stable@vger.kernel.org>
>> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
>>
>> 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@pengutronix.de>
 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.

-- 
Thanks,
Sasha