From: Sebastian Reichel <sre@kernel.org>
To: Dan Murphy <dmurphy@ti.com>
Cc: afd@ti.com, pali@kernel.org, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
robh@kernel.org
Subject: Re: [PATCH v5 2/4] power: supply: bq27xxx_battery: Add the BQ27z561 Battery monitor
Date: Wed, 29 Jul 2020 18:56:22 +0200 [thread overview]
Message-ID: <20200729165622.jbncn2dqgugrhykx@earth.universe> (raw)
In-Reply-To: <a757fcf1-0215-3926-f74c-22183457be3e@ti.com>
[-- Attachment #1: Type: text/plain, Size: 293 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-07-29 16:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-29 12:06 [PATCH v5 1/4] dt-bindings: power: Add BQ27z561 compatible Dan Murphy
2020-07-29 12:06 ` [PATCH v5 2/4] power: supply: bq27xxx_battery: Add the BQ27z561 Battery monitor Dan Murphy
2020-07-29 15:55 ` Dan Murphy
2020-07-29 16:56 ` Sebastian Reichel [this message]
2020-07-29 18:27 ` Dan Murphy
2020-07-29 12:06 ` [PATCH v5 3/4] dt-bindings: power: Add BQ28z610 compatible Dan Murphy
2020-07-29 12:06 ` [PATCH v5 4/4] power: supply: bq27xxx_battery: Add the BQ28z610 Battery monitor Dan Murphy
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=20200729165622.jbncn2dqgugrhykx@earth.universe \
--to=sre@kernel.org \
--cc=afd@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=dmurphy@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=pali@kernel.org \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).