Messages in this thread | | | Date | Mon, 3 Feb 2014 11:13:34 +1100 | From | Stephen Rothwell <> | 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@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |