From patchwork Sun Dec 3 23:03:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13477589 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 A3D64C4167B for ; Sun, 3 Dec 2023 23:04:41 +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: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=9WKZi8w4AasR5YYgVsTfA9fgbP5UhMA71NKcjpvKIG0=; b=pxU Cwgr/Dv4cTPmQw7nuHyxwynnZuD8ooo+MKzhQJczCBCST1MBofmbChzHgUCJApnw/z7/JJ+12VEIJ oqJ4k1hS0N/AbTcuOALUzgISCcwDhmoVEph0eIBvBBn8P9L3PGZ0t5TzF6DtDqRAEqKSgaSJ1pt6u ovGONwV8vyzKPbTQh5qidQ18dJ3FGaq+6ZCqlPnQW7mYTqqZz/wuy06tj/YEAk7lmTiXbPicG8sbP Hnnol6RZM+Xu/wmBAwc0QfM6dOANWpnaRwIU4ntlYcfoCa2Zl6DObraQR4r424KsRHtoulnbR9eSy dw7psqbFDRIIKyD07Gcdusy83hXdhCQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r9vVR-002gS7-0t; Sun, 03 Dec 2023 23:04:09 +0000 Received: from mail.ozlabs.org ([2404:9400:2221:ea00::3] helo=gandalf.ozlabs.org) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r9vVO-002gRL-0h for linux-arm-kernel@lists.infradead.org; Sun, 03 Dec 2023 23:04:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1701644640; bh=RA2TwRrP0Ly0mWirQ4+Do/8V1dx1Wtq90aM3EiRJMFM=; h=Date:From:To:Cc:Subject:From; b=nY3bL1hHbmLdabHCALg6/YpLn2XGtn2D+axxgZVK7noFTovSeu/02mKxSoMn/spHj y2Pm5OOQCQAo+moFRNqX2pvn5u3lG99aa6R0LPY/Xy5/CXdClGzgc9euIna00VSuIU 9S1NZqKaL/+uXSniFXawV99uFEmyg0IJQPr2uXbnsDsrxhdRYRS5rgpecnLT6vEQxU dG/f42KMhrrU8nEI0yZMoi5hMPf5sBsfqHx1oeNsBDzN0JgU4MjfbldGUluwsY2O9Y qYsakgnln16QxBj5h7Hj/3As7u1VaddNEZv5yUQ0zXe6X37H03+tEDtKtd7xGEMO1X 78fRDYEGlnOMA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Sk2RL3sXCz4wdC; Mon, 4 Dec 2023 10:03:58 +1100 (AEDT) Date: Mon, 4 Dec 2023 10:03:55 +1100 From: Stephen Rothwell To: Andy Gross , Olof Johansson , Arnd Bergmann Cc: ARM , Bjorn Andersson , Dominik Kobinski , Ivaylo Ivanov , Jack Matthews , Linux Kernel Mailing List , Linux Next Mailing List , Luca Weiss , Rayyan Ansari Subject: linux-next: manual merge of the qcom tree with the arm-soc tree Message-ID: <20231204100355.0fb43204@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231203_150406_542144_223A3439 X-CRM114-Status: GOOD ( 15.94 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the qcom tree got a conflict in: arch/arm/boot/dts/qcom/Makefile between commits: 00400a98b2c3 ("ARM: dts: qcom: add device tree for Nokia Lumia 735") 8677233e5913 ("ARM: dts: qcom: add device tree for Nokia Lumia 830") from the arm-soc tree and commit: be0061dcbac1 ("ARM: dts: qcom: Add support for HTC One Mini 2") from the qcom tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc arch/arm/boot/dts/qcom/Makefile index a3d293e40820,c13dddd3c683..000000000000 --- a/arch/arm/boot/dts/qcom/Makefile