From patchwork Wed Jul 13 02:55:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12915918 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 B0611C43334 for ; Wed, 13 Jul 2022 02:57:02 +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=wZGSOMGCQ6NBosKj9ftq1cM/S9EaDzuEF7Xn6qUajmA=; b=rGS ge7KyXOKxDI7MbjQ7Q2NU+Q59PiNqQPnnNyQLIUERCrI74x+CVnG9Yw8E6rk4morsAs2qXvB5DCic tEj3deY3T1Czc1691JMFtW4XnatftG/3ycQEh0EazEKYrP6r/Hqjqve1QdgsqmLbxYV4YbFWwRpYa vjKlayVLmqWwVPOB4pifMU5FWfz63imBgwNywj+IGbj521YesDp1E1I4+BHEL5noEvQt+By/jusjz 3+HRkB3OBPod2SRfBjUhbWAQ0iPbRjV/GBp2p44YSKbs93Rle8lvgjzgvr8wNisj1rIGhBVA/6Fdq Hk2mgLwINpCnm+6PktkHyBpxts3NQTg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBSXf-00Gyud-7i; Wed, 13 Jul 2022 02:55:59 +0000 Received: from gandalf.ozlabs.org ([150.107.74.76]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBSXa-00GyeI-Ii for linux-arm-kernel@lists.infradead.org; Wed, 13 Jul 2022 02:55:56 +0000 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4LjMgS4LfCz4xv5; Wed, 13 Jul 2022 12:55:31 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1657680934; bh=LfruLt7o+TV8q2pXaKLuASGwJ623FvrOSmbp6WNG5VI=; h=Date:From:To:Cc:Subject:From; b=LUASzY+xNYLF39TrRI3a8yYTpEozXIqf+VocQ8vd1MWc/6fncSXbfKKNcRRHZUZew 4Bi7zQFBwcjTwV3nHgz2vX/vlAtxRI4DoGOcWrxSVRQXvwozEnANzZ/1gJQqKlnMg6 IZAxsz555W1E4ixdfIeS/5tOM3rWXN+RBuwZwqjPPOgRHPAWdbVcZYL8+nCuZ0QnQ+ QO+RixBB+53y3xmFV/WBQlgKr4Lt4p1q7TD6W8y5gDPvUpq0zEonUb28qWynIji5ll WiCoWihSVlsEH133yxFbiIUR/4HyxGeNmCjvJpsJ7K9EEtc5/T8gUpVI1FCvmnv6WS 4ie3n9VoOULTw== Date: Wed, 13 Jul 2022 12:55:26 +1000 From: Stephen Rothwell To: David Miller , Olof Johansson , Arnd Bergmann Cc: Networking , ARM , Ioana Ciornei , Jakub Kicinski , Krzysztof Kozlowski , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the net-next tree with the arm-soc tree Message-ID: <20220713125526.7fcf0bbc@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220712_195554_957926_A3C20D24 X-CRM114-Status: GOOD ( 15.64 ) 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 net-next tree got conflicts in: arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts between commit: 8c1be9336e9a ("arm64: dts: marvell: adjust whitespace around '='") from the arm-soc tree and commit: 4ce223e5ef70 ("arch: arm64: dts: marvell: rename the sfp GPIO properties") from the net-next 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/arm64/boot/dts/marvell/armada-7040-mochabin.dts index b9ba7c452a77,5f6ed735e31a..000000000000 --- a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts diff --cc arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi index c0389dd17340,33c179838e24..000000000000 --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi diff --cc arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts index cf868e0bbb9c,72e9b0f671a9..000000000000 --- a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts