diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-20 13:07:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-20 13:07:01 -0700 |
| commit | fea371e259ebcc85d2d51a036743189bee487289 (patch) | |
| tree | e4e31f856520177ecca9aaae7649dc1dfd50007a /net/nfc | |
| parent | d303402c288340f9094fa0ba697600335a41bc3e (diff) | |
| parent | 0e7572cffe442290c347e779bf8bd4306bb0aa7c (diff) | |
Merge tag 'for-linus-5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs
Pull UBI and UBIFS fixes from Richard Weinberger:
- Correctly set next cursor for detailed_erase_block_info debugfs file
- Don't use crypto_shash_descsize() for digest size in UBIFS
- Remove broken lazytime support from UBIFS
* tag 'for-linus-5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
ubi: Fix seq_file usage in detailed_erase_block_info debugfs file
ubifs: fix wrong use of crypto_shash_descsize()
ubifs: remove broken lazytime support
Diffstat (limited to 'net/nfc')
0 files changed, 0 insertions, 0 deletions