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

[Mark Brown]

Hi all,

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

  .get_maintainer.ignore

between commit:

  ad7265b29995f (".get_maintainer.ignore: add myself")

from the origin tree and commit:

  e160c4481f60a (".get_maintainer.ignore: Add Kees Cook")

from the kspp 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 .get_maintainer.ignore
index d19b725fd803b,5c8b295d647f6..0000000000000
--- a/.get_maintainer.ignore
+++ b/.get_maintainer.ignore
@@@ -4,8 -4,7 +4,9 @@@ Alyssa Rosenzweig <alyssa@xxxxxxxxxxxxx
  Askar Safin <safinaskar@xxxxxxxxx>
  Christoph Hellwig <hch@xxxxxx>
  Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
 +Johannes Berg <johannes.berg@xxxxxxxxx>
 +Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
+ Kees Cook <kees@xxxxxxxxxx>
  Marc Gonzalez <marc.w.gonzalez@xxxxxxx>
  Nathan Chancellor <nathan@xxxxxxxxxx>
  Ralf Baechle <ralf@xxxxxxxxxxxxxx>

Attachment: signature.asc
Description: PGP signature