Re: [PULL] 1st set of IIO and counter new device support and core changes for the 5.13 cycle.

[Greg KH <gregkh@linuxfoundation.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 <jic23@kernel.org> 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