Re: linux-next: manual merge of the staging tree with the char-misc tree

[Greg KH]

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!