From mboxrd@z Thu Jan 1 00:00:00 1970 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 C68A2C3DA45 for ; Fri, 12 Jul 2024 07:00:47 +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:In-Reply-To:Content-Type: MIME-Version:References: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:List-Owner; bh=aLOzcQxtgY1Ls90A6FAg8y/fu34jSjZXLr8QOaNq1HA=; b=ywp7QXfXZS6b9hnO4lrKjuLuRZ izgjcGgYl1x7nd6SV+FSJrBN7hRf+vqls92DC8X7wtvtIWkmk4tCvT0apjtOK+oWbcKEgE4u7DVRL 9MHy0ShYuOyQMDKH/mROeVhtEeHjFidzpG/3/UDCQlW+A1DP+Loc943NbDQBDmKGiCKtzXRKXUdyP T517ZeWjKppljL0aMzfLwYfbGTitKt2IUtgQ00OT2lVB4L8Mhm0ZmBpiJREc91S3H5ibGoJb+Dcnb A2f6cP1h8jse+aAtueVJVE1lAuFTLl6HZf36NVseuH7sCXpO18iiBKgV+E4LbXxSvT8goBbnZrfWP kTw/XuuQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sSAGh-0000000GhdU-1VNt; Fri, 12 Jul 2024 07:00:35 +0000 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sSAGO-0000000GhYa-1ZuS for linux-arm-kernel@lists.infradead.org; Fri, 12 Jul 2024 07:00:18 +0000 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-70b09c2ade6so1392449b3a.3 for ; Fri, 12 Jul 2024 00:00:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tenstorrent.com; s=google; t=1720767614; x=1721372414; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=aLOzcQxtgY1Ls90A6FAg8y/fu34jSjZXLr8QOaNq1HA=; b=Devko+ZvKKBedjW7y+luvoa2WdIUWDB3ucIQBNNPETWOTs1je66Xi5gP0ydPK1uHul MF+LVe0znUw++ru39MOCHpOYA5Xo+N4Kl/3FOJJziLFAOBNfENLabXx/urB6tfxHSGQ3 k/4/vMoynFwqgKE/VFERtahXGOnD1LhAV41Ff0HtxHR3V2q9m+6k3VcBNECmTq6G+Sqe CXb6gnQzwyMl3tSw6NMtSC6AeUNSFtTzx1EhNQR/klpgxZUvUImdZUcz3sW1ew3O9pYq 6v/R6dhxXev8QwFhxNvuoX5q+ac9NkVpp0Wkiji+Qdf5li78ipeW/w/KaPsyICrw11Uu a+dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720767614; x=1721372414; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=aLOzcQxtgY1Ls90A6FAg8y/fu34jSjZXLr8QOaNq1HA=; b=DMyOXoe++BX7jgGQVWMXv2lFhoMjS+2aSRrLZgxAtsZJ6+6F01wMV8YKTPwv9e1Z/I 5XfGtfqKuzOajoOO3n1nx3eYZ08G8eKV6kCtVT46D35x6wC55Qp6RXqgpyGzchYSekyW LrE6rrP65LF5fDgLO6IhjzyIwg0b4HqtiuZRTUxrT3l0z7rVSLv0qTOKMzzMbgfDj74K NNFZzrFtlRpFX815HMHKnNd2xsydvQQumCm8fL77alLRmW8ooMSbVs3tYutLKzZVYlwb UO+9M2GfV9QpCLVckTe+vK4vtZav+8t7BwLdyPo8FKoKbibKSU+FTMSCPSZQih1vb6bN JKmw== X-Forwarded-Encrypted: i=1; AJvYcCWE8ZI2z1RVE/E3ysLhX+sfoNtpC33+RLN38rPcJxr+B00EZd+SQ8an8qlTLH9BcCVcOurtjdHg0C7mNb56C8xXPqAZGKy9Ja22g/Aq/QsE1az9MkI= X-Gm-Message-State: AOJu0Yx7ef9AhpOphn+zJBvn8rnxcvvoH8lTCn4RplJTfzWU+cuu49Id kR+y2EppxGmYdQ9ThJGGWgo1APbShIA5hZc2EN4Ax4upuII9sm3GUdCQ1KbFVcXkoMDOtxqIQEw T X-Google-Smtp-Source: AGHT+IEmtd2yYJQoSBljsfSkChXU1mvTmqPJM7r+lNBjAP2ChBh/asoRVWE33A8FNfPrF2wpvJGaeA== X-Received: by 2002:a05:6a00:1a91:b0:706:5a51:7be4 with SMTP id d2e1a72fcca58-70b4367b361mr12565830b3a.29.1720767614523; Fri, 12 Jul 2024 00:00:14 -0700 (PDT) Received: from x1 ([2601:1c2:1802:170:c949:fd63:7988:f01f]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b4396780dsm6739762b3a.111.2024.07.12.00.00.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 00:00:14 -0700 (PDT) Date: Fri, 12 Jul 2024 00:00:12 -0700 From: Drew Fustini To: Stephen Rothwell Cc: Mike Turquette , Stephen Boyd , Olof Johansson , Arnd Bergmann , ARM , Drew Fustini , Linux Kernel Mailing List , Linux Next Mailing List , Yangtao Li Subject: Re: linux-next: manual merge of the clk tree with the arm-soc tree Message-ID: References: <20240712095825.6e1224d9@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240712095825.6e1224d9@canb.auug.org.au> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240712_000016_751106_3ACA0C9A X-CRM114-Status: GOOD ( 21.23 ) 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 On Fri, Jul 12, 2024 at 09:58:25AM +1000, Stephen Rothwell wrote: > 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc MAINTAINERS > index 44cff47c2594,04eb5587ffa7..000000000000 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@@ -19382,8 -19322,9 +19382,10 @@@ M: Guo Ren M: Fu Wei > L: linux-riscv@lists.infradead.org > S: Maintained > +T: git https://github.com/pdp7/linux.git > + F: Documentation/devicetree/bindings/clock/thead,th1520-clk-ap.yaml > F: arch/riscv/boot/dts/thead/ > + F: include/dt-bindings/clock/thead,th1520-clk-ap.h > > RNBD BLOCK DRIVERS > M: Md. Haris Iqbal Thank you for fixing this up. The resolution looks good to me. Drew