linux-next: manual merge of the drm tree with the crypto tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  MAINTAINERS

between commit:

  885743324513 ("crypto: keembay - Add support for Keem Bay OCS AES/SM4")

from the crypto tree and commit:

  ed794057b052 ("drm/kmb: Build files for KeemBay Display driver")

from the drm 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 3b358262de8f,eb18459c1d16..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6932,11 -6913,16 +6941,10 @@@ S:	Maintaine
  W:	http://floatingpoint.sourceforge.net/emulator/index.html
  F:	arch/x86/math-emu/
  
 -FRAME RELAY DLCI/FRAD (Sangoma drivers too)
 -L:	netdev@vger.kernel.org
 -S:	Orphan
 -F:	drivers/net/wan/dlci.c
 -F:	drivers/net/wan/sdla.c
 -
  FRAMEBUFFER LAYER
- M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:	dri-devel@lists.freedesktop.org
  L:	linux-fbdev@vger.kernel.org
- S:	Maintained
+ S:	Orphan
  Q:	http://patchwork.kernel.org/project/linux-fbdev/list/
  T:	git git://anongit.freedesktop.org/drm/drm-misc
  F:	Documentation/fb/
@@@ -8985,16 -8962,13 +8993,23 @@@ M:	Deepak Saxena <dsaxena@plexity.net
  S:	Maintained
  F:	drivers/char/hw_random/ixp4xx-rng.c
  
+ INTEL KEEMBAY DRM DRIVER
+ M:	Anitha Chrisanthus <anitha.chrisanthus@intel.com>
+ M:	Edmund Dea <edmund.j.dea@intel.com>
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/display/intel,kmb_display.yaml
+ F:	drivers/gpu/drm/kmb/
+ 
 +INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVER
 +M:	Daniele Alessandrelli <daniele.alessandrelli@intel.com>
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/crypto/intel,keembay-ocs-aes.yaml
 +F:	drivers/crypto/keembay/Kconfig
 +F:	drivers/crypto/keembay/Makefile
 +F:	drivers/crypto/keembay/keembay-ocs-aes-core.c
 +F:	drivers/crypto/keembay/ocs-aes.c
 +F:	drivers/crypto/keembay/ocs-aes.h
 +
  INTEL MANAGEMENT ENGINE (mei)
  M:	Tomas Winkler <tomas.winkler@intel.com>
  L:	linux-kernel@vger.kernel.org

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