From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Sebastian Reichel <sre@kernel•org>, Bjorn Helgaas <bhelgaas@google•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Mauro Carvalho Chehab <mchehab+samsung@kernel•org>,
Enric Balletbo i Serra <enric.balletbo@collabora•com>
Subject: Re: linux-next: manual merge of the battery tree with the pci tree
Date: Tue, 9 Jul 2019 10:14:24 +1000 [thread overview]
Message-ID: <20190709101424.3876cbba@canb.auug.org.au> (raw)
In-Reply-To: <20190628135511.34853c19@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2191 bytes --]
Hi all,
On Fri, 28 Jun 2019 13:55:11 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the battery tree got a conflict in:
>
> Documentation/power/power_supply_class.txt
>
> between commit:
>
> 151f4e2bdc7a ("docs: power: convert docs to ReST and rename to *.rst")
>
> from the pci tree and commit:
>
> 49c9cd95bb6d ("power: supply: add input power and voltage limit properties")
>
> from the battery tree.
>
> I fixed it up (I deleted the file and adde the following merge fix patch)
> 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.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Fri, 28 Jun 2019 13:52:44 +1000
> Subject: [PATCH] power: supply: update for conversion to .rst
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> Documentation/power/power_supply_class.rst | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/Documentation/power/power_supply_class.rst b/Documentation/power/power_supply_class.rst
> index 3f2c3fe38a61..883b2ef63119 100644
> --- a/Documentation/power/power_supply_class.rst
> +++ b/Documentation/power/power_supply_class.rst
> @@ -166,6 +166,14 @@ INPUT_CURRENT_LIMIT
> input current limit programmed by charger. Indicates
> the current drawn from a charging source.
>
> +INPUT_VOLTAGE_LIMIT
> + input voltage limit programmed by charger. Indicates
> + the voltage limit from a charging source.
> +
> +INPUT_POWER_LIMIT
> + input power limit programmed by charger. Indicates
> + the power limit from a charging source.
> +
> CHARGE_CONTROL_LIMIT
> current charge control limit setting
> CHARGE_CONTROL_LIMIT_MAX
> --
> 2.20.1
I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-07-09 0:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-28 3:55 linux-next: manual merge of the battery tree with the pci tree Stephen Rothwell
2019-07-09 0:14 ` Stephen Rothwell [this message]
2019-07-11 9:44 ` Sebastian Reichel
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=20190709101424.3876cbba@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bhelgaas@google$(echo .)com \
--cc=enric.balletbo@collabora$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab+samsung@kernel$(echo .)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