From nobody Thu Jun 25 02:18:30 2026 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 874DCC433FE for ; Wed, 23 Feb 2022 21:16:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242298AbiBWVRD (ORCPT ); Wed, 23 Feb 2022 16:17:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231799AbiBWVRB (ORCPT ); Wed, 23 Feb 2022 16:17:01 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74A87389D; Wed, 23 Feb 2022 13:16:32 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 864036146A; Wed, 23 Feb 2022 21:16:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A197C340E7; Wed, 23 Feb 2022 21:16:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645650991; bh=dVA6FsrIZlXDxX3UZou79kyBWx4acf0DRXX9Let5EH8=; h=From:To:Cc:Subject:Date:From; b=JLbz/v9T2QJXXvhKj0K6W4QNfAAm9gxg7LWW9yNO27URW31r6ua/ggSlMq8DzQDVk 7bbSHahJTEPXb7D8QpCpDW53bc/RBflPW2Mo4Krg6TLQIUJcC6k2ki3CfnFnB6j6V4 rhljCKg53W+2yHpM74Wo0LRrbs1dEZfWROE1BqAkeBQEq0ARUrvt82k3RcxbfYwpJ0 tQ+d9DsNfZ8GuyoQV2kAPplrA6Lm/iEp7NwIzv+gapdYA57Mnp8Md8KADUvuzqjjYq IN1GkwpJuxj3j15xYUKrQ8K5cywPPgs93CI2n2OF+CYTVLkc4V4f0kKKo6NbA9ljO7 ihMvMbZuganag== From: broonie@kernel.org To: Srinivas Kandagatla Cc: Li-hao Kuo , Linux Kernel Mailing List , Linux Next Mailing List , Mark Brown , Vincent Shih Subject: linux-next: manual merge of the nvmem tree with the spi tree Date: Wed, 23 Feb 2022 21:16:27 +0000 Message-Id: <20220223211627.123208-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the nvmem tree got a conflict in: MAINTAINERS between commits: f62ca4e2a8630 ("spi: Add spi driver for Sunplus SP7021") a708078eeb992 ("spi: Add Sunplus SP7021 schema") from the spi tree and commit: 5293c629db958 ("nvmem: Add driver for OCOTP in Sunplus SP7021") from the nvmem 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 3746d28eb5f41,507697a118385..0000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -18717,13 -18491,12 +18717,19 @@@ S: Maintaine F: Documentation/devicetree/bindings/rtc/sunplus,sp7021-rtc.yaml F: drivers/rtc/rtc-sunplus.c =20 +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 OCOTP DRIVER + M: Vincent Shih + S: Maintained + F: Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml + F: drivers/nvmem/sunplus-ocotp.c +=20 SUPERH M: Yoshinori Sato M: Rich Felker