[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20200729165622.jbncn2dqgugrhykx@earth.universe>
Date: Wed, 29 Jul 2020 18:56:22 +0200
From: Sebastian Reichel <sre@...nel.org>
To: Dan Murphy <dmurphy@...com>
Cc: afd@...com, pali@...nel.org, linux-pm@...r.kernel.org,
linux-kernel@...r.kernel.org, devicetree@...r.kernel.org,
robh@...nel.org
Subject: Re: [PATCH v5 2/4] power: supply: bq27xxx_battery: Add the BQ27z561
Battery monitor
Hi,
On Wed, Jul 29, 2020 at 10:55:54AM -0500, Dan Murphy wrote:
> > +<<<<<<< HEAD
>
> Need to remove this artifact from a rebase.
>
> Not sure how this got here as it does not appear in my source.
You don't see it in your source, since you removed it in patch 4.
-- Sebastian
Download attachment "signature.asc" of type "application/pgp-signature" (834 bytes)
Powered by blists - more mailing lists