From: broonie@kernel•org
To: Greg KH <greg@kroah•com>
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>,
Sebastian Reichel <sebastian.reichel@collabora•com>
Subject: linux-next: manual merge of the driver-core tree with the battery tree
Date: Mon, 21 Feb 2022 19:11:31 +0000 [thread overview]
Message-ID: <20220221191131.1661101-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the driver-core tree got a conflict in:
drivers/power/supply/ab8500_chargalg.c
between commits:
75ee3f6f0c1a0 ("power: supply: ab8500_chargalg: Drop enable/disable sysfs")
05906f58c8225 ("power: supply: ab8500_chargalg: Drop charging step")
d662a7df36e1e ("power: supply: ab8500: Swap max and overvoltage")
from the battery tree and commit:
a8e223094c7a8 ("power_supply: ab8500: use default_groups in kobj_type")
from the driver-core 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/ab8500_chargalg.c
index b5a3096e78a14,64a3f5bbfff14..0000000000000
--- a/drivers/power/supply/ab8500_chargalg.c
+++ b/drivers/power/supply/ab8500_chargalg.c
@@@ -254,12 -279,12 +254,6 @@@ static enum power_supply_property ab850
POWER_SUPPLY_PROP_HEALTH,
};
--struct ab8500_chargalg_sysfs_entry {
-- struct attribute attr;
-- ssize_t (*show)(struct ab8500_chargalg *di, char *buf);
-- ssize_t (*store)(struct ab8500_chargalg *di, const char *buf, size_t length);
--};
--
/**
* ab8500_chargalg_safety_timer_expired() - Expiration of the safety timer
* @timer: pointer to the hrtimer structure
next reply other threads:[~2022-02-21 19:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 19:11 broonie [this message]
-- strict thread matches above, loose matches on Subject: below --
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
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=20220221191131.1661101-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--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=sebastian.reichel@collabora$(echo .)com \
/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