Re: FAILED: patch "[PATCH] iio: light: vcnl4000: update sampling periods for vcnl4200" failed to apply to 4.19-stable tree

[Sasha Levin <sashal@kernel.org>]

On Mon, Mar 23, 2020 at 03:18:25PM +0100, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 4.19-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 b42aa97ed5f1169cfd37175ef388ea62ff2dcf43 Mon Sep 17 00:00:00 2001
>From: Tomas Novotny <tomas@novotny.cz>
>Date: Tue, 18 Feb 2020 16:44:50 +0100
>Subject: [PATCH] iio: light: vcnl4000: update sampling periods for vcnl4200
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Vishay has published a new version of "Designing the VCNL4200 Into an
>Application" application note in October 2019. The new version specifies
>that there is +-20% of part to part tolerance. This explains the drift
>seen during experiments. The proximity pulse width is also changed from
>32us to 30us. According to the support, the tolerance also applies to
>ambient light.
>
>So update the sampling periods. As the reading is blocking, current
>users may notice slightly longer response time.
>
>Fixes: be38866fbb97 ("iio: vcnl4000: add support for VCNL4200")
>Reviewed-by: Guido Günther <agx@sigxcpu.org>
>Signed-off-by: Tomas Novotny <tomas@novotny.cz>
>Cc: <Stable@vger.kernel.org>
>Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

The conflict is because we don't have 5a441aade5b3 ("iio: light:
vcnl4000 add support for the VCNL4040 proximity and light sensor") on
4.19. I've adjusted context and queued it up.

-- 
Thanks,
Sasha