Subject: linux-next: manual merge of the hid tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 24 Feb 2015 11:00:48 +1100

Hi Jiri,

Today's linux-next merge of the hid tree got a conflict in
drivers/iio/common/hid-sensors/hid-sensor-trigger.c between commit
2b89635e9a9e ("iio: hid_sensor_hub: Common PM functions") from Linus'
tree and commit 6adc83fca74a ("HID: hid-sensor-hub: Enhance get feature
report API") from the hid tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/iio/common/hid-sensors/hid-sensor-trigger.c
index 2f1d535b94c4,910e82a7d06e..000000000000
--- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
+++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
@@@ -80,11 -77,8 +81,11 @@@ static int _hid_sensor_power_state(stru
  	}
  
  	sensor_hub_get_feature(st->hsdev, st->power_state.report_id,
- 					st->power_state.index,
- 					&state_val);
+ 			       st->power_state.index,
+ 			       sizeof(state_val), &state_val);
 +	if (state && poll_value)
 +		msleep_interruptible(poll_value * 2);
 +
  	return 0;
  }
  EXPORT_SYMBOL(hid_sensor_power_state);