linux-kernel - linux-next: manual merge of the folio tree with the drm-intel 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20220222004147.3360596-1-broonie@kernel.org>
Date:   Tue, 22 Feb 2022 00:41:47 +0000
From:   broonie@...nel.org
To:     Matthew Wilcox <willy@...radead.org>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Christoph Hellwig <hch@....de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Lucas De Marchi <lucas.demarchi@...el.com>
Subject: linux-next: manual merge of the folio tree with the drm-intel tree

Hi all,

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

  drivers/gpu/drm/drm_cache.c

between commit:

  7938f4218168a ("dma-buf-map: Rename to iosys-map")

from the drm-intel tree and commit:

  96160c2f78bd1 ("mm: don't include <linux/memremap.h> in <linux/mm.h>")

from the folio 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 drivers/gpu/drm/drm_cache.c
index 4b0da6baff78e,50b8a088f763a..0000000000000
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@@ -27,11 -27,11 +27,11 @@@
  /*
   * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
   */
- 
 -#include <linux/dma-buf-map.h>
 +#include <linux/cc_platform.h>
  #include <linux/export.h>
  #include <linux/highmem.h>
 -#include <linux/cc_platform.h>
+ #include <linux/ioport.h>
 +#include <linux/iosys-map.h>
  #include <xen/xen.h>
  
  #include <drm/drm_cache.h>