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 X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F48DC4338F for ; Mon, 9 Aug 2021 07:41:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 35AD060FC2 for ; Mon, 9 Aug 2021 07:41:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233509AbhHIHmD (ORCPT ); Mon, 9 Aug 2021 03:42:03 -0400 Received: from wnew4-smtp.messagingengine.com ([64.147.123.18]:54933 "EHLO wnew4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232094AbhHIHmB (ORCPT ); Mon, 9 Aug 2021 03:42:01 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.west.internal (Postfix) with ESMTP id 2A8762B006D0; Mon, 9 Aug 2021 03:41:40 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 09 Aug 2021 03:41:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm1; bh=RjIBzrlZGQfh73r05Ozevdc3Gz9 BndFcrU4vim+1dgI=; b=LIJQnGLwWIwpczK+/wppS6Z6DhvaxLuWenVOO4WkDSk WBqweY+kB8uhlDUWXRfS6LkDiJJxwHLn3QViBzpze9dWsO6uCrRBO9EgpHJeBzrw /sH6Z4rvUjJkxebbutdYMbuhzbRLJsJMKe/VAJ9y8BfHEWNenyUt/F5KOXKaERr5 IFM5Vlxi4y4M5+Y0bYkEH5xZGWTJ5/T06XTrzd7Pf4qQSlnJka4EvNAOzWQgVnCG awoeWTuM+ldN2rOiG4xcCRT27FNBazBkJKBoQotpK+7sDu4BBnvVyg1k4pPDhyrI SHNQlgmoFM/N46FOF+QAw6u9SiOKDRu4/lPpJsCdaxg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=RjIBzr lZGQfh73r05Ozevdc3Gz9BndFcrU4vim+1dgI=; b=m3o5OyDvRmElTGpvF1PD2a SHt9xnNx37kBFVR1sj6s9Ek/QOV8NM7vWiAwK9Ce57OwRB+X9/SOeHIw16Lr5fYf Calf73y+/+KZ+P6t5GdlN0JmYmHzstHNYY6UZCrYoRYPFI2/jJNAkx7yLyQajcHd N3Tx4YD3wMhbpE0Xaffm6ZDT0L6JCbyN13hyu134VD/Sn0kWm9K2Z5t/geR66Mhw t69hBKB6v46sGM0Cs5610g5aTusw65Nwp1h66BF7B42EEjkaLpMWIGUol8IzUPfw JgjeyvyOOrBzDjxu1kQxmr2GWMY1nkdRePzS0FdxFIVXgzN2/myf3C8VWIGG3i/w == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrjeeigdduudejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgvghcu mffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeevueehje fgfffgiedvudekvdektdelleelgefhleejieeugeegveeuuddukedvteenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhh drtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Aug 2021 03:41:38 -0400 (EDT) Date: Mon, 9 Aug 2021 09:41:36 +0200 From: Greg KH To: Stephen Rothwell Cc: Arnd Bergmann , Linux Kernel Mailing List , Linux Next Mailing List , Mauro Carvalho Chehab , Sebastian Reichel Subject: Re: linux-next: manual merge of the staging tree with the char-misc tree Message-ID: References: <20210809173503.07581f5c@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210809173503.07581f5c@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Aug 09, 2021 at 05:35:03PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/misc/Kconfig > > between commit: > > 0f920277dc22 ("misc: gehc-achc: new driver") > > from the char-misc tree and commit: > > bb3b6552a5b0 ("staging: hikey9xx: split hi6421v600 irq into a separate driver") > > from the staging 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 drivers/misc/Kconfig > index a420b59917db,29294c52d5af..000000000000 > --- a/drivers/misc/Kconfig > +++ b/drivers/misc/Kconfig > @@@ -208,18 -208,16 +208,28 @@@ config CS5535_CLOCK_EVENT_SR > MFGPTs have a better resolution and max interval than the > generic PIT, and are suitable for use as high-res timers. > > +config GEHC_ACHC > + tristate "GEHC ACHC support" > + depends on SPI && SYSFS > + depends on SOC_IMX53 || COMPILE_TEST > + select FW_LOADER > + help > + Support for GE ACHC microcontroller, that is part of the GE > + PPD device. > + > + To compile this driver as a module, choose M here: the > + module will be called gehc-achc. > + > + config HI6421V600_IRQ > + tristate "HiSilicon Hi6421v600 IRQ and powerkey" > + depends on OF > + depends on SPMI > + select MFD_CORE > + select REGMAP_SPMI > + help > + This driver provides IRQ handling for Hi6421v600, used on > + some Kirin chipsets, like the one at Hikey 970. > + > config HP_ILO > tristate "Channel interface driver for the HP iLO processor" > depends on PCI Looks good, thanks!