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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Fri, 21 Sep 2012 13:15:46 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Anton Vorontsov <avorontsov@...mvista.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Jett.Zhou" <jtzhou@...vell.com>,
	Haojian Zhuang <haojian.zhuang@...il.com>,
	Samuel Ortiz <sameo@...ux.intel.com>
Subject: linux-next: manual merge of the battery tree with the mfd tree

Hi Anton,

Today's linux-next merge of the battery tree got a conflict in
include/linux/mfd/88pm860x.h between commit a70abacb06b8 ("mfd: 88pm860x:
Use REG resource in regulator") from the mfd tree and commit a830d28b48bf
("power_supply: Enable battery-charger for 88pm860x") from the battery
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/linux/mfd/88pm860x.h
index d515e5c,b7c5a3c..0000000
--- a/include/linux/mfd/88pm860x.h
+++ b/include/linux/mfd/88pm860x.h
@@@ -359,22 -460,8 +440,23 @@@ struct pm860x_platform_data 
  	struct pm860x_rtc_pdata		*rtc;
  	struct pm860x_touch_pdata	*touch;
  	struct pm860x_power_pdata	*power;
+ 	struct charger_desc		*chg_desc;
 -	struct regulator_init_data	*regulator;
 +	struct regulator_init_data	*buck1;
 +	struct regulator_init_data	*buck2;
 +	struct regulator_init_data	*buck3;
 +	struct regulator_init_data	*ldo1;
 +	struct regulator_init_data	*ldo2;
 +	struct regulator_init_data	*ldo3;
 +	struct regulator_init_data	*ldo4;
 +	struct regulator_init_data	*ldo5;
 +	struct regulator_init_data	*ldo6;
 +	struct regulator_init_data	*ldo7;
 +	struct regulator_init_data	*ldo8;
 +	struct regulator_init_data	*ldo9;
 +	struct regulator_init_data	*ldo10;
 +	struct regulator_init_data	*ldo12;
 +	struct regulator_init_data	*ldo_vibrator;
 +	struct regulator_init_data	*ldo14;
  
  	unsigned short	companion_addr;	/* I2C address of companion chip */
  	int		i2c_port;	/* Controlled by GI2C or PI2C */

Content of type "application/pgp-signature" skipped