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=-21.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS 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 54213C433DB for ; Fri, 26 Mar 2021 11:12:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2571161A0F for ; Fri, 26 Mar 2021 11:12:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229794AbhCZLMB (ORCPT ); Fri, 26 Mar 2021 07:12:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:40366 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229984AbhCZLLc (ORCPT ); Fri, 26 Mar 2021 07:11:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8F44A619D3; Fri, 26 Mar 2021 11:11:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1616757081; bh=OMUao5vlqjQHGj4GF0Flv7CKVb6dYZSSo3IxA+44B7I=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=IK40F0mzHocFozIzuahG61IKOjMLHPyCLeBGfNxTJ9waM7XzEQnxwIhJeROR72CSy u45HNsLaL/6LE7etIai2blCOmw0WLRp3/PUc0jFQTCoY4+7xF15wSyNcbetsNtHD9T Gqut+kB45CCDPJFPjP+c7o9UpFhym4cQhqUTDLkc= Date: Fri, 26 Mar 2021 12:11:18 +0100 From: Greg KH To: Jonathan Cameron Cc: linux-iio@vger.kernel.org, Ye Xiang Subject: Re: [PULL] 1st set of IIO and counter new device support and core changes for the 5.13 cycle. Message-ID: References: <20210326104656.5d7689cb@jic23-huawei> <20210326105436.44e9d3de@jic23-huawei> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210326105436.44e9d3de@jic23-huawei> Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On Fri, Mar 26, 2021 at 10:54:36AM +0000, Jonathan Cameron wrote: > On Fri, 26 Mar 2021 10:46:56 +0000 > Jonathan Cameron wrote: > > > The following changes since commit c972c2d821ca3eda001a20dbe2ca0b4718838caf: > > > > staging: unisys: visornic: Fix repeated words in comments (2021-03-10 09:25:33 +0100) > > > > are available in the Git repository at: > > > > https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git tags/iio-for-5.13a > > > > for you to fetch changes up to 1b33dfa5d5f165782a1cb18ba1350a42d5d7a579: > > > > Merge remote-tracking branch 'local/ib-iio-scmi-5.12-rc2-take3' into togreg (2021-03-26 10:23:46 +0000) > > Hi Greg, > > There is a conflict merging this into staging/staging-next that needs > manual resolution. It is is in hid-sensor-prox.c and resolution I would > recommend is to drop the block that is in staging-next. > > @@ -220,29 +225,6 @@ static int prox_parse_report(struct platform_device *pdev, > dev_dbg(&pdev->dev, "prox %x:%x\n", st->prox_attr.index, > st->prox_attr.report_id); > > - /* Set Sensitivity field ids, when there is no individual modifier */ > - if (st->common_attributes.sensitivity.index < 0) { > - sensor_hub_input_get_attribute_info(hsdev, > - HID_FEATURE_REPORT, usage_id, > - HID_USAGE_SENSOR_DATA_MOD_CHANGE_SENSITIVITY_ABS | > - HID_USAGE_SENSOR_DATA_PRESENCE, > - &st->common_attributes.sensitivity); > - dev_dbg(&pdev->dev, "Sensitivity index:report %d:%d\n", > - st->common_attributes.sensitivity.index, > - st->common_attributes.sensitivity.report_id); > - } > - if (st->common_attributes.sensitivity.index < 0) > - sensor_hub_input_get_attribute_info(hsdev, > - HID_FEATURE_REPORT, usage_id, > - HID_USAGE_SENSOR_DATA_MOD_CHANGE_SENSITIVITY_ABS | > - HID_USAGE_SENSOR_HUMAN_PRESENCE, > - &st->common_attributes.sensitivity); > - > - st->scale_precision = hid_sensor_format_scale( > - hsdev->usage, > - &st->prox_attr, > - &st->scale_pre_decml, &st->scale_post_decml); > - > return ret; > } > > Ye Xiang, if that looks wrong to you let us know. That worked for me. Note, I get the following "warning" from my scripts when trying to merge this: Commit: 0463e60f0870 ("iio: adis16480: fix pps mode sampling frequency math") Fixes tag: Fixes: 326e2357553d3 ("iio: imu: adis16480: Add support for external clock") Has these problem(s): - empty lines surround the Fixes tag I'm going to ignore this, but expect a message from the linux-next maintainer about this :( thanks, greg k-h