linux-next: manual merge of the drivers-x86 tree with the pm tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  drivers/acpi/battery.c

between commit:

  98b0cf207b61 ("ACPI: battery: Call power_supply_changed() when adding hooks")

from the pm tree and commit:

  878a82c23469 ("ACPI: battery: Pass battery hook pointer to hook callbacks")

from the drivers-x86 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/acpi/battery.c
index 883c75757400,9482b0b6eadc..000000000000
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@@ -696,8 -696,7 +696,8 @@@ static void __battery_hook_unregister(s
  	if (lock)
  		mutex_lock(&hook_mutex);
  	list_for_each_entry(battery, &acpi_battery_list, list) {
- 		if (!hook->remove_battery(battery->bat))
 -		hook->remove_battery(battery->bat, hook);
++		if (!hook->remove_battery(battery->bat, hook))
 +			power_supply_changed(battery->bat);
  	}
  	list_del(&hook->list);
  	if (lock)

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