From: Mark Brown <broonie@kernel•org>
To: David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>,
Networking <netdev@vger•kernel.org>
Cc: Bryan O'Donoghue <bod@kernel•org>,
Hans Verkuil <hverkuil+cisco@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Marc Kleine-Budde <mkl@pengutronix•de>,
Mauro Carvalho Chehab <mchehab+huawei@kernel•org>,
Vikash Garodia <quic_vgarodia@quicinc•com>,
Vikash Garodia <vikash.garodia@oss•qualcomm.com>,
Vincent Mailhol <mailhol@kernel•org>
Subject: linux-next: manual merge of the net-next tree with the v4l-dvb tree
Date: Mon, 29 Sep 2025 12:29:38 +0100 [thread overview]
Message-ID: <aNptonyTUxn7dm4B@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
.mailmap
between commit:
1b2263ef32920 ("MAINTAINERS: Update Vikash Garodia's email address")
from the v4l-dvb tree and commit:
39b8e0fef155e ("MAINTAINERS: update Vincent Mailhol's email address")
from the net-next 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 2a60b2920d22e,ddc4ca07267db..0000000000000
--- a/.mailmap
+++ b/.mailmap
@@@ -819,8 -818,8 +821,9 @@@ Valentin Schneider <vschneid@redhat•com
Veera Sundaram Sankaran <quic_veeras@quicinc•com> <veeras@codeaurora•org>
Veerabhadrarao Badiganti <quic_vbadigan@quicinc•com> <vbadigan@codeaurora•org>
Venkateswara Naralasetty <quic_vnaralas@quicinc•com> <vnaralas@codeaurora•org>
-Vikash Garodia <quic_vgarodia@quicinc•com> <vgarodia@codeaurora•org>
+Vikash Garodia <vikash.garodia@oss•qualcomm.com> <vgarodia@codeaurora•org>
+Vikash Garodia <vikash.garodia@oss•qualcomm.com> <quic_vgarodia@quicinc•com>
+ Vincent Mailhol <mailhol@kernel•org> <mailhol.vincent@wanadoo•fr>
Vinod Koul <vkoul@kernel•org> <vinod.koul@intel•com>
Vinod Koul <vkoul@kernel•org> <vinod.koul@linux•intel.com>
Vinod Koul <vkoul@kernel•org> <vkoul@infradead•org>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2025-09-29 11:29 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=aNptonyTUxn7dm4B@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=bod@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=hverkuil+cisco@kernel$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mailhol@kernel$(echo .)org \
--cc=mchehab+huawei@kernel$(echo .)org \
--cc=mkl@pengutronix$(echo .)de \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=quic_vgarodia@quicinc$(echo .)com \
--cc=vikash.garodia@oss$(echo .)qualcomm.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