Received: by 2002:a25:ca44:0:0:0:0:0 with SMTP id a65csp1338109ybg; Wed, 29 Jul 2020 11:29:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzGLxhzzmtDMZoYyfT2Gdh03/1hNP6MGot8F+w+6ZNKO47IcJmfNqy3xce53JqJsOsZjYXC X-Received: by 2002:a17:906:7c86:: with SMTP id w6mr21061809ejo.178.1596047343909; Wed, 29 Jul 2020 11:29:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596047343; cv=none; d=google.com; s=arc-20160816; b=b6C0nxSGri8yPzMMfqZgRUusnW4zRpQB/EwlXrzDg0Xiyq33Pj9RoRsu55x51KoHhg oh+NacPX7NIntRoqy0dldjGFC1UdgWLW9IgWRkH6n5ygDvugd5KjBn/MYX+xj8ZQxJKW PRze6+LTRIsyXLViba4rzqiULdjXJCP2kv4Jk2VQlZgvOh5CPccaawyGaPiEFbosw8gW i5qIMV6tl2urvEopmZ0q2foeB/RK3LdDDw2mNMUE6T62W8ELYV7q/Kkk42ZKn6u8FNXn eR/OnZulzMqSUNN/8XvE/1+Bns7cU41TmxMWVXchbdKIBIfwNq5CPMyAuse3Dxs0EY1o TBog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-language :content-transfer-encoding:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature; bh=I2PiX6CkbWhOhjmDXOI5faxrgxNEmlMOLaPY1aH6Qbg=; b=IUgd2feeyq8YLGKu4SHIt9OokfOTKDn10GaidlEhiCqpU1l27u3Cmhmf7zOjbKRpm6 oYgsGzrMlSu5OGdxtfINYDqy7LKAbeEvOOWL6KbNzkWwuSGDMxldzB06zVQjLqdJKDJy 9JZW0TVESd18wxll1mAxuLebcEhAkmm6DV4lMaqkBpFA4PNdppuq1BZKErXqEUyPrpR1 N2CbJCDx42e0+8oG63gh4PsMYJA6uJZIITqxEH8ETCAkV89/Pd2zzGUDVqQRxnukkV/Z sLBA+1nUP6xzhi555fLukb+aWGxgLcvt4tfeBTYdCEmTSmQPyUKAF98uSKFuSFYQgK+b YXZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="aBe/j86T"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p13si1528047ejd.637.2020.07.29.11.28.41; Wed, 29 Jul 2020 11:29:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="aBe/j86T"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727020AbgG2S17 (ORCPT + 99 others); Wed, 29 Jul 2020 14:27:59 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:52526 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726535AbgG2S17 (ORCPT ); Wed, 29 Jul 2020 14:27:59 -0400 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 06TIRv1V046046; Wed, 29 Jul 2020 13:27:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1596047277; bh=I2PiX6CkbWhOhjmDXOI5faxrgxNEmlMOLaPY1aH6Qbg=; h=Subject:To:CC:References:From:Date:In-Reply-To; b=aBe/j86T4+itKZ/sZCRyLq4hjiG+j1ZxavyWMna7GJtjP4WESwZ6FEVgprBVrZQgy Y6gHUFyayMETxYIM3wthZBQXkGISL7ubbe0gJeb4inWbhiho0IRLHkH/VBD6sbehVj jfADA2sFygV0LL3+GOcaQKfr3NlQIV/Y5p07IDDk= Received: from DLEE113.ent.ti.com (dlee113.ent.ti.com [157.170.170.24]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 06TIRvOo039759 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 29 Jul 2020 13:27:57 -0500 Received: from DLEE114.ent.ti.com (157.170.170.25) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Wed, 29 Jul 2020 13:27:57 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Wed, 29 Jul 2020 13:27:57 -0500 Received: from [10.250.35.195] (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 06TIRvHJ090376; Wed, 29 Jul 2020 13:27:57 -0500 Subject: Re: [PATCH v5 2/4] power: supply: bq27xxx_battery: Add the BQ27z561 Battery monitor To: Sebastian Reichel CC: , , , , , References: <20200729120609.22427-1-dmurphy@ti.com> <20200729120609.22427-2-dmurphy@ti.com> <20200729165622.jbncn2dqgugrhykx@earth.universe> From: Dan Murphy Message-ID: <1acd94b4-bf4b-8529-fd22-45005a6db524@ti.com> Date: Wed, 29 Jul 2020 13:27:56 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200729165622.jbncn2dqgugrhykx@earth.universe> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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