From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Sebastian Reichel <sre@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the battery tree
Date: Mon, 14 Feb 2022 06:14:40 +0100 [thread overview]
Message-ID: <YgnlQNrdr1DVDD4x@kroah.com> (raw)
In-Reply-To: <20220214134853.520ba31a@canb.auug.org.au>
On Mon, Feb 14, 2022 at 01:48:53PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/power/supply/ab8500_chargalg.c
>
> between commits:
>
> 05906f58c822 ("power: supply: ab8500_chargalg: Drop charging step")
> 75ee3f6f0c1a ("power: supply: ab8500_chargalg: Drop enable/disable sysfs")
>
> from the battery tree and commit:
>
> a8e223094c7a ("power_supply: ab8500: use default_groups in kobj_type")
>
> from the driver-core tree.
>
> I fixed it up (the former removed the code modified by the latter, so
> I just did that) 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.
Thanks, that should be fine.
greg k-h
next prev parent reply other threads:[~2022-02-14 5:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 2:48 linux-next: manual merge of the driver-core tree with the battery tree Stephen Rothwell
2022-02-14 5:14 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-02-21 19:11 broonie
2012-11-29 4:20 Stephen Rothwell
2012-11-29 5:19 ` Greg KH
2012-11-29 4:15 Stephen Rothwell
2012-11-29 5:19 ` Greg KH
2012-11-29 4:13 Stephen Rothwell
2012-11-29 5:19 ` Greg KH
2012-11-29 4:11 Stephen Rothwell
2012-11-29 5:19 ` Greg KH
2012-11-29 4:09 Stephen Rothwell
2012-11-29 5: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=YgnlQNrdr1DVDD4x@kroah.com \
--to=greg@kroah.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=sre@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.