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: 173022 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2445628vqy; Sun, 3 Dec 2023 15:04:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IHE2crjsxfabDJIQ07u5dt/dmZhRguMfgDjxaBiWDkBMUUYSCU9rMu6L52PN0oYpnYc+25a X-Received: by 2002:a17:902:a982:b0:1d0:6ffe:9ed with SMTP id bh2-20020a170902a98200b001d06ffe09edmr2857660plb.75.1701644650360; Sun, 03 Dec 2023 15:04:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701644650; cv=none; d=google.com; s=arc-20160816; b=I+fhq9iodDRT0cXc2zaVkOZkED/N16wqW+FlLIHO91f8k7zVnIWA2jGSBwW6bRdbfZ whisy6fZ8CwWDjFasQ6y30TkHvT2ccPx2/LksHpS1KpbofBPT+lGGRpgon57TI2N3oyj mO3wLS+77KnbzBxi1e9Vq9HonMQm4JG5fzW9rv4sXhLNJiPSyqZXgBVM7DqSAL6x0ab7 kJ8xPrLO4cllTlMtc8KabvtbLDxcGIvG6p5hjcrV8GYZ3ShWkqlu5jFQUbt1Jw4Dj8PF 6Z7qwhjTMF7T6NnuyLYgLXQa1dxKa6ugxVzzx7jBLc1yqQ6KxD9cKjm1KbcEbB1hxbfb 9QeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=RA2TwRrP0Ly0mWirQ4+Do/8V1dx1Wtq90aM3EiRJMFM=; fh=lKGDsV3QsazJPcRnq8xJ3aSJLdJ7xqPahiKx/O7+TOc=; b=vWPELWf9I5hMXH/5c/+fwRgiCRpi5OM1C55gCrBhhB7p6Z0Bz/MXUNHfhUix4CkJAF qj3aqLkQSU6YBusmJlBewP5QoOufgbEKxxBAfssvBVxH1rsYIft5d/2kbPA4q1b92QKo Un1OttxGTIUh2aeBQIFjZSa/+FtpeizNtFTkj93aagFjDAXmWzR+5LrN9B/3UcUdFri+ 7p2dbMCOhB9PHh04e4pEgG6QBlX56+QKy1aNVEyCxOZcMO3y6hPxS/z1t6cM2W7sQ3ZK ZSaTJz2al+/G4pdcKVdntlLZHeSbWmRrZGJRWdxcHo9EDWoVMEgTmloZcXx3pLXz/Kb/ t2Uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=nY3bL1hH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id u4-20020a17090341c400b001cf63d5130csi6851169ple.160.2023.12.03.15.04.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 15:04:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=nY3bL1hH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 21A5A808496F; Sun, 3 Dec 2023 15:04:05 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229793AbjLCXD4 (ORCPT + 99 others); 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 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sun, 03 Dec 2023 15:04:05 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784303740785615672 X-GMAIL-MSGID: 1784303740785615672 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