linux-kernel - linux-next: manual merge of the vfs tree with the nfs-anna 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200206092512.5eb304b7@canb.auug.org.au>
Date:   Thu, 6 Feb 2020 09:25:12 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Al Viro <viro@...IV.linux.org.uk>,
        Anna Schumaker <Anna.Schumaker@...app.com>,
        Trond Myklebust <trondmy@...il.com>,
        NFS Mailing List <linux-nfs@...r.kernel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Dai Ngo <dai.ngo@...cle.com>
Subject: linux-next: manual merge of the vfs tree with the nfs-anna tree

Hi all,

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

  fs/nfs/dir.c

between commit:

  227823d2074d ("nfs: optimise readdir cache page invalidation")

from the nfs-anna tree and commit:

  ef3af2d44331 ("nfs: optimise readdir cache page invalidation")

from the vfs tree.

I fixed it up (I used the nfs-anna tree version) 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

Content of type "application/pgp-signature" skipped