netdev - linux-next: manual merge of the net-next tree with the v4l-dvb tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <aNptonyTUxn7dm4B@sirena.org.uk>
Date: Mon, 29 Sep 2025 12:29:38 +0100
From: Mark Brown <broonie@...nel.org>
To: David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
	Paolo Abeni <pabeni@...hat.com>,
	Networking <netdev@...r.kernel.org>
Cc: Bryan O'Donoghue <bod@...nel.org>,
	Hans Verkuil <hverkuil+cisco@...nel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Marc Kleine-Budde <mkl@...gutronix.de>,
	Mauro Carvalho Chehab <mchehab+huawei@...nel.org>,
	Vikash Garodia <quic_vgarodia@...cinc.com>,
	Vikash Garodia <vikash.garodia@....qualcomm.com>,
	Vincent Mailhol <mailhol@...nel.org>
Subject: linux-next: manual merge of the net-next tree with the v4l-dvb tree

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@...hat.com
  Veera Sundaram Sankaran <quic_veeras@...cinc.com> <veeras@...eaurora.org>
  Veerabhadrarao Badiganti <quic_vbadigan@...cinc.com> <vbadigan@...eaurora.org>
  Venkateswara Naralasetty <quic_vnaralas@...cinc.com> <vnaralas@...eaurora.org>
 -Vikash Garodia <quic_vgarodia@...cinc.com> <vgarodia@...eaurora.org>
 +Vikash Garodia <vikash.garodia@....qualcomm.com> <vgarodia@...eaurora.org>
 +Vikash Garodia <vikash.garodia@....qualcomm.com> <quic_vgarodia@...cinc.com>
+ Vincent Mailhol <mailhol@...nel.org> <mailhol.vincent@...adoo.fr>
  Vinod Koul <vkoul@...nel.org> <vinod.koul@...el.com>
  Vinod Koul <vkoul@...nel.org> <vinod.koul@...ux.intel.com>
  Vinod Koul <vkoul@...nel.org> <vkoul@...radead.org>

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)