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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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 FT support") from Linus' tree and commit e932d8178667 ("HID:

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

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 FT support) from Linus' tree and commit e932d8178667 (HID: add

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

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

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

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

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

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

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

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

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

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

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

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

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

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