From: Jens Axboe Date: Wed, 1 May 2013 07:23:05 +0000 (+0200) Subject: Merge branch 'bcache-for-upstream' of http://evilpiepirate.org/git/linux-bcache into... X-Git-Tag: firefly_0821_release~3680^2~530^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f50efd2fdbd9b35b11f5778ed85beb764184bda9;p=firefly-linux-kernel-4.4.55.git Merge branch 'bcache-for-upstream' of evilpiepirate.org/git/linux-bcache into for-3.10/drivers Kent writes: Hey Jens, this is everything I've got ready for 3.10 - there's _still_ one more bug I'm trying to track down. Andrew - I've got patches that rip out the pkey() and pbtree() macros, but they're somewhat tied up with some other nontrivial refactorings so I think I'm going to wait a bit on those. --- f50efd2fdbd9b35b11f5778ed85beb764184bda9