linux-kernel - 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>] [day] [month] [year] [list]

Date:	Mon, 3 Feb 2014 11:13:34 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Chris Mason <clm@...com>, Josef Bacik <jbacik@...com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Linus <torvalds@...ux-foundation.org>
Subject: linux-next: manual merge of the btrfs tree with Linus' tree

Hi all,

Today's linux-next merge of the btrfs tree got conflicts in lost of files
between commits from Linus' tree and commits from the btrfs tree.

Not only did you rebase/rewrite your tree before asking Linus to pull it,
but you added a whole lot of commits beyond what had been in linux-next!
I have dropped your (now redundant) tree from linux-next for today.
Please clean it up and try a bit harder, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped