linux-next: manual merge of the net-next tree with the vfs-brauner tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]

Hi all,

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

  MAINTAINERS

between commit:

  969076f31bf63 ("efs: Remove EFS")

from the vfs-brauner tree and commit:

  eb56577ae9a5a ("ehea: remove the ehea driver")

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.

diff --cc MAINTAINERS
index 801a4809b918a,ee4ee7b8e9470..0000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9495,11 -9493,11 +9495,6 @@@ L:	linux-fbdev@vger.kernel.or
  S:	Maintained
  F:	drivers/video/fbdev/efifb.c
  
- EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
- L:	netdev@vger.kernel.org
 -EFS FILESYSTEM
--S:	Orphan
- F:	drivers/net/ethernet/ibm/ehea/
 -W:	http://aeschi.ch.eu.org/efs/
 -F:	fs/efs/
--
  ELM327 CAN NETWORK DRIVER
  M:	Max Staudt <max@enpas.org>
  L:	linux-can@vger.kernel.org

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]