From: Kees Cook <kees@kernel.org>
To: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Cc: Mark Brown <broonie@kernel.org>, Rob Clark <robdclark@gmail.com>,
Sean Paul <seanpaul@chromium.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the drm-msm-fixes tree with the origin tree
Date: Wed, 25 Feb 2026 09:56:09 -0800 [thread overview]
Message-ID: <202602250951.FBB79714E@keescook> (raw)
In-Reply-To: <CAO9ioeUM6ypgSLfZYj41LcjjENVpCuJ6ffk7f5yybdmd8UGJ3Q@mail.gmail.com>
On Wed, Feb 25, 2026 at 07:42:12PM +0200, Dmitry Baryshkov wrote:
> On Wed, 25 Feb 2026 at 15:22, Mark Brown <broonie@kernel.org> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the drm-msm-fixes tree got a conflict in:
> >
> > drivers/gpu/drm/msm/msm_iommu.c
> >
> > between commits:
> >
> > 48634a9ea06a4 ("drm/msm: Adjust msm_iommu_pagetable_prealloc_allocate() allocation type")
>
> Kees, why was it landed? And how? It was not Ack'ed (nor was it
> requested) to go through the non-drm-msm tree. There was no note that
> it got applied. What is going on?
It was a prerequisite for the tree-wide changes, so I had to send it to
Linus ahead of the -rc1 release. Sorry for the collision there! I waited
as long as I could, but the msm-fixes tree wasn't sent for -rc1, so I
had to include the patch in the prep patches:
https://lore.kernel.org/lkml/202602191029.2F0E7F01@keescook/
--
Kees Cook
next prev parent reply other threads:[~2026-02-25 17:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-25 13:22 linux-next: manual merge of the drm-msm-fixes tree with the origin tree Mark Brown
2026-02-25 17:42 ` Dmitry Baryshkov
2026-02-25 17:56 ` Kees Cook [this message]
2026-02-25 18:11 ` Dmitry Baryshkov
2026-02-25 20:37 ` Kees Cook
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=202602250951.FBB79714E@keescook \
--to=kees@kernel.org \
--cc=broonie@kernel.org \
--cc=dmitry.baryshkov@oss.qualcomm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robdclark@gmail.com \
--cc=seanpaul@chromium.org \
--cc=torvalds@linux-foundation.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.