lkml.org 
[lkml]   [2014]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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]
\
 
 \ /
  Last update: 2014-02-03 02:01    [W:0.045 / U:0.336 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site