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: 13477590 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 42522C4167B for ; Sun, 3 Dec 2023 23:09:25 +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=OA6z5Fdo4blQ1FK15MPk7SZK8xCv23FKo8WSqYz9s4U=; b=0KT yUEEkbSdR2GBhwQDixVrHsT25bJoSqoidedOGZOZiAtxKkS73g67mbnD3Vbaw9F36w3FLrim97o8q WPs/vUOpKLHsqYXXATrWjjcPm29/NYiabeO9vy33L17ty6W3WfNV6RJIX1TwDRvjnpzW+IfqiS8wT QSQo1pAo2usiYaSCvGAKw4nRLFcbby9l2jd6mqQaf9dj62zbRTxzOAo6YwrQhqQ5ezj9QNoEvq3CQ ErBR0JgxGd/uoBg88MZC0/v5B0FKME+v1t3DNITEDpW7s+K9tUfO2gOb77YcycUughS+L5+1vMVRP IxffiB3pqSDUQPq1GYN6Nk6i9ygaqfQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r9va3-002gfm-1f; Sun, 03 Dec 2023 23:08:55 +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 1r9vZz-002gf5-2C for linux-arm-kernel@lists.infradead.org; Sun, 03 Dec 2023 23:08:53 +0000 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231203_150852_532864_F5F80846 X-CRM114-Status: GOOD ( 16.20 ) 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/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