From: Linus Torvalds Date: Mon, 29 Jan 2018 21:31:47 +0000 (-0800) Subject: Merge tag 'upstream-4.16-rc1' of git://git.infradead.org/linux-ubifs X-Git-Tag: v4.19~1762 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d1de762e36375e1e1cd41f7f93c298ac62d831a7;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'upstream-4.16-rc1' of git://git.infradead.org/linux-ubifs Pull UBI/UBIFS updates from Richard Weinberger: - use the new fscrypt APIs - a fix for a Fastmap issue - other minor bug fixes * tag 'upstream-4.16-rc1' of git://git.infradead.org/linux-ubifs: ubi: block: Fix locking for idr_alloc/idr_remove mtd: ubi: wl: Fix error return code in ubi_wl_init() ubi: Fix copy/paste error in function documentation ubi: Fastmap: Fix typo ubifs: remove error message in ubifs_xattr_get ubi: fastmap: Erase outdated anchor PEBs during attach ubifs: switch to fscrypt_prepare_setattr() ubifs: switch to fscrypt_prepare_lookup() ubifs: switch to fscrypt_prepare_rename() ubifs: switch to fscrypt_prepare_link() ubifs: switch to fscrypt_file_open() ubi: fastmap: Clean up the initialization of pointer p ubi: fastmap: Use kmem_cache_free to deallocate memory ubi: Fix race condition between ubi volume creation and udev mtd: ubi: Use 'max_bad_blocks' to compute bad_peb_limit if available ubifs: Fix uninitialized variable in search_dh_cookie() --- d1de762e36375e1e1cd41f7f93c298ac62d831a7