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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 896A9ECAAD3 for ; Fri, 9 Sep 2022 07:17:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230004AbiIIHRW (ORCPT ); Fri, 9 Sep 2022 03:17:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229973AbiIIHRO (ORCPT ); Fri, 9 Sep 2022 03:17:14 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86E05C1656; Fri, 9 Sep 2022 00:17:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 279F7B8236F; Fri, 9 Sep 2022 07:17:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53DC3C433D6; Fri, 9 Sep 2022 07:17:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662707830; bh=9rxJTma0ot1qdkR2G84RM1MLt5higm4graPSXvFpHBk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=pW4YOICrjyL4a95bVaxi4pPFyyoN+KiOMx8XWpmEGAGWhbnIafXItqvyFfS2Cexzx j7V+TuJTlCMlCGShlDhIq6xgRW+AlAes9N4lcSdmd6QcWE93dTrCuzNaFE996A4bvH UXrevKHQ7ffHGPb0t8xGOUsfnNCZkj0CpPsEjq8T9f84v3+DWQab+DSMGCMsnx1uCJ D+tPc5Ur0aTPwGtrnilyc+uA/atnW/sLztigvzWCcdrklpvCx1UcT1xCpfXb4y1HxT IgZOocoEq05O6mMtlO34DxyCJGDd3Jui86zrO82wr+ZcSDlwqepeeSlBxLvcOqPQwj f4nqRqoKgiNcA== Date: Fri, 9 Sep 2022 08:17:05 +0100 From: Lee Jones To: Krzysztof Kozlowski Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Ohad Ben-Cohen , Baolin Wang , Rob Herring , Krzysztof Kozlowski , Vinod Koul , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [RFT PATCH v2 02/17] dt-bindings: mfd: qcom,tcsr: add QCS404 Message-ID: References: <20220817145901.865977-1-krzysztof.kozlowski@linaro.org> <20220817145901.865977-3-krzysztof.kozlowski@linaro.org> <9abc956f-17c7-60c9-4672-d62fe581f516@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <9abc956f-17c7-60c9-4672-d62fe581f516@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 08 Sep 2022, Krzysztof Kozlowski wrote: > On 08/09/2022 09:50, Lee Jones wrote: > > On Wed, 17 Aug 2022, Krzysztof Kozlowski wrote: > > > >> Document new QCS404 TCSR compatible. > >> > >> Signed-off-by: Krzysztof Kozlowski > >> --- > >> Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml | 1 + > >> 1 file changed, 1 insertion(+) > > > > Merge conflict. Please rebase. > > I will rebase. Can you check if you pushed your tree? I see updates 3 > weeks ago here: > https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/ This week's updates now pushed. -- Lee Jones [李琼斯]