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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]

Hi Jiri,

Today's linux-next merge of the hid tree got a conflict in
drivers/hid/hid-multitouch.c between commit 4c43755506ec ("HID:
multitouch: fix touchpad buttons") from Linus' tree and commit
5b62efd8250d ("HID: multitouch: remove useless last_field_index field")
from the hid tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/hid/hid-multitouch.c
index 82e9211,aceaf6c..0000000
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@@ -680,11 -723,7 +727,7 @@@ static void mt_process_mt_event(struct 
  		if (usage->usage_index + 1 == field->report_count) {
  			/* we only take into account the last report. */
  			if (usage->hid == td->last_slot_field)
 -				mt_complete_slot(td, field->hidinput->input);
 +				mt_complete_slot(td, input);
- 
- 			if (field->index == td->last_field_index
- 				&& td->num_received >= td->num_expected)
- 				mt_sync_frame(td, field->hidinput->input);
  		}
  
  	}

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1701 bytes --]

Hi all,

Today's linux-next merge of the hid tree got a conflict in:

  .mailmap

between commit:

  286812b041cc ("mailmap: update remaining active codeaurora.org email addresses")

from Linus' tree and commit:

  0c4b9411f363 ("MAINTAINERS: update my email address")

from the hid tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc .mailmap
index 5dd318121982,cea699139e6d..000000000000
--- a/.mailmap
+++ b/.mailmap
@@@ -138,10 -119,10 +138,13 @@@ Daniel Borkmann <daniel@iogearbox.net> 
  Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
  Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
  David Brownell <david-b@pacbell.net>
 +David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
+ David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>
+ David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>
+ David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>
  David Woodhouse <dwmw2@shinybook.infradead.org>
 +Dedy Lansky <quic_dlansky@quicinc.com> <dlansky@codeaurora.org>
 +Deepak Kumar Singh <quic_deesin@quicinc.com> <deesin@codeaurora.org>
  Dengcheng Zhu <dzhu@wavecomp.com> <dczhu@mips.com>
  Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
  Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2699 bytes --]

Hi all,

Today's linux-next merge of the hid tree got conflicts in:

  drivers/hid/Kconfig
  drivers/hid/Makefile

between commit:

  33bbe04a15f2 ("HID: google: extract Vivaldi hid feature mapping for use in hid-hammer")

from Linus' tree and commit:

  e9c8c7c43b51 ("HID: Driver for Google Hangouts Meet Speakermic")

from the hid tree.

I have to wonder why these new VIVALDI bits were not put next to the
old VIVALDI bits ...

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/hid/Kconfig
index a95a7cbc4a59,ef58b5c03780..000000000000
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -405,17 -405,20 +405,29 @@@ config HOLTEK_F
  	  Say Y here if you have a Holtek On Line Grip based game controller
  	  and want to have force feedback support for it.
  
 +config HID_VIVALDI_COMMON
 +	tristate
 +	help
 +	  ChromeOS Vivaldi HID parsing support library. This is a hidden
 +	  option so that drivers can use common code to parse the HID
 +	  descriptors for vivaldi function row keymap.
 +
+ config HID_GOOGLE_ATRUS
+ 	tristate "Google Hangouts Meet Speakermic"
+ 	depends on USB_HID
+ 	help
+ 	This selects a driver for the Google Hangouts Meet Speakermic.
+ 
+ 	This driver works around a problem with the HID usage sent by this
+ 	device for the mute button. It prevents key events from being generated
+ 	for that HID usage since they would be incorrect.
+ 
+ 	Say Y here if you have a Google Hangouts Meet Speakermic.
+ 
  config HID_GOOGLE_HAMMER
  	tristate "Google Hammer Keyboard"
 +	select HID_VIVALDI_COMMON
 +	select INPUT_VIVALDIFMAP
  	depends on USB_HID && LEDS_CLASS && CROS_EC
  	help
  	Say Y here if you have a Google Hammer device.
diff --cc drivers/hid/Makefile
index 345ac5581bd8,495e67ec5d9e..000000000000
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@ -50,7 -50,7 +50,8 @@@ obj-$(CONFIG_HID_FT260)		+= hid-ft260.
  obj-$(CONFIG_HID_GEMBIRD)	+= hid-gembird.o
  obj-$(CONFIG_HID_GFRM)		+= hid-gfrm.o
  obj-$(CONFIG_HID_GLORIOUS)  += hid-glorious.o
 +obj-$(CONFIG_HID_VIVALDI_COMMON) += hid-vivaldi-common.o
+ obj-$(CONFIG_HID_GOOGLE_ATRUS)  += hid-google-atrus.o
  obj-$(CONFIG_HID_GOOGLE_HAMMER)	+= hid-google-hammer.o
  obj-$(CONFIG_HID_VIVALDI)	+= hid-vivaldi.o
  obj-$(CONFIG_HID_GT683R)	+= hid-gt683r.o

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1125 bytes --]

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                    sfr@canb.auug.org.au

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);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1286 bytes --]

Hi Jiri,

Today's linux-next merge of the hid tree got a conflict in drivers/hid/hid-input.c between commit f974008f07a6 ("HID: add keyboard input assist hid usages") from Linus' tree and commit afdb5cce979b ("HID: input: Map unknown consumer page codes to KEY_UNKNOWN") from the hid tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/hid/hid-input.c
index 725f22ca47fc,7ea582be9c9a..000000000000
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@@ -865,14 -862,7 +865,14 @@@ static void hidinput_configure_usage(st
  		case 0x28b: map_key_clear(KEY_FORWARDMAIL);	break;
  		case 0x28c: map_key_clear(KEY_SEND);		break;
  
 +		case 0x2c7: map_key_clear(KEY_KBDINPUTASSIST_PREV);		break;
 +		case 0x2c8: map_key_clear(KEY_KBDINPUTASSIST_NEXT);		break;
 +		case 0x2c9: map_key_clear(KEY_KBDINPUTASSIST_PREVGROUP);		break;
 +		case 0x2ca: map_key_clear(KEY_KBDINPUTASSIST_NEXTGROUP);		break;
 +		case 0x2cb: map_key_clear(KEY_KBDINPUTASSIST_ACCEPT);	break;
 +		case 0x2cc: map_key_clear(KEY_KBDINPUTASSIST_CANCEL);	break;
 +
- 		default:    goto ignore;
+ 		default: map_key_clear(KEY_UNKNOWN);
  		}
  		break;
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

Hi Jiri,

Today's linux-next merge of the hid tree got a conflict in
drivers/hid/i2c-hid/i2c-hid.c between commit 9d27f43274e4 ("HID: fix
buffer allocations") from Linus' tree and commit 649f94790314 ("HID:
i2c-hid: use generic .request() implementation") from the hid tree.

I fixed it up (the latter removes the code modified by the former, so I
just used the latter) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1438 bytes --]

Hi Jiri,

Today's linux-next merge of the hid tree got a conflict in
drivers/hid/hid-core.c between commit 117309c51dca ("HID: microsoft: Add
ID's for Surface Type/Touch Cover 2") from Linus' tree and commit
3faed1aff786 ("HID: hid-microsoft: Add support for scrollwheel and
special keypad keys") from the hid tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/hid/hid-core.c
index cc32a6f96c64,6f579dfba6ee..000000000000
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@ -1780,8 -1823,7 +1824,9 @@@ static const struct hid_device_id hid_h
  	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
 +	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2) },
 +	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) },

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1038 bytes --]

Hi Jiri,

Today's linux-next merge of the hid tree got a conflict in
drivers/hid/hid-ids.h between commits adc232592337 ("[media] si4713: HID
blacklist Si4713 USB development board") and 3db187e7bf76 ("HID:
multitouch: add FocalTech FTxxxx support") from Linus' tree and commit
e932d8178667 ("HID: add hid-cp2112 driver") from the hid tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/hid/hid-ids.h
index 22f28d6b33a8,00be0d0f0dde..000000000000
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -241,9 -240,7 +241,10 @@@
  
  #define USB_VENDOR_ID_CYGNAL		0x10c4
  #define USB_DEVICE_ID_CYGNAL_RADIO_SI470X	0x818a
 +#define USB_DEVICE_ID_FOCALTECH_FTXXXX_MULTITOUCH	0x81b9
 +
 +#define USB_DEVICE_ID_CYGNAL_RADIO_SI4713       0x8244
+ #define USB_DEVICE_ID_CYGNAL_CP2112	0xea90
  
  #define USB_VENDOR_ID_CYPRESS		0x04b4
  #define USB_DEVICE_ID_CYPRESS_MOUSE	0x0001

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Marek Vasut]

Dear Stephen Rothwell,

> Hi Jiri,
> 
> Today's linux-next merge of the hid tree got a conflict in
> drivers/hid/usbhid/hid-quirks.c between commit 67ddbb3e6568 ("HID: add
> NOGET quirk for Eaton Ellipse MAX UPS") from Linus' tree and commit
> 2843b673d034 ("HID: add quirk for Freescale i.MX28 ROM recovery") from
> the hid tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary (no action is required).

Looks obviously correct, thank you Stephen!

Best regards,
Marek Vasut

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1358 bytes --]

Hi Jiri,

Today's linux-next merge of the hid tree got a conflict in
drivers/hid/usbhid/hid-quirks.c between commit 67ddbb3e6568 ("HID: add
NOGET quirk for Eaton Ellipse MAX UPS") from Linus' tree and commit
2843b673d034 ("HID: add quirk for Freescale i.MX28 ROM recovery") from
the hid tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary (no action is required).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/hid/usbhid/hid-quirks.c
index 991e85c,9af530e..0000000
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@@ -70,7 -70,7 +70,8 @@@ static const struct hid_blacklist 
  	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET },
  	{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
  	{ USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
+ 	{ USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },
 +	{ USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET },
  	{ USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS },
  	{ USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS },
  	{ USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2, HID_QUIRK_NO_INIT_REPORTS },

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1657 bytes --]

Hi Jiri,

Today's linux-next merge of the hid tree got a conflict in
drivers/hid/Kconfig between commit 1f41a6a99476 ("HID: Fix the generic
Kconfig options") from Linus' tree and commit 1ccd7a2a33f2 ("HID: uhid:
introduce user-space I/O driver support for HID") from the hid tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/hid/Kconfig
index bef04c1,96ac310..0000000
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -53,6 -59,32 +53,27 @@@ config HIDRA
  
  	If unsure, say Y.
  
+ config UHID
+ 	tristate "User-space I/O driver support for HID subsystem"
+ 	depends on HID
+ 	default n
+ 	---help---
+ 	Say Y here if you want to provide HID I/O Drivers from user-space.
+ 	This allows to write I/O drivers in user-space and feed the data from
+ 	the device into the kernel. The kernel parses the HID reports, loads the
+ 	corresponding HID Device Driver or provides input devices on top of your
+ 	user-space device.
+ 
+ 	This driver cannot be used to parse HID-reports in user-space and write
+ 	special HID-drivers. You should use hidraw for that.
+ 	Instead, this driver allows to write the transport-layer driver in
+ 	user-space like USB-HID and Bluetooth-HID do in kernel-space.
+ 
+ 	If unsure, say N.
+ 
+ 	To compile this driver as a module, choose M here: the
+ 	module will be called uhid.
+ 
 -source "drivers/hid/usbhid/Kconfig"
 -
 -menu "Special HID drivers"
 -	depends on HID
 -
  config HID_GENERIC
  	tristate "Generic HID driver"
  	depends on HID

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Jiri Kosina]

On Tue, 11 Oct 2011, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the hid tree got a conflict in
> drivers/hid/hid-wacom.c between commit 3512069eefd3 ("Input: wacom - add
> POINTER and DIRECT device properties") from Linus' tree and commit
> 3797ef6b6bc0 ("HID: wacom: Set input bits before registration") from the
> hid tree.
> 
> I fixed it up (maybe - see below) and can carry the fix as necessary.

That is a correct resolution, thanks.

-- 
Jiri Kosina
SUSE Labs

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2090 bytes --]

Hi Jiri,

Today's linux-next merge of the hid tree got a conflict in
drivers/hid/hid-wacom.c between commit 3512069eefd3 ("Input: wacom - add
POINTER and DIRECT device properties") from Linus' tree and commit
3797ef6b6bc0 ("HID: wacom: Set input bits before registration") from the
hid tree.

I fixed it up (maybe - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/hid/hid-wacom.c
index 72ca689,519f56c..0000000
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@@ -304,6 -304,46 +304,48 @@@ static int wacom_raw_event(struct hid_d
  	return 1;
  }
  
+ static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi,
+ 	struct hid_field *field, struct hid_usage *usage, unsigned long **bit,
+ 								int *max)
+ {
+ 	struct input_dev *input = hi->input;
+ 
++	__set_bit(INPUT_PROP_POINTER, input->propbit);
++
+ 	/* Basics */
+ 	input->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_REL);
+ 
+ 	__set_bit(REL_WHEEL, input->relbit);
+ 
+ 	__set_bit(BTN_TOOL_PEN, input->keybit);
+ 	__set_bit(BTN_TOUCH, input->keybit);
+ 	__set_bit(BTN_STYLUS, input->keybit);
+ 	__set_bit(BTN_STYLUS2, input->keybit);
+ 	__set_bit(BTN_LEFT, input->keybit);
+ 	__set_bit(BTN_RIGHT, input->keybit);
+ 	__set_bit(BTN_MIDDLE, input->keybit);
+ 
+ 	/* Pad */
+ 	input->evbit[0] |= BIT(EV_MSC);
+ 
+ 	__set_bit(MSC_SERIAL, input->mscbit);
+ 
+ 	__set_bit(BTN_0, input->keybit);
+ 	__set_bit(BTN_1, input->keybit);
+ 	__set_bit(BTN_TOOL_FINGER, input->keybit);
+ 
+ 	/* Distance, rubber and mouse */
+ 	__set_bit(BTN_TOOL_RUBBER, input->keybit);
+ 	__set_bit(BTN_TOOL_MOUSE, input->keybit);
+ 
+ 	input_set_abs_params(input, ABS_X, 0, 16704, 4, 0);
+ 	input_set_abs_params(input, ABS_Y, 0, 12064, 4, 0);
+ 	input_set_abs_params(input, ABS_PRESSURE, 0, 511, 0, 0);
+ 	input_set_abs_params(input, ABS_DISTANCE, 0, 32, 0, 0);
+ 
+ 	return 0;
+ }
+ 
  static int wacom_probe(struct hid_device *hdev,
  		const struct hid_device_id *id)
  {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the hid tree got a conflict in
drivers/hid/hid-input.c between commit
a0bf0ea809ba0a7621e191ec4cab5775d502ef7e ("Input: hid-input - switch to
using new keycode interface") from Linus' tree and commit
587d145200f26758940099fbbc301fdd43d3f391 ("HID: Remove KERN_DEBUG from
dbg_hid use") from the hid tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/hid/hid-input.c
index bb0b365,76e1f64..0000000
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@@ -165,24 -127,21 +165,24 @@@ static int hidinput_setkeycode(struct i
  {
  	struct hid_device *hid = input_get_drvdata(dev);
  	struct hid_usage *usage;
 -	int old_keycode;
  
 -	usage = hidinput_find_key(hid, scancode, 0);
 +	usage = hidinput_locate_usage(hid, ke, NULL);
  	if (usage) {
 -		old_keycode = usage->code;
 -		usage->code = keycode;
 +		*old_keycode = usage->type == EV_KEY ?
 +				usage->code : KEY_RESERVED;
 +		usage->code = ke->keycode;
  
 -		clear_bit(old_keycode, dev->keybit);
 +		clear_bit(*old_keycode, dev->keybit);
  		set_bit(usage->code, dev->keybit);
- 		dbg_hid(KERN_DEBUG "Assigned keycode %d to HID usage code %x\n",
+ 		dbg_hid("Assigned keycode %d to HID usage code %x\n",
 -				keycode, scancode);
 -		/* Set the keybit for the old keycode if the old keycode is used
 -		 * by another key */
 -		if (hidinput_find_key (hid, 0, old_keycode))
 -			set_bit(old_keycode, dev->keybit);
 +			usage->code, usage->hid);
 +
 +		/*
 +		 * Set the keybit for the old keycode if the old keycode is used
 +		 * by another key
 +		 */
 +		if (hidinput_find_key(hid, match_keycode, *old_keycode, NULL))
 +			set_bit(*old_keycode, dev->keybit);
  
  		return 0;
  	}