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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1E31C43217 for ; Mon, 28 Feb 2022 10:54:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235252AbiB1Kyo (ORCPT ); Mon, 28 Feb 2022 05:54:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235394AbiB1Kxf (ORCPT ); Mon, 28 Feb 2022 05:53:35 -0500 Received: from new2-smtp.messagingengine.com (new2-smtp.messagingengine.com [66.111.4.224]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B658B6662D; Mon, 28 Feb 2022 02:51:43 -0800 (PST) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id 1F6FD580272; Mon, 28 Feb 2022 05:51:43 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 28 Feb 2022 05:51:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h=cc :cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm3; bh=CVV/FYiagZabkUSFBdzimqho0tyD8t54QWCRsx SiA/4=; b=BpGnFStaHo1d/eOGvhZtY0UB7XWUsy4MUYujb2tbTC2HAaGLaEXjTX M6HnisywIXRsg4+/biO8DDKcrghJl5ttdrtYUUbDoLgrkBIOVXYamEGnbsDopWsI RzXqwyZPQZMzHoePbFikdsa83SF5QYweWJItA0TWGwc+6r4NYicdq5FH+MJPxEkB djqI+9HGbRkBjEXbEET+VR7DntOPVJaxTeEPe472wWDR2GVURsL9IPRt5r1NEsQ0 HZguG4oREsF6xtZPif8rOiON0FWspctgD/p9D5BBSxrMFTNe1md4+8TQndj9vKxC lxlcj0ch7cQ9cfYpbQXMEBT0AwXuiOig== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=CVV/FYiagZabkUSFB dzimqho0tyD8t54QWCRsxSiA/4=; b=PgSWRXuhoUJJH5NYUqfD/XCDRX5uHR20J /ni7MR7GGw0DODiPJHILHXPxmh74GFzfRpU4ZicZYiofEeBU/xebXwJVvAcSRiZn mKvXj0v8skxoCEX4XKgbeckpyDV0YIKDATNpEvKMHFvf4Y0qdvlkHuyqR5y6SFET TwPQE/KhuTi9/GP3jUfLXBx8dkenXi0DS7oEYbuWMA1T6AdNgp3VJSvTd/sYnKXG 69mrCtSZRH2YR5pfV60elRUjA+QTfpk4KuKxBqdExutlC2isNbHbcZ6w5r13TM1y fMf+iaIIDPMUdnZrNq5XZZBQhB4/HbuAxlf2QnLGJmXqjSR5DJ+7A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddttddgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgvghcu mffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeevueehje fgfffgiedvudekvdektdelleelgefhleejieeugeegveeuuddukedvteenucevlhhushht vghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhh drtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 28 Feb 2022 05:51:42 -0500 (EST) Date: Mon, 28 Feb 2022 11:51:40 +0100 From: Greg KH To: Stephen Rothwell Cc: Arnd Bergmann , Mark Brown , Hammer Hsieh , Linux Kernel Mailing List , Linux Next Mailing List , Srinivas Kandagatla , Vincent Shih , Li-hao Kuo Subject: Re: linux-next: manual merge of the char-misc tree with the spi and tty trees Message-ID: References: <20220228193630.2e079d89@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220228193630.2e079d89@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 28, 2022 at 07:36:30PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in: > > MAINTAINERS > > between commits: > > f62ca4e2a863 ("spi: Add spi driver for Sunplus SP7021") > b48b9f6deacf ("dt-bindings: serial: Add bindings doc for Sunplus SoC UART Driver") > 9e8d5470325f ("serial: sunplus-uart: Add Sunplus SoC UART Driver") > > from the spi and tty trees and commits: > > 9e8d5470325f ("serial: sunplus-uart: Add Sunplus SoC UART Driver") > 8fb29b450182 ("dt-bindings: nvmem: Add bindings doc for Sunplus OCOTP driver") > > from the char-misc 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 d1e56ec04e14,37ea1436fc62..000000000000 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@@ -18642,19 -18578,12 +18678,25 @@@ S: Maintaine > F: Documentation/devicetree/bindings/rtc/sunplus,sp7021-rtc.yaml > F: drivers/rtc/rtc-sunplus.c > > + SUNPLUS OCOTP DRIVER > + M: Vincent Shih > + S: Maintained > + F: Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml > + F: drivers/nvmem/sunplus-ocotp.c > + > +SUNPLUS SPI CONTROLLER INTERFACE DRIVER > +M: Li-hao Kuo > +L: linux-spi@vger.kernel.org > +S: Maintained > +F: Documentation/devicetree/bindings/spi/spi-sunplus-sp7021.yaml > +F: drivers/spi/spi-sunplus-sp7021.c > + > +SUNPLUS UART DRIVER > +M: Hammer Hsieh > +S: Maintained > +F: Documentation/devicetree/bindings/serial/sunplus,sp7021-uart.yaml > +F: drivers/tty/serial/sunplus-uart.c > + > SUPERH > M: Yoshinori Sato > M: Rich Felker Fix looks good, thanks. greg k-h