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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20170802132415.4061f3f3@canb.auug.org.au>
Date:   Wed, 2 Aug 2017 13:24:15 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@...sung.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Tom Lendacky <thomas.lendacky@....com>,
        Daniel Vetter <daniel.vetter@...ll.ch>
Subject: linux-next: manual merge of the tip tree with the fbdev tree

Hi all,

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

  drivers/video/fbdev/core/fbmem.c

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.

-- 
Cheers,
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>