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

[Greg KH <greg@kroah.com>]

On Thu, May 01, 2025 at 04:15:15PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   cfe769670e82 ("power: supply: add Huawei Matebook E Go psy driver")
> 
> from the battery tree and commit:
> 
>   00327d7f2c8c ("usb: typec: ucsi: add Huawei Matebook E Go ucsi driver")
> 
> from the usb 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 MAINTAINERS
> index f7a8c23d211c,91279eaec446..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -10998,7 -10967,7 +10998,8 @@@ M:	Pengyu Luo <mitltlatltl@gmail.com
>   S:	Maintained
>   F:	Documentation/devicetree/bindings/platform/huawei,gaokun-ec.yaml
>   F:	drivers/platform/arm64/huawei-gaokun-ec.c
>  +F:	drivers/power/supply/huawei-gaokun-battery.c
> + F:	drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c
>   F:	include/linux/platform_data/huawei-gaokun-ec.h
>   
>   HUGETLB SUBSYSTEM

Looks good to me, thanks!

greg k-h