linux-kernel - linux-next: manual merge of the vhost tree with the vfs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Fri, 16 Dec 2016 13:09:08 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Michael S. Tsirkin" <mst@...hat.com>,
        Al Viro <viro@...IV.linux.org.uk>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Christoph Hellwig <hch@....de>
Subject: linux-next: manual merge of the vhost tree with the vfs tree

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