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

Message-ID: <20201015144213.GP6756@twin.jikos.cz>
Date:   Thu, 15 Oct 2020 16:42:13 +0200
From:   David Sterba <dsterba@...e.cz>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     David Sterba <dsterba@...e.cz>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linus Torvalds <torvalds@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the btrfs tree with Linus' tree

On Thu, Oct 15, 2020 at 11:35:30AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Please do *not* rebase/rewrite your linux-next included tree and then
> immediately send it to Linus.  Or if you do, the please also update
> what you have in linux-next (so you can sneak it past me :-().
> (mutter, mutter, unnecessary conflicts :-().
> 
> I have dropped the brtfs tree from linux-next today.

I've pushed updated for-next and next-fixes to k.org, sorry for
inconvenience.