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 [off-list ref] [off-list ref]
  Veerabhadrarao Badiganti [off-list ref] [off-list ref]
  Venkateswara Naralasetty [off-list ref] [off-list ref]
 -Vikash Garodia [off-list ref] [off-list ref]
 +Vikash Garodia [off-list ref] [off-list ref]
 +Vikash Garodia [off-list ref] [off-list ref]
+ Vincent Mailhol [off-list ref] [off-list ref]
  Vinod Koul [off-list ref] [off-list ref]
  Vinod Koul [off-list ref] [off-list ref]
  Vinod Koul [off-list ref] [off-list ref]