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

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

[Stephen Rothwell]

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

Hi Michael,

Today's linux-next merge of the vhost tree got a conflict in
drivers/net/virtio_net.c between commit 3bbf372c6c60 ("virtio-net: remove
useless disable on freeze") from the net tree and commit 53ffd226507a
("virtio-net: remove useless disable on freeze") from the vhost tree.

I just used the version from the net tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Mark Brown]

Hi all,

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

  drivers/net/virtio_net.c

between commit:

  f8bb510439456 ("virtio_net: suppress cpu stall when free_unused_bufs")

from the net and Linus' tree and commit:

  bc31caabba78f ("virtio_net: suppress cpu stall when free_unused_bufs")

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 drivers/net/virtio_net.c
index a12ae26db0e22,cdb1654e5a435..0000000000000
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c

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

[Stephen Rothwell]

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

Hi Michael,

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

  drivers/net/virtio_net.c

between commit:

  df133f3f9625 ("virtio_net: bulk free tx skbs")

from the net tree and commits:

  a73c976c635f ("virtio_net: bulk free tx skbs")
  017ed06fa099 ("virtio-net: bql support")

from the vhost tree.

The 2 versions of "virtio_net: bulk free tx skbs" are not identical
and then "virtio-net: bql support" further changed the same function
prototype ...

I fixed it up (I basically used the vhost tree verison) 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.

-- 
Cheers,
Stephen Rothwell

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