linux-next: duplicate patch in the kspp tree

linux-next: duplicate patch in the kspp tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 348 bytes --]

Hi all,

The following commit is also in the char-misc tree as a different commit
(but the same patch):

  e166ec7e7164 ("misc: bcm-vk: avoid -Wflex-array-member-not-at-end warning")

This is commit

  e1ee28b12675 ("misc: bcm-vk: avoid -Wflex-array-member-not-at-end warning")

in the char-misc tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the kspp tree

[Kees Cook]

On Tue, Apr 22, 2025 at 07:44:58PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the char-misc tree as a different commit
> (but the same patch):
> 
>   e166ec7e7164 ("misc: bcm-vk: avoid -Wflex-array-member-not-at-end warning")
> 
> This is commit
> 
>   e1ee28b12675 ("misc: bcm-vk: avoid -Wflex-array-member-not-at-end warning")
> 
> in the char-misc tree.

Thanks! I will drop the one in my tree.

-- 
Kees Cook

linux-next: duplicate patch in the kspp tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 338 bytes --]

Hi all,

The following commit is also in the watchdog tree as a different commit
(but the same patch):

  8e28276a569a ("watchdog: exar: Shorten identity name to fit correctly")

this is commit

  f2019c0c8b7c ("watchdog: exar: Shorten identity name to fit correctly")

in the watchdog tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: duplicate patch in the kspp tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 360 bytes --]

Hi all,

The following commit is also in the scsi-mkp tree as a different commit
(but the same patch):

  d8720235d5b5 ("scsi: qedf: Use designated initializer for struct qed_fcoe_cb_ops")

This is commit

  d897dae472f2 ("scsi: qedf: Use designated initializer for struct qed_fcoe_cb_ops")

in the scsi-mkp tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the kspp tree

[Kees Cook]

On Fri, May 09, 2025 at 06:48:46PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the scsi-mkp tree as a different commit
> (but the same patch):
> 
>   d8720235d5b5 ("scsi: qedf: Use designated initializer for struct qed_fcoe_cb_ops")
> 
> This is commit
> 
>   d897dae472f2 ("scsi: qedf: Use designated initializer for struct qed_fcoe_cb_ops")
> 
> in the scsi-mkp tree.

Yeah, I am carrying this and the qede patch since I need them for a
clean build in my tree. I might need to split my merge window into two
halves if I need to drop the duplicates.

-- 
Kees Cook

Re: linux-next: duplicate patch in the kspp tree

[Martin K. Petersen]

Hi Kees,

>>   d897dae472f2 ("scsi: qedf: Use designated initializer for struct qed_fcoe_cb_ops")
>> 
>> in the scsi-mkp tree.
>
> Yeah, I am carrying this and the qede patch since I need them for a
> clean build in my tree. I might need to split my merge window into two
> halves if I need to drop the duplicates.

I can just drop it. Your change won't conflict with anything currently
in the SCSI pipeline for 6.16.

-- 
Martin K. Petersen

linux-next: duplicate patch in the kspp tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 399 bytes --]

Hi all,

The following commit is also in the mm-hotfixes tree as a different commit
(but the same patch):

  a508ef4b1dcc ("lib: string_helpers: silence snprintf() output truncation warning")

This is commit

  136dd147cdca ("lib: string_helpers: fix potential snprintf() output truncation")

in the mm-hotifxes-unstable branch of the mm-hotfixes tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the kspp tree

[Andrew Morton]

On Mon, 4 Nov 2024 16:42:55 +1100 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):
> 
>   a508ef4b1dcc ("lib: string_helpers: silence snprintf() output truncation warning")
> 
> This is commit
> 
>   136dd147cdca ("lib: string_helpers: fix potential snprintf() output truncation")
> 
> in the mm-hotifxes-unstable branch of the mm-hotfixes tree.

um, OK, unsure how string_helpers are a hardening thing (more than
anything else could be) but whatevs.

The v2 patch appears to address James's v1 comments so I'll remove this
from mm.git.

linux-next: duplicate patch in the kspp tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 221 bytes --]

Hi all,

The following commit is also in Linus Torvalds' tree as a different commit
(but the same patch):

  e3890eadadad ("string: kunit: add missing MODULE_DESCRIPTION() macros")

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the kspp tree

[Kees Cook]

On Mon, Jul 08, 2024 at 06:24:58PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in Linus Torvalds' tree as a different commit
> (but the same patch):
> 
>   e3890eadadad ("string: kunit: add missing MODULE_DESCRIPTION() macros")

I've dropped this from my tree now. Thanks!

-- 
Kees Cook

linux-next: duplicate patch in the kspp tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: duplicate patch in the kspp tree

[Kees Cook]

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

linux-next: duplicate patch in the kspp tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: duplicate patch in the kspp tree

[Stephen Rothwell]

[-- 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 --]

linux-next: duplicate patch in the kspp tree

[Stephen Rothwell]

[-- 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 --]

linux-next: duplicate patch in the kspp tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: duplicate patch in the kspp tree

[Kees Cook]

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

Re: linux-next: duplicate patch in the kspp tree

[Andrew Morton]

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.

linux-next: duplicate patch in the kspp tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: duplicate patch in the kspp tree

[Karol Herbst]

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

Re: linux-next: duplicate patch in the kspp tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: duplicate patch in the kspp tree

[Kees Cook]

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