Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1610279

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

Show all headers | View raw

Hi Michael,

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

  include/uapi/linux/Kbuild

between commit:

  65017bab8a9e ("uapi: export all headers under uapi directories")

from the kbuild tree and commit:

  80363894995b ("virtio_mmio: expose header to userspace")

from the vhost tree.

I fixed it up (the former supercedes the latter, so I used the former)
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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the vhost tree with the kbuild tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-03-28 06:10 +0200
  Re: linux-next: manual merge of the vhost tree with the kbuild tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-03-28 06:10 +0200

csiph-web