From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mark Brown <broonie@kernel•org>,
Liam Girdwood <lgirdwood@gmail•com>, Lee Jones <lee@kernel•org>
Cc: Andre Przywara <andre.przywara@arm•com>,
Chris Morgan <macromorgan@hotmail•com>,
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 regulator tree with the mfd tree
Date: Wed, 18 Sep 2024 12:05:44 +1000 [thread overview]
Message-ID: <20240918120544.0150c844@canb.auug.org.au> (raw)
In-Reply-To: <20240910125101.4057d8f7@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2203 bytes --]
Hi all,
On Tue, 10 Sep 2024 12:51:01 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the regulator tree got conflicts in:
>
> drivers/mfd/axp20x.c
> include/linux/mfd/axp20x.h
>
> between commit:
>
> 2e1a57d5b0ad ("mfd: axp20x: Add ADC, BAT, and USB cells for AXP717")
>
> from the mfd tree and commit:
>
> bb2ac59f8205 ("mfd: axp20x: AXP717: Add support for boost regulator")
>
> from the regulator tree.
>
> The latter change to include/linux/mfd/axp20x.h is a subset of the
> former change.
>
> 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/mfd/axp20x.c
> index 4051551757f2,16950c3206d7..000000000000
> --- a/drivers/mfd/axp20x.c
> +++ b/drivers/mfd/axp20x.c
> @@@ -209,15 -209,11 +209,17 @@@ static const struct regmap_access_tabl
> };
>
> static const struct regmap_range axp717_writeable_ranges[] = {
> + regmap_reg_range(AXP717_PMU_FAULT, AXP717_MODULE_EN_CONTROL_1),
> + regmap_reg_range(AXP717_MIN_SYS_V_CONTROL, AXP717_BOOST_CONTROL),
> + regmap_reg_range(AXP717_MODULE_EN_CONTROL_2, AXP717_MODULE_EN_CONTROL_2),
> + regmap_reg_range(AXP717_BOOST_CONTROL, AXP717_BOOST_CONTROL),
> + regmap_reg_range(AXP717_VSYS_V_POWEROFF, AXP717_VSYS_V_POWEROFF),
> regmap_reg_range(AXP717_IRQ0_EN, AXP717_IRQ4_EN),
> regmap_reg_range(AXP717_IRQ0_STATE, AXP717_IRQ4_STATE),
> + regmap_reg_range(AXP717_ICC_CHG_SET, AXP717_CV_CHG_SET),
> regmap_reg_range(AXP717_DCDC_OUTPUT_CONTROL, AXP717_CPUSLDO_CONTROL),
> + regmap_reg_range(AXP717_ADC_CH_EN_CONTROL, AXP717_ADC_CH_EN_CONTROL),
> + regmap_reg_range(AXP717_ADC_DATA_SEL, AXP717_ADC_DATA_SEL),
> };
>
> static const struct regmap_range axp717_volatile_ranges[] = {
This is now a conflict between the mfd tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-09-18 2:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-10 2:51 linux-next: manual merge of the regulator tree with the mfd tree Stephen Rothwell
2024-09-18 2:05 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-11-26 5:44 Stephen Rothwell
2012-11-26 6:47 ` Laxman Dewangan
2012-07-17 2:30 Stephen Rothwell
2012-07-17 2:19 Stephen Rothwell
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=20240918120544.0150c844@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andre.przywara@arm$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=lee@kernel$(echo .)org \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=macromorgan@hotmail$(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