From patchwork Sun Dec 3 23:08:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 173023 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2447655vqy; Sun, 3 Dec 2023 15:09:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IFb3xWEUUyvL1cFLZN5vEhrBYqo3PO3e8eAINgrLQeyxmVgktccWksGLlMKHs1RPvTdQxRi X-Received: by 2002:a05:6808:d48:b0:3b8:7f1b:df8d with SMTP id w8-20020a0568080d4800b003b87f1bdf8dmr3430031oik.35.1701644943381; Sun, 03 Dec 2023 15:09:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701644943; cv=none; d=google.com; s=arc-20160816; b=u2PNmhgIfrVq66OeIw0qskAfK3F6BYZNNKzQSv//hTVlgfq4JXuyWldv03onm9u3B4 PDB7oMiyfLFQQ6TvWV2fO+kd99NJKXQKJ47YFcQrFu/3Pt9SNdZTkveuuAysfOV9sw40 XDNT0iCSa1Y98WoAryyHEJoylCCHcJ/+Iq2l5xS08yHBJP80yyTeQORGkb7a0bLyuO5X GnJf8ig/Tx43BlXFkw9JlYMU26AHA2BbRwANgTFbd4v2RbW/Ky8z/Ag8oBHY6GOcs9xC UDlOELLUVPePqkqXKwe/JYjkbtO0uwDv2ARQBB/UEFXt7qPEaZvXpjrrgzOuVRVuuHml 34AA== 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=+cPhwPJpcFNZb6c+xA04ocJR/AeqowdM77bWLN+NPh8=; fh=D9S5YtgMWSwG0ShyC+WZfjbI/UTpsqvoy8Z8OMMTNkY=; b=CVO481hqiZj37dzMuIrULh8ImmKLhVieccVlE4l5JoPIJvEhRKC3Liz9I7s/8xuMWq 0J6WAHly1Qn8FgDnborS6QT4Uy/d7xWcx8dE6vMU5CnNGM62xR4ZDDluzcKbUPSmDAL1 wWN4oIO2X8PD1VslN6DnxPkW1Ubn7KozGcYU7PxCDkv0wjgNdL1F1BFy9W2g10vCeI66 MAsDg8/gJHbnsFLXE1LOzUR0gD94gEE916UmeeNGyKYWdNaUI6Q9BftRKmycvCg1M3uP ntHNahrjGmW8NfR1UrT6jZB9LLZ5SQB1g/Yb7W2T0aR3F1A/HLiQ/xIHLs/mNNTyxCUr LwNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Jqg5t6Yz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id 81-20020a630254000000b005c67398f70fsi1859570pgc.379.2023.12.03.15.09.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 15:09:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Jqg5t6Yz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 17B12804BDDB; Sun, 3 Dec 2023 15:08:59 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229868AbjLCXIu (ORCPT + 99 others); Sun, 3 Dec 2023 18:08:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229450AbjLCXIu (ORCPT ); Sun, 3 Dec 2023 18:08:50 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED939D3; Sun, 3 Dec 2023 15:08:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1701644930; bh=+cPhwPJpcFNZb6c+xA04ocJR/AeqowdM77bWLN+NPh8=; h=Date:From:To:Cc:Subject:From; b=Jqg5t6YzxoqQY6tdAy4DysDZoN4FMgwjDCla6ifOr5TpuRqnTveN4yhtbihldr3Vu jdQh4qJw99MbrnwcjLOSA4GHlXWvbrZRuRcp+pFCFTUXSrbwaJuVykQ7pNMEIOkw9M kCaHBVhZO39xEaDWkLyy3rqUm7g74RiDadJH9gwFNU2vy2QaUE5SQadll3uFHErcVy tTGFSx4qlPnXDLZOQBfGZihs5wnOfzmD0/68KDMj4LUc7ROGMwxpyTOVxBbXNLaTtW lqbmHUV9oj2oYgE1kz9njSujvkRqQx2IBfy1xVrduC4PSlEeqfvyx+EwwsEn0R/xCx tEHPwWMeS+3GA== 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 4Sk2Xx5HRgz4wdF; Mon, 4 Dec 2023 10:08:49 +1100 (AEDT) Date: Mon, 4 Dec 2023 10:08:48 +1100 From: Stephen Rothwell To: Andy Gross , Olof Johansson , Arnd Bergmann Cc: ARM , Bjorn Andersson , Linux Kernel Mailing List , Linux Next Mailing List , Luca Weiss , Matti =?utf-8?q?Lehtim=C3=A4ki?= Subject: linux-next: manual merge of the qcom tree with the arm-soc tree Message-ID: <20231204100848.141cfd29@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=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Sun, 03 Dec 2023 15:08:59 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784303740785615672 X-GMAIL-MSGID: 1784304047752120479 Hi all, Today's linux-next merge of the qcom tree got a conflict in: arch/arm/boot/dts/qcom/qcom-msm8974.dtsi between commit: 4960e06d386e ("ARM: dts: qcom: msm8974: sort nodes by reg") from the arm-soc tree and commit: 95053f6bc8ff ("ARM: dts: qcom: msm8974: Add watchdog node") 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/qcom-msm8974.dtsi index 76006c3c4af2,f7d7e5d70f30..000000000000 --- a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi