Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 9 Jul 2019 10:14:24 +1000
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
Message-ID: <20190709101424.3876cbba@canb.auug.org.au>
In-Reply-To: <20190628135511.34853c19@canb.auug.org.au>
References: <20190628135511.34853c19@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/Z_58xQD3RFHEkQg58PqJwcX"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/Z_58xQD3RFHEkQg58PqJwcX
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Fri, 28 Jun 2019 13:55:11 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> Today's linux-next merge of the battery tree got a conflict in:
>=20
>   Documentation/power/power_supply_class.txt
>=20
> between commit:
>=20
>   151f4e2bdc7a ("docs: power: convert docs to ReST and rename to *.rst")
>=20
> from the pci tree and commit:
>=20
>   49c9cd95bb6d ("power: supply: add input power and voltage limit propert=
ies")
>=20
> from the battery tree.
>=20
> 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.
>=20
> 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
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  Documentation/power/power_supply_class.rst | 8 ++++++++
>  1 file changed, 8 insertions(+)
>=20
> diff --git a/Documentation/power/power_supply_class.rst b/Documentation/p=
ower/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.
> =20
> +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
> --=20
> 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.

--=20
Cheers,
Stephen Rothwell

--Sig_/Z_58xQD3RFHEkQg58PqJwcX
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0j3GAACgkQAVBC80lX
0GxjXAf/U4L04TKXyCvtyxPsAmwR91YQtPvgh1kk17GKlBNGbFEZKtQOSovdNoN9
sE/LjANqN08JLD6Rj5kFx2YMsu4ummttQoWwcYttbn7DxusjU4nK3ApZAX2Ud5qx
rdfV/Ww2vWDnvRRCvX3WaAZ2WRBWTmk+23dcSg5WttKYZWgG2/zyV52V+Pu2TIsF
rF/kA8F3RWQrMOfNjMCNJFk3D4ojgh6Mjq38HIfREIR5VaVt7ZydKAYodR5h/3bh
rX+oxOYEjoUp6R8/tLQmwXZKfPjsRlMm01AcFKnCQBwzbx5CsYXEPw+ofZ1jMvdM
rILxxRhi1SveO093G/f9IcPKkBhtZw==
=Lm83
-----END PGP SIGNATURE-----

--Sig_/Z_58xQD3RFHEkQg58PqJwcX--