Messages in this thread | | | Subject | Re: [PATCH v5 2/4] power: supply: bq27xxx_battery: Add the BQ27z561 Battery monitor | From | Dan Murphy <> | Date | Wed, 29 Jul 2020 13:27:56 -0500 |
| |
Sebastian
On 7/29/20 11:56 AM, Sebastian Reichel wrote: > 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.
OK I have v6 ready but I noticed a lot of checkpatch issues.
total: 20 errors, 8 warnings, 1923 lines checked
So I will submit v6 and fix the style issues in a follow up patch
Dan
> -- Sebastian
| |