From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Sebastian Reichel <sre@kernel•org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•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: linux-next: manual merge of the driver-core tree with the battery tree
Date: Mon, 14 Feb 2022 13:48:53 +1100 [thread overview]
Message-ID: <20220214134853.520ba31a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 910 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-02-14 2:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 2:48 Stephen Rothwell [this message]
2022-02-14 5:14 ` linux-next: manual merge of the driver-core tree with the battery tree Greg KH
-- 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=20220214134853.520ba31a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sre@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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