Hi all,
The following commit is also in the drm-misc tree as a different commit
(but the same patch):
06b19f46455c ("drm/nouveau/fb/ga102: Replace zero-length array of trailing structs with flex-array")
This is commit
54d47689c6e3 ("drm/nouveau/fb/ga102: Replace zero-length array of trailing structs with flex-array")
in the drm-misc tree.
--
Cheers,
Stephen Rothwell
On Tue, Jan 17, 2023 at 5:02 AM Stephen Rothwell <[email protected]> wrote:
>
> Hi all,
>
> The following commit is also in the drm-misc tree as a different commit
> (but the same patch):
>
> 06b19f46455c ("drm/nouveau/fb/ga102: Replace zero-length array of trailing structs with flex-array")
>
which branch? Because I just fetched the remote and don't have this
commit in my local repo
> This is commit
>
> 54d47689c6e3 ("drm/nouveau/fb/ga102: Replace zero-length array of trailing structs with flex-array")
>
> in the drm-misc tree.
>
> --
> Cheers,
> Stephen Rothwell
Hi Karol,
On Tue, 17 Jan 2023 14:52:12 +0100 Karol Herbst <[email protected]> wrote:
>
> On Tue, Jan 17, 2023 at 5:02 AM Stephen Rothwell <[email protected]> wrote:
> >
> > The following commit is also in the drm-misc tree as a different commit
> > (but the same patch):
> >
> > 06b19f46455c ("drm/nouveau/fb/ga102: Replace zero-length array of trailing structs with flex-array")
> >
>
> which branch? Because I just fetched the remote and don't have this
> commit in my local repo
That was from
git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git (branch
for-next/kspp) yesterday. It was the top commit in that branch. It is
still there today (I am not saying it should not be).
> > This is commit
> >
> > 54d47689c6e3 ("drm/nouveau/fb/ga102: Replace zero-length array of trailing structs with flex-array")
> >
> > in the drm-misc tree.
That was from git://anongit.freedesktop.org/drm/drm-misc (branch
for-linux-next) yesterday. It was the top commit in that branch. It
is still there today (again, I am not saying it should not be) but the
branch has moved on.
--
Cheers,
Stephen Rothwell
On Wed, Jan 18, 2023 at 07:56:20AM +1100, Stephen Rothwell wrote:
> Hi Karol,
>
> On Tue, 17 Jan 2023 14:52:12 +0100 Karol Herbst <[email protected]> wrote:
> >
> > On Tue, Jan 17, 2023 at 5:02 AM Stephen Rothwell <[email protected]> wrote:
> > >
> > > The following commit is also in the drm-misc tree as a different commit
> > > (but the same patch):
> > >
> > > 06b19f46455c ("drm/nouveau/fb/ga102: Replace zero-length array of trailing structs with flex-array")
> > >
> >
> > which branch? Because I just fetched the remote and don't have this
> > commit in my local repo
>
> That was from
> git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git (branch
> for-next/kspp) yesterday. It was the top commit in that branch. It is
> still there today (I am not saying it should not be).
I've dropped my instance of the patch. Thanks!
--
Kees Cook
On May 31, 2023 7:30:56 PM PDT, Stephen Rothwell <[email protected]> wrote:
>Hi all,
>
>The following commit is also in the mm-hotfixes tree as a different commit
>(but the same patch):
>
> f7223ccc138b ("string: use __builtin_memcpy() in strlcpy/strlcat")
>
>This is commit
>
> 0af9b29c6efd ("string: use __builtin_memcpy() in strlcpy/strlcat")
>
>in the mm-hotfixes tree.
Andrew, should I drop this from my tree?
--
Kees Cook
On Wed, 31 May 2023 19:43:32 -0700 Kees Cook <[email protected]> wrote:
> On May 31, 2023 7:30:56 PM PDT, Stephen Rothwell <[email protected]> wrote:
> >Hi all,
> >
> >The following commit is also in the mm-hotfixes tree as a different commit
> >(but the same patch):
> >
> > f7223ccc138b ("string: use __builtin_memcpy() in strlcpy/strlcat")
> >
> >This is commit
> >
> > 0af9b29c6efd ("string: use __builtin_memcpy() in strlcpy/strlcat")
> >
> >in the mm-hotfixes tree.
>
> Andrew, should I drop this from my tree?
>
Doesn't matter, as long as we don't both drop it ;)
I wibbled over cc:stable, decided not to. I did however queue it for
6.4-rcX.
I'll drop this patch from mm-hotfixes.