linux-kernel - linux-next: manual merge of the vhost tree with the net-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <aNqaXDjhCkEwpKIw@sirena.org.uk>
Date: Mon, 29 Sep 2025 15:40:28 +0100
From: Mark Brown <broonie@...nel.org>
To: "Michael S. Tsirkin" <mst@...hat.com>
Cc: Jakub Kicinski <kuba@...nel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the vhost tree with the net-next tree

Hi all,

Today's linux-next merge of the vhost tree got a conflict in:

  include/linux/ptr_ring.h

between commit:

  4e9510f162188 ("ptr_ring: drop duplicated tail zeroing code")

from the net-next tree and commits:

  4a37c69fc60bf ("ptr_ring: drop duplicated tail zeroing code")

from the vhost tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc include/linux/ptr_ring.h
index a736b16859a6c,ba90c0e6ce703..0000000000000
--- a/include/linux/ptr_ring.h
+++ b/include/linux/ptr_ring.h

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)