From nobody Mon Dec 29 00:45:27 2025 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 102FEC4167B for ; Sun, 3 Dec 2023 23:04:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229896AbjLCXD4 (ORCPT ); Sun, 3 Dec 2023 18:03:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229450AbjLCXDz (ORCPT ); Sun, 3 Dec 2023 18:03:55 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83FE0D3; Sun, 3 Dec 2023 15:04:01 -0800 (PST) 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 Content-Type: multipart/signed; boundary="Sig_/tcmXDN8Gr_q+.xQhDB9Zt9X"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/tcmXDN8Gr_q+.xQhDB9Zt9X Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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. --=20 Cheers, Stephen Rothwell diff --cc arch/arm/boot/dts/qcom/Makefile index a3d293e40820,c13dddd3c683..000000000000 --- a/arch/arm/boot/dts/qcom/Makefile +++ b/arch/arm/boot/dts/qcom/Makefile @@@ -32,8 -29,7 +32,9 @@@ dtb-$(CONFIG_ARCH_QCOM) +=3D=20 qcom-msm8916-samsung-e7.dtb \ qcom-msm8916-samsung-grandmax.dtb \ qcom-msm8916-samsung-serranove.dtb \ + qcom-msm8926-htc-memul.dtb \ + qcom-msm8926-microsoft-superman-lte.dtb \ + qcom-msm8926-microsoft-tesla.dtb \ qcom-msm8960-cdp.dtb \ qcom-msm8960-samsung-expressatt.dtb \ qcom-msm8974-lge-nexus5-hammerhead.dtb \ --Sig_/tcmXDN8Gr_q+.xQhDB9Zt9X Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVtCVsACgkQAVBC80lX 0GziYgf/Xl9qd3VvY9UNtETBuXewIBHp+YXvPvfG8mKNgGSCkhNN4InXQd6cJd0K aTkCFOH+DYlXjNuvxIQ5hbcqkQhYLaRGcxC+67Mn9HxTWXUeGJbYHCYkQ0tfZ2zu dQNPUMOW5F3M1n9mM9Hr8lC1HiYeri3eCGC2VKM5PcEV3eXWkBHiSSh/WUU1lB6C BR4jOboPz7z0vCUU/CwO7mAu3Q6PT40vbya1gC/gMIy61YwRSfNqF7S7Ji1EI9yw xKhREGBhxki8myDA4slpGVkQvcEM2DMdi16m3O7UyKw1LXA0Y7DY2L49s8F+5Byw tjoDFjWj/4D5d1ZnCh4GiZqh22r/8g== =bkM3 -----END PGP SIGNATURE----- --Sig_/tcmXDN8Gr_q+.xQhDB9Zt9X--