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

Message-ID: <20231011112408.3198553d@canb.auug.org.au>
Date:   Wed, 11 Oct 2023 11:24:08 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Christian Brauner <brauner@...nel.org>
Cc:     David Sterba <dsterba@...e.cz>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the btrfs
 tree

Hi all,

On Wed, 11 Oct 2023 08:37:54 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> On Mon, 9 Oct 2023 18:15:53 +0200 Christian Brauner <brauner@...nel.org> wrote:
> >  
> > > I have dropped the vfs-brauner tree for today as there is no way I can
> > > sort them out in a reasonable time.  Please sort this out between
> > > yourselves.    
> > 
> > I'll fix that up!  
> 
> The btrfs tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next)
> has moved again.  I don't know (yet) if this will cause conflicts
> again, but there is a good chance that it will.

Yeah, I got those conflicts again, so dropped your tree again.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped