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

[Sebastian Reichel]

Hi Stephen,

On Fri, Jun 28, 2019 at 01:45:45PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the battery tree got conflicts in:
> 
>   drivers/power/supply/Kconfig
>   drivers/power/supply/Makefile
> 
> between commit:
> 
>   f8c7f7ddd8ef ("power: supply: Initial support for ROHM BD70528 PMIC charger block")
> 
> from the mfd tree and commit:
> 
>   0736343e4c56 ("power_supply: wilco_ec: Add charging config driver")
> 
> 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.

This one should no longer appear on next tree update, since I
dropped 0736343e4c56.

-- Sebastian

> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/power/supply/Kconfig
> index 4a3cd679295b,4c01598f5ccb..000000000000
> --- a/drivers/power/supply/Kconfig
> +++ b/drivers/power/supply/Kconfig
> @@@ -689,13 -702,13 +703,22 @@@ config CHARGER_UCS100
>   	  Say Y to enable support for Microchip UCS1002 Programmable
>   	  USB Port Power Controller with Charger Emulation.
>   
>  +config CHARGER_BD70528
>  +	tristate "ROHM bd70528 charger driver"
>  +	depends on MFD_ROHM_BD70528
>  +	default n
>  +	help
>  +	 Say Y here to enable support for getting battery status
>  +	 information and altering charger configurations from charger
>  +	 block of the ROHM BD70528 Power Management IC.
>  +
> + config CHARGER_WILCO
> + 	tristate "Wilco EC based charger for ChromeOS"
> + 	depends on WILCO_EC
> + 	help
> + 	  Say Y here to enable control of the charging routines performed
> + 	  by the Embedded Controller on the Chromebook named Wilco. Further
> + 	  information can be found in
> + 	  Documentation/ABI/testing/sysfs-class-power-wilco
> + 
>   endif # POWER_SUPPLY
> diff --cc drivers/power/supply/Makefile
> index 346a8ef5f348,d2263e1e2b6f..000000000000
> --- a/drivers/power/supply/Makefile
> +++ b/drivers/power/supply/Makefile
> @@@ -90,4 -91,4 +91,5 @@@ obj-$(CONFIG_CHARGER_CROS_USBPD)	+= cro
>   obj-$(CONFIG_CHARGER_SC2731)	+= sc2731_charger.o
>   obj-$(CONFIG_FUEL_GAUGE_SC27XX)	+= sc27xx_fuel_gauge.o
>   obj-$(CONFIG_CHARGER_UCS1002)	+= ucs1002_power.o
>  +obj-$(CONFIG_CHARGER_BD70528)	+= bd70528-charger.o
> + obj-$(CONFIG_CHARGER_WILCO)	+= wilco-charger.o

Attachment: signature.asc
Description: PGP signature