From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26563C10F14 for ; Tue, 15 Oct 2019 14:19:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EBEB420873 for ; Tue, 15 Oct 2019 14:19:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571149174; bh=nEXyM3NdpGLWGJ/ZhuQY/XN1Hk4YxpkFuwFVZuLJNtw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=N2DR3j2i/oOc5FTcFMCdx5ptLOlI00/Yrgl8T6JinEjoxlSHNL140YzKpnEsBw6C/ AR3haq492I+IT9wB9M8OT3iSDiRtfuwCx7rW1iGAts93dAqKJD7UQx/krPDBA3SIwq Npi30FETK/ZRn9bDrN4y59aXB8NFWAkwBBLmmj0I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732545AbfJOOTd (ORCPT ); Tue, 15 Oct 2019 10:19:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:43570 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730697AbfJOOTd (ORCPT ); Tue, 15 Oct 2019 10:19:33 -0400 Received: from localhost (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AB14D20650; Tue, 15 Oct 2019 14:19:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571149172; bh=nEXyM3NdpGLWGJ/ZhuQY/XN1Hk4YxpkFuwFVZuLJNtw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=wGlOQ8GEHrcKuxOPKHywvxv/FPdLyzNXx6jagwkKGYbFGFUXRYWdlmuT0yMcYt22F zbO9SVV6lstXscp+JMBYpOUVkYso47kCn/Te/Ahf/zESGH38U+cjc1+gOFGJLz5aVS avqf5CQ4pwHq4agCs8CMyyiWziOv7sNfxCFjCE1I= Date: Tue, 15 Oct 2019 10:19:31 -0400 From: Sasha Levin To: Greg KH Cc: m.felsch@pengutronix.de, Jonathan.Cameron@huawei.com, Stable@vger.kernel.org Subject: Re: FAILED: patch "[PATCH] iio: light: fix vcnl4000 devicetree hooks" failed to apply to 5.3-stable tree Message-ID: <20191015141931.GO31224@sasha-vm> References: <1571069502139213@kroah.com> <20191015030419.GJ31224@sasha-vm> <20191015061809.GA926806@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20191015061809.GA926806@kroah.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.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 . >> > >> > thanks, >> > >> > greg k-h >> > >> > ------------------ original commit in Linus's tree ------------------ >> > >> > > From 1436a78c63495dd94c8d4f84a76d78d5317d481b Mon Sep 17 00:00:00 2001 >> > From: Marco Felsch >> > 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 >> > Reviewed-by: Angus Ainslie (Purism) angus@akkea.ca >> > Cc: >> > Signed-off-by: Jonathan Cameron >> >> 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 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