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

[Stephen Rothwell]

Hi all,

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

  drivers/power/supply/rt5033_charger.c

between commit:

  12cc585f36b8 ("power: supply: rt5033_charger: Add cable detection and USB OTG supply")

from the mfd tree and commit:

  2ce8284c3115 ("power: Explicitly include correct DT includes")

from the battery 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/power/supply/rt5033_charger.c
index e0303ca5a8db,c0c516f22c66..000000000000
--- a/drivers/power/supply/rt5033_charger.c
+++ b/drivers/power/supply/rt5033_charger.c
@@@ -6,11 -6,8 +6,11 @@@
   * Author: Beomho Seo <beomho.seo@xxxxxxxxxxx>
   */
  
+ #include <linux/mod_devicetable.h>
 +#include <linux/devm-helpers.h>
 +#include <linux/extcon.h>
  #include <linux/module.h>
 +#include <linux/mutex.h>
- #include <linux/of_device.h>
  #include <linux/platform_device.h>
  #include <linux/power_supply.h>
  #include <linux/regmap.h>

Attachment: pgp6OGnkyPBru.pgp
Description: OpenPGP digital signature