linux-next: manual merge of the hid tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  .mailmap

between commit:

  286812b041cc ("mailmap: update remaining active codeaurora.org email addresses")

from Linus' tree and commit:

  0c4b9411f363 ("MAINTAINERS: update my email address")

from the hid 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 5dd318121982,cea699139e6d..000000000000
--- a/.mailmap
+++ b/.mailmap
@@@ -138,10 -119,10 +138,13 @@@ Daniel Borkmann <daniel@xxxxxxxxxxxxx> 
  Daniel Borkmann <daniel@xxxxxxxxxxxxx> <dborkman@xxxxxxxxxx>
  Daniel Borkmann <daniel@xxxxxxxxxxxxx> <dxchgb@xxxxxxxxx>
  David Brownell <david-b@xxxxxxxxxxx>
 +David Collins <quic_collinsd@xxxxxxxxxxx> <collinsd@xxxxxxxxxxxxxx>
+ David Rheinsberg <david@xxxxxxxxxxxx> <dh.herrmann@xxxxxxxxx>
+ David Rheinsberg <david@xxxxxxxxxxxx> <dh.herrmann@xxxxxxxxxxxxxx>
+ David Rheinsberg <david@xxxxxxxxxxxx> <david.rheinsberg@xxxxxxxxx>
  David Woodhouse <dwmw2@xxxxxxxxxxxxxxxxxxxxxxx>
 +Dedy Lansky <quic_dlansky@xxxxxxxxxxx> <dlansky@xxxxxxxxxxxxxx>
 +Deepak Kumar Singh <quic_deesin@xxxxxxxxxxx> <deesin@xxxxxxxxxxxxxx>
  Dengcheng Zhu <dzhu@xxxxxxxxxxxx> <dczhu@xxxxxxxx>
  Dengcheng Zhu <dzhu@xxxxxxxxxxxx> <dengcheng.zhu@xxxxxxxxx>
  Dengcheng Zhu <dzhu@xxxxxxxxxxxx> <dengcheng.zhu@xxxxxxxxxx>

Attachment: pgpN9k_GSjVff.pgp
Description: OpenPGP digital signature