From patchwork Thu Jul 11 23:58:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13731191 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 7A6CCC3DA4A for ; Thu, 11 Jul 2024 23:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: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=zZ8/h8JZ7AJhCHt1R2GbbeguaQJrJzLHHkBrjjtpecM=; b=lN7puZzZizcwGXpSzo+btpTRlH u1mlxINIOoHJZvLUinBjoKIuWYwRwBuhUiAixrtWYkej5A2fa/yelX7PUAuc3LpBIAT9KFbWL4NcH 6GtD7sqloJWlZX5xNh2/TCzJqveM9fY/ZMgcrHACu9zb14TSYNGr6jDS0fEMyjkVOK+Ss+IwXSVDm qadlQdFLKUOUmD6qFggwMkN2mVlryQAMDtKHys5/bUJg09wqUZnsof4ZQMHIxDw79Zpt2gVoDtRms V/FBGOCTFTCNUHe1uuGihk+UDN3pjm4qn4+2/6DKLUe9Mu7Jul5r6r4pviaj+n+olFKO8UWV7fGu2 IVlhJKmg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sS3gg-0000000Fsdf-2bbp; Thu, 11 Jul 2024 23:58:58 +0000 Received: from mail.ozlabs.org ([2404:9400:2221:ea00::3]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sS3gN-0000000FsXQ-1XcX for linux-arm-kernel@lists.infradead.org; Thu, 11 Jul 2024 23:58:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1720742308; bh=zZ8/h8JZ7AJhCHt1R2GbbeguaQJrJzLHHkBrjjtpecM=; h=Date:From:To:Cc:Subject:From; b=CnqvycZHlJGkCivGN/mIlvxtw+96I1ott32433moDF+sYHUUVUGfhO7fVs+N0KsTX BSoZUgXHQ6LaknIBJRlD3+lflUxlclf2GApHhwvh5m4B0EqHWMyyO7qeWwl6SDm/M4 NoDzejE8wR11Q5/8nRkPPJMmQX/J7JgbQk14JuQQmck/AjF2Rq9EHRc4YrdDz0bBTO YFDAG/kWHAUlvWdB/qfq8wS+/snaFgnMkBk0Xc2h3LSv8UZ6FtK+hdA6G/DnXzJlv3 2gIGJSl1ZpO/KOQIOV7W0XAuNidh9eVDXR7ssVo2Lt49w5g74GRC08L/oWGfGLDFRm qvNHIH5grgZQg== 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 4WKsBB2KTBz4w2F; Fri, 12 Jul 2024 09:58:26 +1000 (AEST) Date: Fri, 12 Jul 2024 09:58:25 +1000 From: Stephen Rothwell To: Mike Turquette , Stephen Boyd , Olof Johansson , Arnd Bergmann Cc: ARM , Drew Fustini , Drew Fustini , Linux Kernel Mailing List , Linux Next Mailing List , Yangtao Li Subject: linux-next: manual merge of the clk tree with the arm-soc tree Message-ID: <20240712095825.6e1224d9@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240711_165839_557140_5D9424DE X-CRM114-Status: GOOD ( 15.92 ) 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 clk tree got a conflict in: MAINTAINERS between commit: 480d9a6083f4 ("MAINTAINERS: thead: add git tree") from the arm-soc tree and commit: 1037885b309c ("dt-bindings: clock: Document T-Head TH1520 AP_SUBSYS controller") from the clk 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 MAINTAINERS index 44cff47c2594,04eb5587ffa7..000000000000 --- a/MAINTAINERS