From: broonie@kernel•org
To: Jonathan Cameron <Jonathan.Cameron@Huawei•com>
Cc: Cai Huoqing <caihuoqing@baidu•com>,
Cai Huoqing <cai.huoqing@linux•dev>,
Jonathan Cameron <Jonathan.Cameron@huawei•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Marc Kleine-Budde <mkl@pengutronix•de>
Subject: linux-next: manual merge of the iio tree with the origin tree
Date: Mon, 21 Feb 2022 21:19:43 +0000 [thread overview]
Message-ID: <20220221211943.2092199-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the iio tree got a conflict in:
.mailmap
between commit:
984d1efff2304 ("mailmap: update email address of Brian Silverman")
from the origin tree and commit:
f3366f8e64645 ("mailmap: Update email address for Cai Huoqing")
from the iio 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 --cc .mailmap
index 8cd44b0c65797,76dd303c7eac1..0000000000000
--- a/.mailmap
+++ b/.mailmap
@@@ -70,7 -70,7 +70,8 @@@ Boris Brezillon <bbrezillon@kernel•org
Boris Brezillon <bbrezillon@kernel•org> <boris.brezillon@free-electrons•com>
Brian Avery <b.avery@hp•com>
Brian King <brking@us•ibm.com>
+Brian Silverman <bsilver16384@gmail•com> <brian.silverman@bluerivertech•com>
+ Cai Huoqing <cai.huoqing@linux•dev> <caihuoqing@baidu•com>
Changbin Du <changbin.du@intel•com> <changbin.du@gmail•com>
Changbin Du <changbin.du@intel•com> <changbin.du@intel•com>
Chao Yu <chao@kernel•org> <chao2.yu@samsung•com>
reply other threads:[~2022-02-21 21:19 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=20220221211943.2092199-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=Jonathan.Cameron@Huawei$(echo .)com \
--cc=cai.huoqing@linux$(echo .)dev \
--cc=caihuoqing@baidu$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mkl@pengutronix$(echo .)de \
/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