Re: linux-next: manual merge of the nvmem tree with the char-misc.current tree

On Fri, Jul 31, 2026 at 04:10:38PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the nvmem tree got a conflict in:
> 
>   drivers/nvmem/layouts/Makefile
> 
> between commit:
> 
>   b5be879519291 ("nvmem: layouts: Add fixed-layout driver")
> 
> from the char-misc.current tree and commits:
> 
>   c00ca6cc2fc96 ("nvmem: layouts: Add fixed-layout driver")
>   eeb4218f73b55 ("nvmem: layouts: Make the fixed-layout driver optional")
> 
> 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 --combined drivers/nvmem/layouts/Makefile
> index dd6c6c70b1a92,9da790a9dde9e..0000000000000
> --- a/drivers/nvmem/layouts/Makefile
> +++ b/drivers/nvmem/layouts/Makefile
> @@@ -3,7 -3,7 +3,7 @@@
>   # Makefile for nvmem layouts.
>   #
>   
> - obj-$(CONFIG_NVMEM_LAYOUTS) += fixed-layout.o
> + obj-$(CONFIG_NVMEM_LAYOUT_FIXED_LAYOUT) += fixed-layout.o
>   obj-$(CONFIG_NVMEM_LAYOUT_SL28_VPD) += sl28vpd.o
>   obj-$(CONFIG_NVMEM_LAYOUT_ONIE_TLV) += onie-tlv.o
>   obj-$(CONFIG_NVMEM_LAYOUT_U_BOOT_ENV) += u-boot-env.o



This all should be handled now, hopefully, as the nvmem patches were
sent to me from the nvmem tree to be merged into it.

thanks,

greg k-h