From: Mark Brown <broonie@kernel•org>
To: Dave Airlie <airlied@redhat•com>, DRI <dri-devel@lists•freedesktop.org>
Cc: "Andrew Morton" <akpm@linux-foundation•org>,
"Boris Brezillon" <boris.brezillon@collabora•com>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Loïc Molinari" <loic.molinari@collabora•com>,
"Lorenzo Stoakes" <lorenzo.stoakes@oracle•com>
Subject: linux-next: manual merge of the drm tree with the mm-unstable tree
Date: Mon, 26 Jan 2026 17:58:07 +0000 [thread overview]
Message-ID: <aXerLzIbpMy9d4lx@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1492 bytes --]
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/gem/i915_gem_shmem.c
between commit:
0c21ec1416a33 ("mm: update shmem_[kernel]_file_*() functions to use vma_flags_t")
from the mm-unstable tree and commit:
a8a9a590221c1 ("drm/i915: Use huge tmpfs mountpoint helpers")
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.
diff --cc drivers/gpu/drm/i915/gem/i915_gem_shmem.c
index fe1843497b27d,6ad1d6f99363e..0000000000000
--- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
@@@ -494,9 -496,11 +496,11 @@@ const struct drm_i915_gem_object_ops i9
static int __create_shmem(struct drm_i915_private *i915,
struct drm_gem_object *obj,
- resource_size_t size)
+ resource_size_t size,
+ unsigned int flags)
{
- const vma_flags_t flags = mk_vma_flags(VMA_NORESERVE_BIT);
- unsigned long shmem_flags = VM_NORESERVE;
++ const vma_flags_t shmem_flags = mk_vma_flags(VMA_NORESERVE_BIT);
+ struct vfsmount *huge_mnt;
struct file *filp;
drm_gem_private_object_init(&i915->drm, obj, size);
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-01-26 17:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-26 17:58 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-27 14:17 linux-next: manual merge of the drm tree with the mm-unstable tree Mark Brown
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=aXerLzIbpMy9d4lx@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=airlied@redhat$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=boris.brezillon@collabora$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=loic.molinari@collabora$(echo .)com \
--cc=lorenzo.stoakes@oracle$(echo .)com \
/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