diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-23 22:48:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-23 22:48:48 -0700 |
| commit | 63c04ee7d3b7c8d8e2726cb7c5f8a5f6fcc1e3b2 (patch) | |
| tree | 8ead21ef2c7e84bcd30511d50925416018abd93e /kernel/taskstats.c | |
| parent | 0bf0ea431f84bcf34facc5b1f792d000f5957565 (diff) | |
| parent | 4ac1c17b2044a1b4b2fbed74451947e905fc2992 (diff) | |
Merge tag 'upstream-4.7-rc5' of git://git.infradead.org/linux-ubifs
Pull UBI/UBIFS fixes from Richard Weinberger:
"This contains fixes for two critical bugs in UBI and UBIFS:
- fix the possibility of losing data upon a power cut when UBI tries
to recover from a write error
- fix page migration on UBIFS. It turned out that the default page
migration function is not suitable for UBIFS"
* tag 'upstream-4.7-rc5' of git://git.infradead.org/linux-ubifs:
UBIFS: Implement ->migratepage()
mm: Export migrate_page_move_mapping and migrate_page_copy
ubi: Make recover_peb power cut aware
gpio: make library immune to error pointers
gpio: make sure gpiod_to_irq() returns negative on NULL desc
gpio: 104-idi-48: Fix missing spin_lock_init for ack_lock
Diffstat (limited to 'kernel/taskstats.c')
0 files changed, 0 insertions, 0 deletions