diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-18 06:23:34 -1000 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-18 06:23:34 -1000 |
commit | 033ead8230c2cf9cdc2d6e1148bfdf5674012a9c (patch) | |
tree | e730e257dda570c0994618511f6bc0d326fea173 /drivers/thermal/imx_thermal.c | |
parent | 847f56eb0e08fde16e721b76dcb2c70da0c730bf (diff) | |
parent | 44305ebde243a7cce2c592cc89afe5041d8bf884 (diff) |
Merge tag 'upstream-3.16-rc6' of git://git.infradead.org/linux-ubifs
Pull UBI fixes from Artem Bityutskiy:
"Two UBI fastmap-related fixes for v3.16:
- fix UBI fastmap support which we broke in 3.16-rc1 by reversing the
volumes RB-tree sorting criteria.
- make sure that we scrub all PEBs where we see bit-flips - we were
missing some of them when the fastmap feature was enabled"
* tag 'upstream-3.16-rc6' of git://git.infradead.org/linux-ubifs:
UBI: fastmap: do not miss bit-flips
UBI: fix the volumes tree sorting criteria
Diffstat (limited to 'drivers/thermal/imx_thermal.c')
0 files changed, 0 insertions, 0 deletions