linux-kernel - linux-next: manual merge of the vfs tree with Linus' 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:   Thu, 30 Mar 2017 11:07:40 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Al Viro <viro@...IV.linux.org.uk>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Josef Bacik <jbacik@...com>, Jens Axboe <axboe@...com>
Subject: linux-next: manual merge of the vfs tree with Linus' tree

Hi Al,

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

  drivers/block/nbd.c

between commit:

  9dd5d3ab49f7 ("nbd: handle ERESTARTSYS properly")

from Linus' tree and commit:

  7c09d0a53c27 ("backmerge of nbd.c changes, resolving conflicts")

from the vfs tree.

I fixed it up (I used the former change) 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.

Its probably time that the vfs tree was cleaned up after the last merge
window.
-- 
Cheers,
Stephen Rothwell