From: Greg KH <greg@kroah.com>
To: Mark Brown <broonie@kernel.org>
Cc: Amit Sunil Dhamne <amitsd@google.com>,
Hector Martin <marcan@marcan.st>, Janne Grunau <j@jannau.net>,
Joey Gouly <joey.gouly@arm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Michael Reeves <michael.reeves077@gmail.com>,
Sebastian Reichel <sebastian.reichel@collabora.com>
Subject: Re: linux-next: manual merge of the usb tree with the battery tree
Date: Wed, 1 Apr 2026 15:44:01 +0200 [thread overview]
Message-ID: <2026040150-hacked-quiver-10e3@gregkh> (raw)
In-Reply-To: <ac0aJ6jpCcSaemt7@sirena.org.uk>
On Wed, Apr 01, 2026 at 02:14:15PM +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> drivers/power/supply/Makefile
>
> between commit:
>
> 0ebf821cf6c75 ("power: supply: Add macsmc-power driver for Apple Silicon")
>
> from the battery tree and commit:
>
> 70d7dd27f6dc9 ("power: supply: max77759: add charger 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.
>
> diff --cc drivers/power/supply/Makefile
> index f2efbb82707c7,6af905875ad5e..0000000000000
> --- a/drivers/power/supply/Makefile
> +++ b/drivers/power/supply/Makefile
> @@@ -129,4 -128,4 +129,5 @@@ obj-$(CONFIG_CHARGER_SURFACE) += surfac
> obj-$(CONFIG_BATTERY_UG3105) += ug3105_battery.o
> obj-$(CONFIG_CHARGER_QCOM_SMB2) += qcom_smbx.o
> obj-$(CONFIG_FUEL_GAUGE_MM8013) += mm8013.o
> +obj-$(CONFIG_MACSMC_POWER) += macsmc-power.o
> + obj-$(CONFIG_CHARGER_MAX77759) += max77759_charger.o
Looks good to me, thanks!
greg k-h
next prev parent reply other threads:[~2026-04-01 13:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-01 13:14 linux-next: manual merge of the usb tree with the battery tree Mark Brown
2026-04-01 13:44 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-01 6:15 Stephen Rothwell
2025-05-02 6:20 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2026040150-hacked-quiver-10e3@gregkh \
--to=greg@kroah.com \
--cc=amitsd@google.com \
--cc=broonie@kernel.org \
--cc=j@jannau.net \
--cc=joey.gouly@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marcan@marcan.st \
--cc=michael.reeves077@gmail.com \
--cc=sebastian.reichel@collabora.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox