* linux-next: manual merge of the drm tree with the mm-unstable tree
@ 2026-01-26 17:58 Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2026-01-26 17:58 UTC (permalink / raw)
To: Dave Airlie, DRI
Cc: Andrew Morton, Boris Brezillon, Linux Kernel Mailing List,
Linux Next Mailing List, Loïc Molinari, Lorenzo Stoakes
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the drm tree with the mm-unstable tree
@ 2026-01-27 14:17 Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2026-01-27 14:17 UTC (permalink / raw)
To: Dave Airlie, DRI
Cc: Alex Deucher, Andrew Morton, Linux Kernel Mailing List,
Linux Next Mailing List, Oleg Nesterov, Zhu Lingshan
[-- Attachment #1: Type: text/plain, Size: 954 bytes --]
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdkfd/kfd_process.c
between commit:
8635c94737032 ("drm/amd: kill the outdated "Only the pthreads threading model is supported" checks")
from the mm-unstable tree and commit:
d59e9d2d556ad ("amdkfd: process pointer of a HIQ should be NULL")
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/amd/amdkfd/kfd_process.c
index f8ef18a3aa71d,ba25d83c23e78..0000000000000
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-01-27 14:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-27 14:17 linux-next: manual merge of the drm tree with the mm-unstable tree Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2026-01-26 17:58 Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox