On Mon, Jan 06, 2014 at 02:18:53PM -0800, Kent Overstreet wrote: > Upstream SHA1 d24a6e1087030b6da286df9433add5fa2f21b83b > > This patch is bigger than the original, because some of the fixes in 3.12 ended > up in the wrong patches. What do you mean by this? > Dirty data accounting wasn't quite right - firstly, we were adding the key we're > inserting after it could have merged with another dirty key already in the > btree, and secondly we could sometimes pass the wrong offset to > bcache_dev_sectors_dirty_add() for dirty data we were overwriting - which is > important when tracking dirty data by stripe. > > Signed-off-by: Kent Overstreet <kmo@xxxxxxxxxxxxx> > Cc: linux-stable <stable@xxxxxxxxxxxxxxx> # >= v3.10 > > Conflicts: > drivers/md/bcache/btree.c What is this for? > > Signed-off-by: Kent Overstreet <kmo@xxxxxxxxxxxxx> > --- > drivers/md/bcache/btree.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) This fails to apply to the latest 3.10-stable queue: checking file drivers/md/bcache/btree.c Hunk #1 succeeded at 1719 (offset 25 lines). Hunk #2 succeeded at 1780 (offset 25 lines). Hunk #3 succeeded at 1844 (offset 25 lines). Hunk #4 FAILED at 1851. 1 out of 4 hunks FAILED What did you make this patch against? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html