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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C41FDC43334 for ; Mon, 4 Jul 2022 07:54:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:CC:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=isU/hwuoqCLESbJ/zRNF1opgspNk3xd1BRkTIJmCpZk=; b=kDBupPXVuKvIiH yiLz5OVWObAMvcNogE1fNwMpZaKR5KvRydGfrFxyv6YtdtUdUXzzNm0YEhMe9qQB5z4gmagHmErmp VJBfcnDzlbcOrtmQeZjxuc1TgY3ri9NeZyKLkO4FCAzjYPhKTSc6wLTcNQjn64v9x2Z+ZyzBOSPQW miJNNNFxxc5ue3x89M0AzZrBhgaYB5t25CfbbJtkJhUM2Jp2mhZ1Ho4nuX4N1XjNp+ztSvAr3xatJ zUyhfP+P9ALjAwJTJaxKR5qGehtA1LQ+la0C/e/hhkcnf9zuxTRNzUfjnNyZAyVKejl7i1yC3hxVT R9KuTL6phOaNwqygaoqw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8GtK-005qwX-Qp; Mon, 04 Jul 2022 07:53:10 +0000 Received: from mx08-00178001.pphosted.com ([91.207.212.93] helo=mx07-00178001.pphosted.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8GtG-005qtx-CU for linux-arm-kernel@lists.infradead.org; Mon, 04 Jul 2022 07:53:08 +0000 Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2647eOVW026847; Mon, 4 Jul 2022 09:52:47 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=selector1; bh=90rBVkywbc4yedzfSXCh4wXU9NTyZeI/HyxQ3VaQqIg=; b=8YoK6FsikK5REcfYcJGxKfvz2QvQ1KE8RwXyv73Nz6rBT+Mj5lwQ38KfTPqm0xgqlgo4 UVbtrLke1/KSafSOy8v71n6xmDAN7MFEn9/mFiL1HZ7FHFgFEHEi/LlBu1/Jy7+w9rYa oUOXAf1PtZhtfQXN1/0qK9G/UQ7lLiPDaQCAY+2S9x7JBvhGXXnzanadPvkh6QbAUAIq WuTvbEaabB6+69lJwOxOe00dVseHhygCV0LILx7RUT+71P5yci5fI1ICEjary8C0TAf/ 1JLhHfr6CmletR79krIqWLkBS5HBXOx8hl7UL8704u7fe11x0Byc1wyrtUHatVAAfNAy NQ== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3h2b5a8sjq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 04 Jul 2022 09:52:47 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 582D710002A; Mon, 4 Jul 2022 09:52:46 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node1.st.com [10.75.129.69]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 3FFE02128BE; Mon, 4 Jul 2022 09:52:46 +0200 (CEST) Received: from [10.201.21.93] (10.75.127.51) by SHFDAG1NODE1.st.com (10.75.129.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.20; Mon, 4 Jul 2022 09:52:45 +0200 Message-ID: Date: Mon, 4 Jul 2022 09:52:45 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Subject: Re: [GIT PULL] STM32 DT fixes for v5.19 #2 Content-Language: en-US To: Arnd Bergmann CC: Olof Johansson , Kevin Hilman , SoC Team , arm-soc , "linux-stm32@st-md-mailman.stormreply.com" , "linux-arm-kernel@lists.infradead.org" References: <85e47007-bfba-7a64-db75-893b0d20d025@foss.st.com> From: Alexandre TORGUE In-Reply-To: X-Originating-IP: [10.75.127.51] X-ClientProxiedBy: SFHDAG2NODE3.st.com (10.75.127.6) To SHFDAG1NODE1.st.com (10.75.129.69) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-04_07,2022-06-28_01,2022-06-22_01 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220704_005307_325011_4E6CD6FD X-CRM114-Status: GOOD ( 22.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 7/1/22 15:25, Arnd Bergmann wrote: > On Fri, Jul 1, 2022 at 2:05 PM Alexandre TORGUE > wrote: >> >> Hi ARM SoC maintainers, >> >> Please consider this second round of STM32 DT fixes for v5.19 cycle. It >> mainly concerns fixes for SCMI version of ST boards introduced in v5.19-rc1. >> >> The following changes since commit ea3414e1249ea35bc02debe28d4cbfeb6261657c: >> >> ARM: dts: stm32: move SCMI related nodes in a dedicated file for >> stm32mp15 (2022-06-07 17:22:21 +0200) >> >> are available in the Git repository at: > > Hi Alex, > > I get a merge conflict because I had picked up the "ARM: dts: stm32: move SCMI > related nodes in a dedicated file for stm32mp15" commit from the mailing > list, so it now has a different commit ID from the one you are based on. > > As far as I can tell, the patches are identical, but since the files > are modified > further in your tree, this confuses the git merge algorithm and leads to a > somewhat ugly git history with two identical commits if I fix it up. > > Can you rebase this pull request on top of v5.19-rc4 and resend? > (note: don't rebase the non-fixes pull requests unless you have to). Hi Arnd, No pb, I'm going to send a v2. If it is not an issue for you, I would prefer to rebase also the stm32-next to avoid conflicts during the merge on your side. Alex > > Arnd _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel