From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 435F0C433E0 for ; Tue, 26 Jan 2021 23:02:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0FB2D2065E for ; Tue, 26 Jan 2021 23:02:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730696AbhAZXCC (ORCPT ); Tue, 26 Jan 2021 18:02:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:42172 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393622AbhAZRzk (ORCPT ); Tue, 26 Jan 2021 12:55:40 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id A7EE222210; Tue, 26 Jan 2021 17:54:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1611683699; bh=sWdJkC0XV13qzG3cgYLFyf1qRUk6OlIgEZOFy1MdMrs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=YPgYpVMXj6hKPm4YzKQvuYAr3i+s5n8xqAxzJjpH8Hs0NDADyx3v4tMhoi82ajkWo ILg7eNmfjEzCSlHo6DSL3j5tX0omyvqQdRTIhen1MbywJ0F7fFc+cFaQJEiAx+jG13 dOFjyNNANY3dxyB6XqprCEnCS62KeqbiDwEO7fWg= Date: Tue, 26 Jan 2021 18:54:57 +0100 From: Greg Kroah-Hartman To: Mauro Carvalho Chehab Cc: Mark Brown , Lee Jones , devel@driverdev.osuosl.org, devicetree@vger.kernel.org, Mayulong , YueHaibing , Liam Girdwood , Wei Xu , linux-kernel@vger.kernel.org, Stephen Boyd , Rob Herring , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, Colin Ian King , Dan Carpenter Subject: Re: [PATCH v5 00/21] Move Hisilicon 6421v600 SPMI driver set out of staging Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Thu, Jan 21, 2021 at 08:18:02AM +0100, Mauro Carvalho Chehab wrote: > Hi Mark/Lee, > > This patch series finish addressing support for Hikey 970 > SPMI controller, PMIC and regulators. > > This version was generated with -M, in order to make easier > to merge upstream. Also, rebased on the top of v5.10, > without any dependencies from the other patch series > I'm submitting for this board. > > Yet, patch 18 to 20 modifies drivers/staging/hikey9xx/Kconfig > and drivers/staging/hikey9xx/Makefile. So, trivial conflicts > will rise if they're applied via different trees, as they all > remove some lines from such files. I've applied the first 13 patches, except for patch 3, as that did not apply, to my tree, thanks. greg k-h From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFEA1C433E0 for ; Tue, 26 Jan 2021 17:56:21 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7246D22228 for ; Tue, 26 Jan 2021 17:56:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7246D22228 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=znu5oRgC5cbMtSLsAgtPop7+LhrJw1jyrGebwGDw8nA=; b=G8LrAiFtF5DRn2yM1OYrSJ8aY tmGffdBYngs+ZHR2A/niDx4KvhqCoQ8dTWtBcGbH+pDFkF9k3OZyqUwgIjy49zQP+yDfjCdEQa3bk ZupWfQEc57GPfwpH9Rncs8ZfZsHZBHhd9xP5Vcqa1UJexL2bWLh/ocdgmI9ZLh2GBu0iIyxVfWNEO 5HGQf2k6Cvef1hO+uGG9P66TjDWR++4/8PnzWYECvlSOSpei74gBq8CxRPrLKVqA0A/WfFHedMuZ4 kqSPqPo7RtBi+3E+PXopJj7CeT3LYkuCQPki6ySe3VbYarYKUnBb10YTSHnaja7r1/F/tn1Jguoh9 7KMFet5Zg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4SYS-0002NA-8n; Tue, 26 Jan 2021 17:55:04 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4SYO-0002Ld-2R for linux-arm-kernel@lists.infradead.org; Tue, 26 Jan 2021 17:55:01 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id A7EE222210; Tue, 26 Jan 2021 17:54:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1611683699; bh=sWdJkC0XV13qzG3cgYLFyf1qRUk6OlIgEZOFy1MdMrs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=YPgYpVMXj6hKPm4YzKQvuYAr3i+s5n8xqAxzJjpH8Hs0NDADyx3v4tMhoi82ajkWo ILg7eNmfjEzCSlHo6DSL3j5tX0omyvqQdRTIhen1MbywJ0F7fFc+cFaQJEiAx+jG13 dOFjyNNANY3dxyB6XqprCEnCS62KeqbiDwEO7fWg= Date: Tue, 26 Jan 2021 18:54:57 +0100 From: Greg Kroah-Hartman To: Mauro Carvalho Chehab Subject: Re: [PATCH v5 00/21] Move Hisilicon 6421v600 SPMI driver set out of staging Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210126_125500_209614_7E1D0AA1 X-CRM114-Status: GOOD ( 13.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org, Mayulong , Stephen Boyd , linux-arm-msm@vger.kernel.org, YueHaibing , Liam Girdwood , Wei Xu , linux-kernel@vger.kernel.org, Rob Herring , Mark Brown , Dan Carpenter , Colin Ian King , Lee Jones , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Jan 21, 2021 at 08:18:02AM +0100, Mauro Carvalho Chehab wrote: > Hi Mark/Lee, > > This patch series finish addressing support for Hikey 970 > SPMI controller, PMIC and regulators. > > This version was generated with -M, in order to make easier > to merge upstream. Also, rebased on the top of v5.10, > without any dependencies from the other patch series > I'm submitting for this board. > > Yet, patch 18 to 20 modifies drivers/staging/hikey9xx/Kconfig > and drivers/staging/hikey9xx/Makefile. So, trivial conflicts > will rise if they're applied via different trees, as they all > remove some lines from such files. I've applied the first 13 patches, except for patch 3, as that did not apply, to my tree, thanks. greg k-h _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel