From: Mark Brown <broonie@kernel.org>
To: Srinivas Kandagatla <srini@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Subject: linux-next: manual merge of the nvmem tree with the char-misc.current tree
Date: Fri, 31 Jul 2026 16:10:38 +0100 [thread overview]
Message-ID: <amy67hJt6Ywz-TGE@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1293 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-07-31 15:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-31 15:10 Mark Brown [this message]
2026-08-03 8:46 ` linux-next: manual merge of the nvmem tree with the char-misc.current tree Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=amy67hJt6Ywz-TGE@sirena.org.uk \
--to=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mathieu.dubois-briand@bootlin.com \
--cc=srini@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox