From: broonie@kernel•org
To: Srinivas Kandagatla <srinivas.kandagatla@linaro•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>,
Michael Walle <michael@walle•cc>,
Vincent Shih <vincent.sunplus@gmail•com>
Subject: linux-next: manual merge of the nvmem tree with the char-misc tree
Date: Wed, 23 Feb 2022 21:26:34 +0000 [thread overview]
Message-ID: <20220223212634.398789-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the nvmem tree got conflicts in:
drivers/nvmem/Kconfig
drivers/nvmem/Makefile
between commit:
f78451012b9e1 ("nvmem: add driver for Layerscape SFP (Security Fuse Processor)")
from the char-misc tree and commits:
1c565569b4704 ("nvmem: add driver for Layerscape SFP (Security Fuse Processor)")
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.
[Took the version from the nvmem tree]
reply other threads:[~2022-02-23 21:26 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220223212634.398789-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=michael@walle$(echo .)cc \
--cc=srinivas.kandagatla@linaro$(echo .)org \
--cc=vincent.sunplus@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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