linux-next: manual merge of the vhost tree with the net-next tree
Mark Brown
maintainerHi 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.