linux-next: manual merge of the iio tree with the origin tree

Hi all,

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

.mailmap

between commit:

984d1efff2304 ("mailmap: update email address of Brian Silverman")

from the origin tree and commit:

f3366f8e64645 ("mailmap: Update email address for Cai Huoqing")

from the iio 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 8cd44b0c65797,76dd303c7eac1..0000000000000
@@@ -70,7 -70,7 +70,8 @@@ Boris Brezillon <[email protected]
  Boris Brezillon <[email protected]> <[email protected]>
  Brian Avery <[email protected]>
  Brian King <[email protected]>
 +Brian Silverman <[email protected]> <[email protected]>
+ Cai Huoqing <[email protected]> <[email protected]>
  Changbin Du <[email protected]> <[email protected]>
  Changbin Du <[email protected]> <[email protected]>
  Chao Yu <[email protected]> <[email protected]>