* linux-next: manual merge of the vhost tree with the vfs tree
@ 2016-12-16 2:09 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2016-12-16 2:09 UTC (permalink / raw)
To: Michael S. Tsirkin, Al Viro; +Cc: linux-next, linux-kernel, Christoph Hellwig
Hi Michael,
Today's linux-next merge of the vhost tree got a conflict in:
fs/logfs/logfs.h
between commit:
6b4fbde3b979 ("logfs: remove from tree")
from the vfs tree and commit:
378d5a40fa2c ("fs/logfs: drop __CHECK_ENDIAN__")
from the vhost tree.
I fixed it up (I just deleted the file) 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-12-16 2:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-16 2:09 linux-next: manual merge of the vhost tree with the vfs tree Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.