linux-next: duplicate patches in the vhost tree

linux-next: duplicate patches in the vhost tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  022659ee3363 ("virtio_net: notify MAC address change on device initialization")
  d0aa1f8e8d63 ("virtio_net: disable VIRTIO_NET_F_STANDBY if VIRTIO_NET_F_MAC is not set")

These are commits

  9f62d221a4b0 ("virtio_net: notify MAC address change on device initialization")
  7c06458c102e ("virtio_net: disable VIRTIO_NET_F_STANDBY if VIRTIO_NET_F_MAC is not set")

in the net-next tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

On Fri, 3 Feb 2023 13:26:29 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> The following commits are also in Linus Torvalds' tree as different
                                    ^^^^^^^^^^^^^^^
Actually not in Linus' tree, just the net-next tree (semi-automation
sometimes fails :-)).

> commits (but the same patches):
> 
>   022659ee3363 ("virtio_net: notify MAC address change on device initialization")
>   d0aa1f8e8d63 ("virtio_net: disable VIRTIO_NET_F_STANDBY if VIRTIO_NET_F_MAC is not set")
> 
> These are commits
> 
>   9f62d221a4b0 ("virtio_net: notify MAC address change on device initialization")
>   7c06458c102e ("virtio_net: disable VIRTIO_NET_F_STANDBY if VIRTIO_NET_F_MAC is not set")
> 
> in the net-next tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Michael S. Tsirkin]

On Fri, Feb 03, 2023 at 01:33:03PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Fri, 3 Feb 2023 13:26:29 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > The following commits are also in Linus Torvalds' tree as different
>                                     ^^^^^^^^^^^^^^^
> Actually not in Linus' tree, just the net-next tree (semi-automation
> sometimes fails :-)).

Dropped from my tree thanks for the heads up!


> > commits (but the same patches):
> > 
> >   022659ee3363 ("virtio_net: notify MAC address change on device initialization")
> >   d0aa1f8e8d63 ("virtio_net: disable VIRTIO_NET_F_STANDBY if VIRTIO_NET_F_MAC is not set")
> > 
> > These are commits
> > 
> >   9f62d221a4b0 ("virtio_net: notify MAC address change on device initialization")
> >   7c06458c102e ("virtio_net: disable VIRTIO_NET_F_STANDBY if VIRTIO_NET_F_MAC is not set")
> > 
> > in the net-next tree.
> 
> -- 
> Cheers,
> Stephen Rothwell

linux-next: duplicate patches in the vhost tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in the char-misc tree as different
commits (but the same patches):

  6ee63c01e1a2 ("misc/pvpanic: add shutdown event definition")
  718330fcd40b ("misc/pvpanic: use bit macros")

These are commits

  ad76f3e8f57c ("misc/pvpanic: add shutdown event definition")
  043327875298 ("misc/pvpanic: use bit macros")

in the char-misc tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the vhost tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in the mm tree as different commits
(but the same patches):

  e981e8d8b23e ("s390/kdump: virtio-mem kdump support (CONFIG_PROC_VMCORE_DEVICE_RAM)")
  a4bba3b65c20 ("virtio-mem: support CONFIG_PROC_VMCORE_DEVICE_RAM")
  b9ad8a711a3c ("virtio-mem: remember usable region size")
  a8328b40b3b0 ("virtio-mem: mark device ready before registering callbacks in kdump mode")
  ef78030ec96f ("fs/proc/vmcore: introduce PROC_VMCORE_DEVICE_RAM to detect device RAM ranges in 2nd kernel")
  a127bc45d3de ("fs/proc/vmcore: factor out freeing a list of vmcore ranges")
  98c5f8c3827a ("fs/proc/vmcore: factor out allocating a vmcore range and adding it to a list")
  5488433f810c ("fs/proc/vmcore: move vmcore definitions out of kcore.h")
  23365031b34f ("fs/proc/vmcore: prefix all pr_* with "vmcore:"")
  006f0492f363 ("fs/proc/vmcore: disallow vmcore modifications while the vmcore is open")
  26b866c242e5 ("fs/proc/vmcore: replace vmcoredd_mutex by vmcore_mutex")
  5c04c6205add ("fs/proc/vmcore: convert vmcore_cb_lock into vmcore_mutex")

These are commits

  9e85e500e8b3 ("s390/kdump: virtio-mem kdump support (CONFIG_PROC_VMCORE_DEVICE_RAM)")
  5605b723bbc2 ("virtio-mem: support CONFIG_PROC_VMCORE_DEVICE_RAM")
  3a365d7b1a60 ("virtio-mem: remember usable region size")
  e4c56e7d625f ("virtio-mem: mark device ready before registering callbacks in kdump mode")
  342dc629fe62 ("fs/proc/vmcore: introduce PROC_VMCORE_DEVICE_RAM to detect device RAM ranges in 2nd kernel")
  44df29fb6c95 ("fs/proc/vmcore: factor out freeing a list of vmcore ranges")
  10a41d9df694 ("fs/proc/vmcore: factor out allocating a vmcore range and adding it to a list")
  e8685745122c ("fs/proc/vmcore: move vmcore definitions out of kcore.h")
  cfc7a194e459 ("fs/proc/vmcore: prefix all pr_* with "vmcore:"")
  19b42b73afa4 ("fs/proc/vmcore: disallow vmcore modifications while the vmcore is open")
  527d8662c520 ("fs/proc/vmcore: replace vmcoredd_mutex by vmcore_mutex")
  9a775759ac92 ("fs/proc/vmcore: convert vmcore_cb_lock into vmcore_mutex")

in the mm-unstable branch of the mm tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Andrew Morton]

On Thu, 9 Jan 2025 14:40:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> The following commits are also in the mm tree as different commits
> (but the same patches):
> 
>   e981e8d8b23e ("s390/kdump: virtio-mem kdump support (CONFIG_PROC_VMCORE_DEVICE_RAM)")
>   a4bba3b65c20 ("virtio-mem: support CONFIG_PROC_VMCORE_DEVICE_RAM")
>   b9ad8a711a3c ("virtio-mem: remember usable region size")
>   a8328b40b3b0 ("virtio-mem: mark device ready before registering callbacks in kdump mode")
>   ef78030ec96f ("fs/proc/vmcore: introduce PROC_VMCORE_DEVICE_RAM to detect device RAM ranges in 2nd kernel")
>   a127bc45d3de ("fs/proc/vmcore: factor out freeing a list of vmcore ranges")
>   98c5f8c3827a ("fs/proc/vmcore: factor out allocating a vmcore range and adding it to a list")
>   5488433f810c ("fs/proc/vmcore: move vmcore definitions out of kcore.h")
>   23365031b34f ("fs/proc/vmcore: prefix all pr_* with "vmcore:"")
>   006f0492f363 ("fs/proc/vmcore: disallow vmcore modifications while the vmcore is open")
>   26b866c242e5 ("fs/proc/vmcore: replace vmcoredd_mutex by vmcore_mutex")
>   5c04c6205add ("fs/proc/vmcore: convert vmcore_cb_lock into vmcore_mutex")
> 
> These are commits
> 
>   9e85e500e8b3 ("s390/kdump: virtio-mem kdump support (CONFIG_PROC_VMCORE_DEVICE_RAM)")
>   5605b723bbc2 ("virtio-mem: support CONFIG_PROC_VMCORE_DEVICE_RAM")
>   3a365d7b1a60 ("virtio-mem: remember usable region size")
>   e4c56e7d625f ("virtio-mem: mark device ready before registering callbacks in kdump mode")
>   342dc629fe62 ("fs/proc/vmcore: introduce PROC_VMCORE_DEVICE_RAM to detect device RAM ranges in 2nd kernel")
>   44df29fb6c95 ("fs/proc/vmcore: factor out freeing a list of vmcore ranges")
>   10a41d9df694 ("fs/proc/vmcore: factor out allocating a vmcore range and adding it to a list")
>   e8685745122c ("fs/proc/vmcore: move vmcore definitions out of kcore.h")
>   cfc7a194e459 ("fs/proc/vmcore: prefix all pr_* with "vmcore:"")
>   19b42b73afa4 ("fs/proc/vmcore: disallow vmcore modifications while the vmcore is open")
>   527d8662c520 ("fs/proc/vmcore: replace vmcoredd_mutex by vmcore_mutex")
>   9a775759ac92 ("fs/proc/vmcore: convert vmcore_cb_lock into vmcore_mutex")
> 
> in the mm-unstable branch of the mm tree.

Thanks, I dropped the mm.git copy.

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

[Michael S. Tsirkin]

On Wed, Jan 08, 2025 at 09:23:55PM -0800, Andrew Morton wrote:
> On Thu, 9 Jan 2025 14:40:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi all,
> > 
> > The following commits are also in the mm tree as different commits
> > (but the same patches):
> > 
> >   e981e8d8b23e ("s390/kdump: virtio-mem kdump support (CONFIG_PROC_VMCORE_DEVICE_RAM)")
> >   a4bba3b65c20 ("virtio-mem: support CONFIG_PROC_VMCORE_DEVICE_RAM")
> >   b9ad8a711a3c ("virtio-mem: remember usable region size")
> >   a8328b40b3b0 ("virtio-mem: mark device ready before registering callbacks in kdump mode")
> >   ef78030ec96f ("fs/proc/vmcore: introduce PROC_VMCORE_DEVICE_RAM to detect device RAM ranges in 2nd kernel")
> >   a127bc45d3de ("fs/proc/vmcore: factor out freeing a list of vmcore ranges")
> >   98c5f8c3827a ("fs/proc/vmcore: factor out allocating a vmcore range and adding it to a list")
> >   5488433f810c ("fs/proc/vmcore: move vmcore definitions out of kcore.h")
> >   23365031b34f ("fs/proc/vmcore: prefix all pr_* with "vmcore:"")
> >   006f0492f363 ("fs/proc/vmcore: disallow vmcore modifications while the vmcore is open")
> >   26b866c242e5 ("fs/proc/vmcore: replace vmcoredd_mutex by vmcore_mutex")
> >   5c04c6205add ("fs/proc/vmcore: convert vmcore_cb_lock into vmcore_mutex")
> > 
> > These are commits
> > 
> >   9e85e500e8b3 ("s390/kdump: virtio-mem kdump support (CONFIG_PROC_VMCORE_DEVICE_RAM)")
> >   5605b723bbc2 ("virtio-mem: support CONFIG_PROC_VMCORE_DEVICE_RAM")
> >   3a365d7b1a60 ("virtio-mem: remember usable region size")
> >   e4c56e7d625f ("virtio-mem: mark device ready before registering callbacks in kdump mode")
> >   342dc629fe62 ("fs/proc/vmcore: introduce PROC_VMCORE_DEVICE_RAM to detect device RAM ranges in 2nd kernel")
> >   44df29fb6c95 ("fs/proc/vmcore: factor out freeing a list of vmcore ranges")
> >   10a41d9df694 ("fs/proc/vmcore: factor out allocating a vmcore range and adding it to a list")
> >   e8685745122c ("fs/proc/vmcore: move vmcore definitions out of kcore.h")
> >   cfc7a194e459 ("fs/proc/vmcore: prefix all pr_* with "vmcore:"")
> >   19b42b73afa4 ("fs/proc/vmcore: disallow vmcore modifications while the vmcore is open")
> >   527d8662c520 ("fs/proc/vmcore: replace vmcoredd_mutex by vmcore_mutex")
> >   9a775759ac92 ("fs/proc/vmcore: convert vmcore_cb_lock into vmcore_mutex")
> > 
> > in the mm-unstable branch of the mm tree.
> 
> Thanks, I dropped the mm.git copy.

I looked at a wrong tree and thought these were forgotten,
so I put them in mine.
Andrew, good thing I saw your mail before dropping mine ;)
Can I get your ack on the mm things pls?

-- 
MST

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

[Andrew Morton]

On Thu, 9 Jan 2025 02:45:41 -0500 "Michael S. Tsirkin" <mst@redhat.com> wrote:

> > >   9e85e500e8b3 ("s390/kdump: virtio-mem kdump support (CONFIG_PROC_VMCORE_DEVICE_RAM)")
> > >   5605b723bbc2 ("virtio-mem: support CONFIG_PROC_VMCORE_DEVICE_RAM")
> > >   3a365d7b1a60 ("virtio-mem: remember usable region size")
> > >   e4c56e7d625f ("virtio-mem: mark device ready before registering callbacks in kdump mode")
> > >   342dc629fe62 ("fs/proc/vmcore: introduce PROC_VMCORE_DEVICE_RAM to detect device RAM ranges in 2nd kernel")
> > >   44df29fb6c95 ("fs/proc/vmcore: factor out freeing a list of vmcore ranges")
> > >   10a41d9df694 ("fs/proc/vmcore: factor out allocating a vmcore range and adding it to a list")
> > >   e8685745122c ("fs/proc/vmcore: move vmcore definitions out of kcore.h")
> > >   cfc7a194e459 ("fs/proc/vmcore: prefix all pr_* with "vmcore:"")
> > >   19b42b73afa4 ("fs/proc/vmcore: disallow vmcore modifications while the vmcore is open")
> > >   527d8662c520 ("fs/proc/vmcore: replace vmcoredd_mutex by vmcore_mutex")
> > >   9a775759ac92 ("fs/proc/vmcore: convert vmcore_cb_lock into vmcore_mutex")
> > > 
> > > in the mm-unstable branch of the mm tree.
> > 
> > Thanks, I dropped the mm.git copy.
> 
> I looked at a wrong tree and thought these were forgotten,
> so I put them in mine.
> Andrew, good thing I saw your mail before dropping mine ;)
> Can I get your ack on the mm things pls?

Please note that there are acks on the original thread from Heiko and,
umm, yourself.

There aren't actually any mm/ changes in this series.  But I normally
handle procfs, so

Acked-by: Andrew Morton <akpm@linux-foundation.org>

linux-next: duplicate patches in the vhost tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  360dd4a012cd ("virtio: reject shm region if length is zero")
  80f98fca05a0 ("virtio_rtc: Add RTC class driver")
  33c11e0cfd5e ("virtio_rtc: Add Arm Generic Timer cross-timestamping")
  0e631f6a7995 ("virtio_rtc: Add PTP clocks")
  4934cfb4dc7f ("virtio_rtc: Add module and driver core")
  27db566b6c5f ("vringh: use bvec_kmap_local")
  c472a51c48ee ("vhost: vringh: Use matching allocation type in resize_iovec()")
  c118346b92c5 ("virtio-pci: Fix result size returned for the admin command completion")
  306acea221ea ("vdpa/octeon_ep: Control PCI dev enabling manually")

These are commits

  206cc44588f7 ("virtio: reject shm region if length is zero")
  9d4f22fd563e ("virtio_rtc: Add RTC class driver")
  e2ef16757bbe ("virtio_rtc: Add Arm Generic Timer cross-timestamping")
  9a17125a18f9 ("virtio_rtc: Add PTP clocks")
  0623c7592768 ("virtio_rtc: Add module and driver core")
  169294a14b3f ("vringh: use bvec_kmap_local")
  8b3f9967b1fd ("vhost: vringh: Use matching allocation type in resize_iovec()")
  9ef41ebf787f ("virtio-pci: Fix result size returned for the admin command completion")
  eec812774d30 ("vdpa/octeon_ep: Control PCI dev enabling manually")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the vhost tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  fcb623b81dbe ("ptr_ring: __ptr_ring_zero_tail micro optimization")
  118d19967530 ("ptr_ring: drop duplicated tail zeroing code")

These are commits

  c39d6d4d9333 ("ptr_ring: __ptr_ring_zero_tail micro optimization")
  4e9510f16218 ("ptr_ring: drop duplicated tail zeroing code")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the vhost tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  97e0363667c5 ("ptr_ring: __ptr_ring_zero_tail micro optimization")
  d934cf66809c ("ptr_ring: drop duplicated tail zeroing code")

These are commits

  c39d6d4d9333 ("ptr_ring: __ptr_ring_zero_tail micro optimization")
  4e9510f16218 ("ptr_ring: drop duplicated tail zeroing code")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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