From: Mark Brown <broonie@kernel.org>
To: Simona Vetter <simona.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>
Cc: "Christian König" <christian.koenig@amd.com>,
"Fei Yu" <fei.yu@intel.com>, "Kees Cook" <kees@kernel.org>,
"Kees Cook" <kees+treewide@kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the drm-misc-fixes tree with the origin tree
Date: Tue, 17 Nov 2026 15:14:53 +0000 [thread overview]
Message-ID: <avxvbWBvcToSp_t4@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 2041 bytes --]
Hi all,
Today's linux-next merge of the drm-misc-fixes tree got a conflict in:
drivers/gpu/drm/drm_syncobj.c
between commit:
0af298e62e5cf ("treewide: refresh kmalloc_obj() conversions")
from the origin tree and commit:
6ca87397aeebc ("drm/syncobj: Limit the number of handles and use kvmalloc for user-sized arrays")
from the drm-misc-fixes 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_syncobj.c
index 137397972a98a,c8a8c49d12fb2..0000000000000
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@@ -1051,7 -1062,7 +1062,7 @@@ static signed long drm_syncobj_array_wa
lockdep_assert_none_held_once();
}
- points = kmalloc_objs(*points, count);
- points = kvmalloc_array(count, sizeof(*points), GFP_KERNEL);
++ points = kvmalloc_objs(*points, count);
if (points == NULL)
return -ENOMEM;
@@@ -1238,7 -1249,10 +1249,10 @@@ static int drm_syncobj_array_find(struc
struct drm_syncobj **syncobjs;
int ret;
- handles = kmalloc_objs(*handles, count_handles);
+ if (count_handles > DRM_SYNCOBJ_MAX_HANDLES)
+ return -EINVAL;
+
- handles = kvmalloc_array(count_handles, sizeof(*handles), GFP_KERNEL);
++ handles = kvmalloc_objs(*handles, count_handles);
if (handles == NULL)
return -ENOMEM;
@@@ -1572,7 -1586,8 +1586,7 @@@ drm_syncobj_timeline_signal_ioctl(struc
if (ret < 0)
return ret;
- points = kmalloc_objs(*points, args->count_handles);
- points = kvmalloc_array(args->count_handles, sizeof(*points),
- GFP_KERNEL);
++ points = kvmalloc_objs(*points, args->count_handles);
if (!points) {
ret = -ENOMEM;
goto out;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-11-17 15:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 15:14 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-08-26 11:52 Mark Brown
2026-08-25 12:13 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=avxvbWBvcToSp_t4@sirena.org.uk \
--to=broonie@kernel.org \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=fei.yu@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=kees+treewide@kernel.org \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=simona.vetter@ffwll.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®