Subject: linux-next: manual merge of the bpf-next tree with the jc_docs tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 12 Apr 2019 11:05:18 +1000

Hi all,

Today's linux-next merge of the bpf-next tree got a conflict in:

  .mailmap

between commit:

  9b628c6ab437 ("mailmap: update my obsolete email address")

from the jc_docs tree and commit:

  fa0dcb3fe2ca ("mailmap: add entry for email addresses")

from the bpf-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.

-- 
Cheers,
Stephen Rothwell

diff --cc .mailmap
index 151501c73503,e7984bb6b4b0..000000000000
--- a/.mailmap
+++ b/.mailmap
@@@ -16,8 -16,9 +16,11 @@@ Alan Cox <[email-masked]
  Alan Cox <[email-masked]>
  Aleksey Gorelov <[email-masked]>
  Aleksandar Markovic <[email-masked]> <[email-masked]>
 +Alex Shi <[email-masked]> <[email-masked]>
 +Alex Shi <[email-masked]> <[email-masked]>
+ Alexei Starovoitov <[email-masked]> <[email-masked]>
+ Alexei Starovoitov <[email-masked]> <[email-masked]>
+ Alexei Starovoitov <[email-masked]> <[email-masked]>
  Al Viro <[email-masked]>
  Al Viro <[email-masked]>
  Andi Shyti <[email-masked]> <[email-masked]>