* linux-next: duplicate patch in the kspp tree
@ 2023-06-01 2:30 Stephen Rothwell
2023-06-01 2:43 ` Kees Cook
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2023-06-01 2:30 UTC (permalink / raw)
To: Kees Cook, Andrew Morton
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 334 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: duplicate patch in the kspp tree
2023-06-01 2:30 linux-next: duplicate patch in the kspp tree Stephen Rothwell
@ 2023-06-01 2:43 ` Kees Cook
2023-06-01 4:12 ` Andrew Morton
0 siblings, 1 reply; 12+ messages in thread
From: Kees Cook @ 2023-06-01 2:43 UTC (permalink / raw)
To: Stephen Rothwell, Kees Cook, Andrew Morton
Cc: Linux Kernel Mailing List, Linux Next Mailing List
On May 31, 2023 7:30:56 PM PDT, Stephen Rothwell <sfr@canb.auug.org.au> 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
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: duplicate patch in the kspp tree
2023-06-01 2:43 ` Kees Cook
@ 2023-06-01 4:12 ` Andrew Morton
0 siblings, 0 replies; 12+ messages in thread
From: Andrew Morton @ 2023-06-01 4:12 UTC (permalink / raw)
To: Kees Cook
Cc: Stephen Rothwell, Kees Cook, Linux Kernel Mailing List,
Linux Next Mailing List
On Wed, 31 May 2023 19:43:32 -0700 Kees Cook <kees@kernel.org> wrote:
> On May 31, 2023 7:30:56 PM PDT, Stephen Rothwell <sfr@canb.auug.org.au> 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.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: duplicate patch in the kspp tree
2024-02-28 3:02 Stephen Rothwell
@ 2024-02-28 3:26 ` Kees Cook
0 siblings, 0 replies; 12+ messages in thread
From: Kees Cook @ 2024-02-28 3:26 UTC (permalink / raw)
To: Stephen Rothwell, Kees Cook, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, Peter Zijlstra
Cc: Linux Kernel Mailing List, Linux Next Mailing List
On February 27, 2024 7:02:52 PM PST, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>Hi all,
>
>The following commit is also in the tip tree as a different commit
>(but the same patch):
>
> 2867ef32ce00 ("x86/vdso: Move vDSO to mmap region")
>
>This is commit
>
> 3c6539b4c177 ("x86/vdso: Move vDSO to mmap region")
>
>in the tip tree.
Thanks! I'll drop mine.
-Kees
--
Kees Cook
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: duplicate patch in the kspp tree
@ 2024-02-28 3:02 Stephen Rothwell
2024-02-28 3:26 ` Kees Cook
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2024-02-28 3:02 UTC (permalink / raw)
To: Kees Cook, Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
Hi all,
The following commit is also in the tip tree as a different commit
(but the same patch):
2867ef32ce00 ("x86/vdso: Move vDSO to mmap region")
This is commit
3c6539b4c177 ("x86/vdso: Move vDSO to mmap region")
in the tip tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: duplicate patch in the kspp tree
2024-01-04 3:23 Stephen Rothwell
@ 2024-01-04 3:26 ` Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2024-01-04 3:26 UTC (permalink / raw)
To: Kees Cook, Anna Schumaker, Trond Myklebust
Cc: Linux Kernel Mailing List, Linux Next Mailing List, NFS Mailing List
[-- Attachment #1: Type: text/plain, Size: 460 bytes --]
Hi all,
[Just cc'ing the nfs-anna tree contacts]
On Thu, 4 Jan 2024 14:23:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> The following commit is also in the nfs-anna tree as a different commit
> (but the same patch):
>
> cb6d2fd30ddd ("SUNRPC: Replace strlcpy() with strscpy()")
>
> This is commit
>
> d8056629633c ("SUNRPC: Replace strlcpy() with strscpy()")
>
> in the nfs-anna tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: duplicate patch in the kspp tree
@ 2024-01-04 3:23 Stephen Rothwell
2024-01-04 3:26 ` Stephen Rothwell
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2024-01-04 3:23 UTC (permalink / raw)
To: Kees Cook; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
Hi all,
The following commit is also in the nfs-anna tree as a different commit
(but the same patch):
cb6d2fd30ddd ("SUNRPC: Replace strlcpy() with strscpy()")
This is commit
d8056629633c ("SUNRPC: Replace strlcpy() with strscpy()")
in the nfs-anna tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: duplicate patch in the kspp tree
@ 2023-06-05 2:34 Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2023-06-05 2:34 UTC (permalink / raw)
To: Kees Cook, Andrew Morton
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
Hi all,
The following commit is also in the mm tree as a different commit (but
the same patch):
4cc6886bd8b3 ("checkpatch: Check for 0-length and 1-element arrays")
This is commit
bb1876dc1487 ("checkpatch: check for 0-length and 1-element arrays")
in the mm tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: duplicate patch in the kspp tree
2023-01-17 20:56 ` Stephen Rothwell
@ 2023-01-18 20:38 ` Kees Cook
0 siblings, 0 replies; 12+ messages in thread
From: Kees Cook @ 2023-01-18 20:38 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Karol Herbst, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List
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 <kherbst@redhat.com> wrote:
> >
> > On Tue, Jan 17, 2023 at 5:02 AM Stephen Rothwell <sfr@canb.auug.org.au> 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
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: duplicate patch in the kspp tree
2023-01-17 13:52 ` Karol Herbst
@ 2023-01-17 20:56 ` Stephen Rothwell
2023-01-18 20:38 ` Kees Cook
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2023-01-17 20:56 UTC (permalink / raw)
To: Karol Herbst
Cc: Kees Cook, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1155 bytes --]
Hi Karol,
On Tue, 17 Jan 2023 14:52:12 +0100 Karol Herbst <kherbst@redhat.com> wrote:
>
> On Tue, Jan 17, 2023 at 5:02 AM Stephen Rothwell <sfr@canb.auug.org.au> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: duplicate patch in the kspp tree
2023-01-17 4:02 Stephen Rothwell
@ 2023-01-17 13:52 ` Karol Herbst
2023-01-17 20:56 ` Stephen Rothwell
0 siblings, 1 reply; 12+ messages in thread
From: Karol Herbst @ 2023-01-17 13:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Kees Cook, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List
On Tue, Jan 17, 2023 at 5:02 AM Stephen Rothwell <sfr@canb.auug.org.au> 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
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: duplicate patch in the kspp tree
@ 2023-01-17 4:02 Stephen Rothwell
2023-01-17 13:52 ` Karol Herbst
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2023-01-17 4:02 UTC (permalink / raw)
To: Kees Cook
Cc: Daniel Vetter, Intel Graphics, DRI, Karol Herbst,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 396 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-02-28 3:26 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-01 2:30 linux-next: duplicate patch in the kspp tree Stephen Rothwell
2023-06-01 2:43 ` Kees Cook
2023-06-01 4:12 ` Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2024-02-28 3:02 Stephen Rothwell
2024-02-28 3:26 ` Kees Cook
2024-01-04 3:23 Stephen Rothwell
2024-01-04 3:26 ` Stephen Rothwell
2023-06-05 2:34 Stephen Rothwell
2023-01-17 4:02 Stephen Rothwell
2023-01-17 13:52 ` Karol Herbst
2023-01-17 20:56 ` Stephen Rothwell
2023-01-18 20:38 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).