linux-kernel - Re: 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 for Android: free password hash cracker in your pocket

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

Message-ID: <CAJfpeguwvwy78-ahrswi5_RRENUzuSbqF2PR2x+nKxX1WC6h9Q@mail.gmail.com>
Date:   Mon, 19 Dec 2016 10:06:36 +0100
From:   Miklos Szeredi <miklos@...redi.hu>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the overlayfs tree with Linus' tree

On Mon, Dec 19, 2016 at 12:25 AM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 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.

Hi Stephen,

Sorry, fixed now.

Thanks,
Miklos