linux-next: duplicate patch in the vhost tree

linux-next: duplicate patch in the vhost tree

[Stephen Rothwell]

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

Hi all,

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

  3a9421482150 ("dma-api-howto: typo fix")

This is commit

  2ca956cf8834 ("dma-api-howto: typo fix")

in the jc_docs tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Jonathan Corbet]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> The following commit is also in the jc_docs tree as a different commit
> (but the same patch):
>
>   3a9421482150 ("dma-api-howto: typo fix")
>
> This is commit
>
>   2ca956cf8834 ("dma-api-howto: typo fix")
>
> in the jc_docs tree.

Michael, I'm a bit confused by this one...you sent it to me, but
evidently didn't want me to take it?  I can certainly drop it...

Thanks,

jon

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

[Michael S. Tsirkin]

On Tue, Apr 11, 2023 at 04:18:36PM -0600, Jonathan Corbet wrote:
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 
> > Hi all,
> >
> > The following commit is also in the jc_docs tree as a different commit
> > (but the same patch):
> >
> >   3a9421482150 ("dma-api-howto: typo fix")
> >
> > This is commit
> >
> >   2ca956cf8834 ("dma-api-howto: typo fix")
> >
> > in the jc_docs tree.
> 
> Michael, I'm a bit confused by this one...you sent it to me, but
> evidently didn't want me to take it?  I can certainly drop it...
> 
> Thanks,
> 
> jon

Sorry, it's just a holiday here. dropped now.

-- 
MST

linux-next: duplicate patch in the vhost tree

[Stephen Rothwell]

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

Hi all,

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

  cfc232b3ec9e ("hwrng: virtio - Fix race on data_avail and actual data")

This is commit

  ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")

in the crypto tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the vhost tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in the net tree as a different commit
(but the same patch):

  d2c4f1928a3f ("virtio_net: fix missing dma unmap for resize")

This is commit

  2311e06b9bf3 ("virtio_net: fix missing dma unmap for resize")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the vhost tree

[Stephen Rothwell]

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

Hi all,

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

  2374ca8f6556 ("virtio_crypto: remove duplicate check if queue is broken")

This is commit

  633eeefab69e ("crypto: virtio - remove duplicate check if queue is broken")

in the crypto tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the vhost tree

[Stephen Rothwell]

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

Hi all,

The following commit is also in the net-next tree as different commit (but the same patch):

  a2205e1e9603 ("virtio_net: remove the misleading comment")

This is commit

  9719f039d328 ("virtio_net: remove the misleading comment")

in the net-next tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the vhost tree

[Stephen Rothwell]

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

Hi all,

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

  69eced9eb49a ("virtio: add missing MODULE_DESCRIPTION() macro")

This is commit

  89067019d7db ("virtio: add missing MODULE_DESCRIPTION() macro")

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 vhost tree

[Greg KH]

On Thu, Jul 18, 2024 at 03:01:41PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the char-misc tree as a different commit
> (but the same patch):
> 
>   69eced9eb49a ("virtio: add missing MODULE_DESCRIPTION() macro")
> 
> This is commit
> 
>   89067019d7db ("virtio: add missing MODULE_DESCRIPTION() macro")
> 
> in the char-misc tree.

Thanks, should be fine.

greg k-h

linux-next: duplicate patch in the vhost tree

[Stephen Rothwell]

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

Hi all,

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

  040b4f437e17 ("vduse: avoid using __GFP_NOFAIL")

This is commit

  955abe0a1b41 ("vduse: avoid using __GFP_NOFAIL")

in the mm-stable tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Michael S. Tsirkin]

On Wed, Sep 11, 2024 at 05:47:08PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the mm-stable tree as a different commit
> (but the same patch):
> 
>   040b4f437e17 ("vduse: avoid using __GFP_NOFAIL")
> 
> This is commit
> 
>   955abe0a1b41 ("vduse: avoid using __GFP_NOFAIL")
> 
> in the mm-stable tree.
> 
> -- 
> Cheers,
> Stephen Rothwell

Dropped it now, thanks!

linux-next: duplicate patch in the vhost tree

[Stephen Rothwell]

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

Hi all,

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

  9d0596c68f32 ("virtio_net: fix integer overflow in stats")

This is commit

  d95d9a31aceb ("virtio_net: fix integer overflow in stats")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the vhost tree

[Stephen Rothwell]

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

Hi all,

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

  c67e16d30dca ("tools headers: Sync uapi/linux/vhost.h with the kernel source"
)

This is commit

  f79a62f4b3c7 ("tools headers: Sync uapi/linux/vhost.h with the kernel source")

in the perf-current tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Michael S. Tsirkin]

On Wed, Aug 27, 2025 at 12:46:54PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the perf-current tree as a different
> commit (but the same patch):
> 
>   c67e16d30dca ("tools headers: Sync uapi/linux/vhost.h with the kernel source"
> )
> 
> This is commit
> 
>   f79a62f4b3c7 ("tools headers: Sync uapi/linux/vhost.h with the kernel source")
> 
> in the perf-current tree.


Hmm.  I could drop mine I guess, but it only really makes sense after:

    vhost: Fix ioctl # for VHOST_[GS]ET_FORK_FROM_OWNER
    

which is not in the perf tree.


> -- 
> Cheers,
> Stephen Rothwell

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

[Namhyung Kim]

Hello,

On Wed, Aug 27, 2025 at 06:23:52AM -0400, Michael S. Tsirkin wrote:
> On Wed, Aug 27, 2025 at 12:46:54PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > The following commit is also in the perf-current tree as a different
> > commit (but the same patch):
> > 
> >   c67e16d30dca ("tools headers: Sync uapi/linux/vhost.h with the kernel source"
> > )
> > 
> > This is commit
> > 
> >   f79a62f4b3c7 ("tools headers: Sync uapi/linux/vhost.h with the kernel source")
> > 
> > in the perf-current tree.
> 
> 
> Hmm.  I could drop mine I guess, but it only really makes sense after:
> 
>     vhost: Fix ioctl # for VHOST_[GS]ET_FORK_FROM_OWNER
>     
> 
> which is not in the perf tree.

Yep, so I was waiting for you to send PR with the fix.
It seems you already removed the commit in your tree.
I'll send a PR for perf tools with this change.

Thanks,
Namhyung

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

[Michael S. Tsirkin]

On Wed, Aug 27, 2025 at 10:26:16AM -0700, Namhyung Kim wrote:
> Hello,
> 
> On Wed, Aug 27, 2025 at 06:23:52AM -0400, Michael S. Tsirkin wrote:
> > On Wed, Aug 27, 2025 at 12:46:54PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > The following commit is also in the perf-current tree as a different
> > > commit (but the same patch):
> > > 
> > >   c67e16d30dca ("tools headers: Sync uapi/linux/vhost.h with the kernel source"
> > > )
> > > 
> > > This is commit
> > > 
> > >   f79a62f4b3c7 ("tools headers: Sync uapi/linux/vhost.h with the kernel source")
> > > 
> > > in the perf-current tree.
> > 
> > 
> > Hmm.  I could drop mine I guess, but it only really makes sense after:
> > 
> >     vhost: Fix ioctl # for VHOST_[GS]ET_FORK_FROM_OWNER
> >     
> > 
> > which is not in the perf tree.
> 
> Yep, so I was waiting for you to send PR with the fix.
> It seems you already removed the commit in your tree.
> I'll send a PR for perf tools with this change.
> 
> Thanks,
> Namhyung

It's in my tree but I did not want to send it before we agreed what to
do. I can drop it, sure.

-- 
MST

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

[Namhyung Kim]

On Wed, Aug 27, 2025 at 06:04:20PM -0400, Michael S. Tsirkin wrote:
> On Wed, Aug 27, 2025 at 10:26:16AM -0700, Namhyung Kim wrote:
> > Hello,
> > 
> > On Wed, Aug 27, 2025 at 06:23:52AM -0400, Michael S. Tsirkin wrote:
> > > On Wed, Aug 27, 2025 at 12:46:54PM +1000, Stephen Rothwell wrote:
> > > > Hi all,
> > > > 
> > > > The following commit is also in the perf-current tree as a different
> > > > commit (but the same patch):
> > > > 
> > > >   c67e16d30dca ("tools headers: Sync uapi/linux/vhost.h with the kernel source"
> > > > )
> > > > 
> > > > This is commit
> > > > 
> > > >   f79a62f4b3c7 ("tools headers: Sync uapi/linux/vhost.h with the kernel source")
> > > > 
> > > > in the perf-current tree.
> > > 
> > > 
> > > Hmm.  I could drop mine I guess, but it only really makes sense after:
> > > 
> > >     vhost: Fix ioctl # for VHOST_[GS]ET_FORK_FROM_OWNER
> > >     
> > > 
> > > which is not in the perf tree.
> > 
> > Yep, so I was waiting for you to send PR with the fix.
> > It seems you already removed the commit in your tree.
> > I'll send a PR for perf tools with this change.
> > 
> > Thanks,
> > Namhyung
> 
> It's in my tree but I did not want to send it before we agreed what to
> do. I can drop it, sure.

Just sent out the PR, thanks for your co-operation!

Namhyung