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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20161219102555.15519eee@canb.auug.org.au>
Date:   Mon, 19 Dec 2016 10:25:55 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Miklos Szeredi <miklos@...redi.hu>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the overlayfs tree with Linus' tree

Hi Miklos,

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

  fs/overlayfs/dir.c
  fs/overlayfs/inode.c

I am pretty sure thses conflicts only exist because the overlayfs tree
was rebased before being merged by Linus.  I am dropping the oevrlay fs
tree for today.  Please clean it up.

-- 
Cheers,
Stephen Rothwell