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=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,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 477C2FA3728 for ; Wed, 16 Oct 2019 12:53:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 18E10218DE for ; Wed, 16 Oct 2019 12:53:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571230381; bh=Hc8CauBiCbVluwiRXyMCxLH0+pUAS7qidd4QeFTjxTw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=A9IPS019c+YGn1sfFGX5NmBj3TSOPioMk/bywLrzk/kD/fknWarQ0n2p1tgCID7Ey 5g7Nvv2cnmLZ7HaKVmk4EOoeVBxMHsCleqx98uY7oBssbQhed5d1Jij4xRAXhc2OO2 pBVQzAA1sfOOIM8tfZJCzBXPqysOypwm0nit2AR0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726857AbfJPMxA (ORCPT ); Wed, 16 Oct 2019 08:53:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:56578 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726343AbfJPMxA (ORCPT ); Wed, 16 Oct 2019 08:53:00 -0400 Received: from localhost (unknown [209.136.236.94]) (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 01FDF2168B; Wed, 16 Oct 2019 12:52:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571230378; bh=Hc8CauBiCbVluwiRXyMCxLH0+pUAS7qidd4QeFTjxTw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Y4BgVa6k9T08QlpMZkMzUSthCuobDZTGhOyDexGmdE8NotfpWgA3aWMiltW4hnFB/ zFQl7wFCxLs+Pj+E4EIzGk0UEZGKsATtCm2/bXsHmKjAlQ1E0kD3MPia8f+KQOFON0 FN68zQBDjQp3pavCh9GXvshmXf3R3RlJN1XeVz7s= Date: Wed, 16 Oct 2019 05:52:57 -0700 From: Greg KH To: Sasha Levin 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: <20191016125257.GB26497@kroah.com> References: <1571069502139213@kroah.com> <20191015030419.GJ31224@sasha-vm> <20191015061809.GA926806@kroah.com> <20191015141931.GO31224@sasha-vm> <20191015153304.GA1002701@kroah.com> <20191015163524.GP31224@sasha-vm> <20191015173935.GA1071372@kroah.com> <20191015220652.GR31224@sasha-vm> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191015220652.GR31224@sasha-vm> User-Agent: Mutt/1.12.2 (2019-09-21) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Tue, Oct 15, 2019 at 06:06:52PM -0400, Sasha Levin wrote: > On Tue, Oct 15, 2019 at 07:39:35PM +0200, Greg KH wrote: > > 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@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. > > > > > > > > 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... > > It's back in the queue, and I've verified that applying the patch file > with 'patch -p1 [...]' works. Thanks for fixing that up and adding it to the queue. greg k-h