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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 10 Jan 2022 10:53:53 +1100

Hi all,

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

  drivers/input/misc/axp20x-pek.c

between commit:

  5ecc1e947822 ("Input: axp20x-pek - Use new soc_intel_is_cht() helper")

from Linus' tree and commit:

  8a78050ee257 ("Input: axp20x-pek - revert "always register interrupt handlers" change")

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/misc/axp20x-pek.c
index e09b1fae42e1,c8f87df93a50..000000000000
--- a/drivers/input/misc/axp20x-pek.c
+++ b/drivers/input/misc/axp20x-pek.c
@@@ -293,19 -339,7 +323,7 @@@ static int axp20x_pek_probe(struct plat
  
  	axp20x_pek->axp20x = dev_get_drvdata(pdev->dev.parent);
  
- 	axp20x_pek->irq_dbr = platform_get_irq_byname(pdev, "PEK_DBR");
- 	if (axp20x_pek->irq_dbr < 0)
- 		return axp20x_pek->irq_dbr;
- 	axp20x_pek->irq_dbr = regmap_irq_get_virq(
- 			axp20x_pek->axp20x->regmap_irqc, axp20x_pek->irq_dbr);
- 
- 	axp20x_pek->irq_dbf = platform_get_irq_byname(pdev, "PEK_DBF");
- 	if (axp20x_pek->irq_dbf < 0)
- 		return axp20x_pek->irq_dbf;
- 	axp20x_pek->irq_dbf = regmap_irq_get_virq(
- 			axp20x_pek->axp20x->regmap_irqc, axp20x_pek->irq_dbf);
- 
 -	if (axp20x_pek_should_register_input(axp20x_pek, pdev)) {
 +	if (axp20x_pek_should_register_input(axp20x_pek)) {
  		error = axp20x_pek_probe_input_device(axp20x_pek, pdev);
  		if (error)
  			return error;