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,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 79BF1C33CAF for ; Sun, 19 Jan 2020 19:28:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A92F206D7 for ; Sun, 19 Jan 2020 19:28:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579462118; bh=WVSAWql+p4pbiQ5PPdmKX5NxgA9yXRCmN81hB6ZdvpY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=t0ngvWKUhrrGP4S4C7uyWZlSDCM1eJgQlALRAOG2fgOkxnDE8xs+aGWg2XzgUr0gf D5AYVPGvCJ4YkJvUGPmxwNSCK0QgZ28pjfqTx18IqMAt+99a4HqIERcBvAa9uWwoEr 3iifKU0CF9csRnQpdZiria9W4LeVCjrTDQkRfaCI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727195AbgAST2h (ORCPT ); Sun, 19 Jan 2020 14:28:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:44564 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727144AbgAST2h (ORCPT ); Sun, 19 Jan 2020 14:28:37 -0500 Received: from localhost (96-81-74-198-static.hfc.comcastbusiness.net [96.81.74.198]) (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 1B5F0206B7; Sun, 19 Jan 2020 19:28:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579462116; bh=WVSAWql+p4pbiQ5PPdmKX5NxgA9yXRCmN81hB6ZdvpY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=bfW990TZrQROimR+k+CJKXQbGqIsOd+7aM76r703dJpMqxQRswffDSUA4yXhx0e5T QP7ZK3LS1wC3Lco7WPfOxzhWZHM9eHBEhnPkNHt16utFL4Mqp4WX6hXBukhn56YJXc xs3yLgmVVJD8cUeHQcgGb7jzfE0zINGwLxO6elqs= Date: Sun, 19 Jan 2020 14:28:33 -0500 From: Sasha Levin To: Stephan Gerhold Cc: gregkh@linuxfoundation.org, Jonathan.Cameron@huawei.com, lorenzo@kernel.org, stable@vger.kernel.org Subject: Re: FAILED: patch "[PATCH] iio: imu: st_lsm6dsx: Fix selection of ST_LSM6DS3_ID" failed to apply to 4.19-stable tree Message-ID: <20200119192833.GZ1706@sasha-vm> References: <1579440810243255@kroah.com> <20200119153253.GP1706@sasha-vm> <20200119161533.GA143951@gerhold.net> <20200119185530.GX1706@sasha-vm> <20200119191032.GA170231@gerhold.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20200119191032.GA170231@gerhold.net> 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 Sun, Jan 19, 2020 at 08:10:32PM +0100, Stephan Gerhold wrote: >On Sun, Jan 19, 2020 at 01:55:30PM -0500, Sasha Levin wrote: >> On Sun, Jan 19, 2020 at 05:15:33PM +0100, Stephan Gerhold wrote: >> > On Sun, Jan 19, 2020 at 10:32:53AM -0500, Sasha Levin wrote: >> > > On Sun, Jan 19, 2020 at 02:33:30PM +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 . >> > > > >> > > > thanks, >> > > > >> > > > greg k-h >> > > > >> > > > ------------------ original commit in Linus's tree ------------------ >> > > > >> > > > From fb4fbc8904e786537e29329d791147389e1465a2 Mon Sep 17 00:00:00 2001 >> > > > From: Stephan Gerhold >> > > > Date: Mon, 16 Dec 2019 13:41:20 +0100 >> > > > Subject: [PATCH] iio: imu: st_lsm6dsx: Fix selection of ST_LSM6DS3_ID >> > > > >> > > > At the moment, attempting to probe a device with ST_LSM6DS3_ID >> > > > (e.g. using the st,lsm6ds3 compatible) fails with: >> > > > >> > > > st_lsm6dsx_i2c 1-006b: unsupported whoami [69] >> > > > >> > > > ... even though 0x69 is the whoami listed for ST_LSM6DS3_ID. >> > > > >> > > > This happens because st_lsm6dsx_check_whoami() also attempts >> > > > to match unspecified (zero-initialized) entries in the "id" array. >> > > > ST_LSM6DS3_ID = 0 will therefore match any entry in >> > > > st_lsm6dsx_sensor_settings (here: the first), because none of them >> > > > actually have all 12 entries listed in the "id" array. >> > > > >> > > > Avoid this by additionally checking if "name" is set, >> > > > which is only set for valid entries in the "id" array. >> > > > >> > > > Note: Although the problem was introduced earlier it did not surface until >> > > > commit 52f4b1f19679 ("iio: imu: st_lsm6dsx: add support for accel/gyro unit of lsm9ds1") >> > > > because ST_LSM6DS3_ID was the first entry in st_lsm6dsx_sensor_settings. >> > > > >> > > > Fixes: d068e4a0f921 ("iio: imu: st_lsm6dsx: add support to multiple devices with the same settings") >> > > > Cc: # 5.4 >> > > > Acked-by: Lorenzo Bianconi >> > > > Signed-off-by: Stephan Gerhold >> > > > Signed-off-by: Jonathan Cameron >> > > > Signed-off-by: Greg Kroah-Hartman >> > > >> > > I don't think that this is needed on anything older than 5.4 because >> > > they don't have 801a6e0af0c6 ("iio: imu: st_lsm6dsx: add support to >> > > LSM6DSO"), the fixes tag might be misleading here a bit. >> > >> > Correct. I didn't want to use 801a6e0af0c6 ("iio: imu: st_lsm6dsx: add >> > support to LSM6DSO") as Fixes tag because that commit did not do >> > anything wrong - the problem was introduced earlier, but there is no way >> > to trigger it on older kernels. >> > >> > This is why I added # 5.5 to the Cc: stable tag. >> > Are these comments still used in any way? >> > Or is there a better way to encode this into the commit message? >> >> Usually if there's a fixes: tag we'll look at that rather than the >> version appended to the stable tag. >> >> Consider maybe using two "Fixes:" tags to point at the commits that were >> involved. > >So basically this > >Fixes: d068e4a0f921 ("iio: imu: st_lsm6dsx: add support to multiple devices with the same settings") >Fixes: 52f4b1f19679 ("iio: imu: st_lsm6dsx: add support for accel/gyro unit of lsm9ds1") > >would mean "fixes the combination of these two commits"? Yup! -- Thanks, Sasha