linux-kernel - linux-next: manual merge of the overlayfs 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]

Message-ID: <20180604103042.43fe18fe@canb.auug.org.au>
Date:   Mon, 4 Jun 2018 10:31:04 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Miklos Szeredi <miklos@...redi.hu>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Al Viro <viro@...iv.linux.org.uk>
Subject: linux-next: manual merge of the overlayfs tree with Linus' tree

Hi Miklos,

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

  fs/open.c

between commit:

  af04fadcaa93 ("Revert "fs: fold open_check_o_direct into do_dentry_open"")

from Linus' tree and commit:

  e0e3f7de6435 ("vfs: simplify dentry_open()")

from the overlayfs tree.

I have no idea how to fix this up ... so I just used the overlayfs
version for now.  I assume that this will need more work before being
merged into Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped