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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 22 Jul 2020 14:49:50 +1000

Hi all,

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

  drivers/input/mouse/elan_i2c_core.c

between commit:

  966334dfc472 ("Input: elan_i2c - only increment wakeup count on touch")

from Linus' tree and commit:

  04d5ce620f79 ("Input: elan_i2c - add support for high resolution reports")

from the input 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 drivers/input/mouse/elan_i2c_core.c
index 6291fb5fa015,4b6e2dffc0ea..000000000000
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@@ -951,13 -997,12 +997,14 @@@ static void elan_report_absolute(struc
  	u8 hover_info = packet[ETP_HOVER_INFO_OFFSET];
  	bool contact_valid, hover_event;
  
 +	pm_wakeup_event(&data->client->dev, 0);
 +
- 	hover_event = hover_info & 0x40;
- 	for (i = 0; i < ETP_MAX_FINGERS; i++) {
- 		contact_valid = tp_info & (1U << (3 + i));
- 		elan_report_contact(data, i, contact_valid, finger_data);
+ 	hover_event = hover_info & BIT(6);
  
+ 	for (i = 0; i < ETP_MAX_FINGERS; i++) {
+ 		contact_valid = tp_info & BIT(3 + i);
+ 		elan_report_contact(data, i, contact_valid, high_precision,
+ 				    packet, finger_data);
  		if (contact_valid)
  			finger_data += ETP_FINGER_DATA_LEN;
  	}
@@@ -1019,9 -1063,14 +1066,12 @@@ static irqreturn_t elan_isr(int irq, vo
  	if (error)
  		goto out;
  
 -	pm_wakeup_event(dev, 0);
 -
  	switch (report[ETP_REPORT_ID_OFFSET]) {
  	case ETP_REPORT_ID:
- 		elan_report_absolute(data, report);
+ 		elan_report_absolute(data, report, false);
+ 		break;
+ 	case ETP_REPORT_ID2:
+ 		elan_report_absolute(data, report, true);
  		break;
  	case ETP_TP_REPORT_ID:
  		elan_report_trackpoint(data, report);