linux-next: manual merge of the tip tree with the fbdev tree

From: Stephen Rothwell
Date: Tue Aug 01 2017 - 23:24:22 EST

Hi all,

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


between commit:

6104c37094e7 ("fbcon: Make fbcon a built-time depency for fbdev")

from the fbdev tree and commit:

95cf9264d5f3 ("x86, drm, fbdev: Do not specify encrypted memory for video mappings")

from the tip 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.

Stephen Rothwell

diff --cc drivers/video/fbdev/core/fbmem.c
index f8ced1434edf,25e862c487f6..000000000000
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@@ -32,7 -32,7 +32,8 @@@
#include <linux/device.h>
#include <linux/efi.h>
#include <linux/fb.h>
+#include <linux/fbcon.h>
+ #include <linux/mem_encrypt.h>

#include <asm/fb.h>