linux-next: manual merge of the extcon tree with the battery tree

[broonie]

Hi all,

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

  drivers/power/supply/max8997_charger.c

between commit:

  fdc9ce72cffea ("power: supply: max8997_charger: Use devm_work_autocancel()")

from the battery tree and commit:

  e77e52e00b184 ("extcon: Fix extcon_get_extcon_dev() error handling")

from the extcon 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.

diff --cc drivers/power/supply/max8997_charger.c
index 127c73b0b3bd7,634658adf313f..0000000000000
--- a/drivers/power/supply/max8997_charger.c
+++ b/drivers/power/supply/max8997_charger.c
@@@ -242,15 -248,15 +242,15 @@@ static int max8997_battery_probe(struc
  		dev_info(&pdev->dev, "couldn't get charger regulator\n");
  	}
  	charger->edev = extcon_get_extcon_dev("max8997-muic");
- 	if (IS_ERR_OR_NULL(charger->edev)) {
- 		if (!charger->edev)
- 			return -EPROBE_DEFER;
- 		dev_info(charger->dev, "couldn't get extcon device\n");
+ 	if (IS_ERR(charger->edev)) {
+ 		dev_err_probe(charger->dev, PTR_ERR(charger->edev),
+ 			      "couldn't get extcon device: max8997-muic\n");
+ 		return PTR_ERR(charger->edev);
  	}
  
- 	if (!IS_ERR(charger->reg) && !IS_ERR_OR_NULL(charger->edev)) {
+ 	if (!IS_ERR(charger->reg)) {
 -		INIT_WORK(&charger->extcon_work, max8997_battery_extcon_evt_worker);
 -		ret = devm_add_action(&pdev->dev, max8997_battery_extcon_evt_stop_work, charger);
 +		ret = devm_work_autocancel(&pdev->dev, &charger->extcon_work,
 +					   max8997_battery_extcon_evt_worker);
  		if (ret) {
  			dev_err(&pdev->dev, "failed to add extcon evt stop action: %d\n", ret);
  			return ret;