[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-next
Subject:    linux-next: manual merge of the vhost tree with the vfs tree
From:       Stephen Rothwell <sfr () canb ! auug ! org ! au>
Date:       2016-12-16 2:09:08
Message-ID: 20161216130908.0b9a9b8a () canb ! auug ! org ! au
[Download RAW message or body]

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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]