From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dave Airlie <airlied@linux•ie>
Cc: broonie@kernel•org, Matthew Wilcox <willy@infradead•org>,
Andrew Morton <akpm@linux-foundation•org>,
Christoph Hellwig <hch@lst•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Lucas De Marchi <lucas.demarchi@intel•com>
Subject: Re: linux-next: manual merge of the folio tree with the drm-intel tree
Date: Thu, 24 Mar 2022 11:52:17 +1100 [thread overview]
Message-ID: <20220324115217.21e58afe@canb.auug.org.au> (raw)
In-Reply-To: <20220222004147.3360596-1-broonie@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 1500 bytes --]
Hi all,
On Tue, 22 Feb 2022 00:41:47 +0000 broonie@kernel•org wrote:
>
> 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>
This is now a conflict between the drm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2022-03-24 0:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-22 0:41 linux-next: manual merge of the folio tree with the drm-intel tree broonie
2022-03-24 0:52 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220324115217.21e58afe@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=akpm@linux-foundation$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lucas.demarchi@intel$(echo .)com \
--cc=willy@infradead$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox