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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 6 Jun 2018 14:37:41 +1000

Hi all,

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

  MAINTAINERS

between commit:

  2562c011f897 ("MAINTAINERS: add Josh Poimboeuf as faddr2line maintainer")

from Linus' tree and commit:

  30c8bd5aa8b2 ("net: Introduce generic failover module")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 8ac49add2df7,884657f0be11..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5430,11 -5413,14 +5430,19 @@@ S:	Maintaine
  F:	Documentation/hwmon/f71805f
  F:	drivers/hwmon/f71805f.c
  
 +FADDR2LINE
 +M:	Josh Poimboeuf <[email-masked]>
 +S:	Maintained
 +F:	scripts/faddr2line
 +
+ FAILOVER MODULE
+ M:	Sridhar Samudrala <[email-masked]>
+ L:	[email-masked]
+ S:	Supported
+ F:	net/core/failover.c
+ F:	include/net/failover.h
+ F:	Documentation/networking/failover.rst
+ 
  FANOTIFY
  M:	Jan Kara <[email-masked]>
  R:	Amir Goldstein <[email-masked]>