Skip to contentSkip to conversation

UBI and UBIFS updates for 6.1-rc1

GIT PULL Merged Richard Weinberger 2 participants 2 messages Oct 14, 2022 – Oct 15, 2022 Memory technology devices (MTD)

lore
Share & tools
lore

Richard Weinberger

author maintainer
#0 lore raw

Linus,

The following changes since commit 521a547ced6477c54b4b0cc206000406c221b4d6:

Linux 6.0-rc6 (2022-09-18 13:44:14 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git tags/for-linus-6.1-rc1

for you to fetch changes up to 669d204469c46e91d99da24914130f78277a71d3:

ubi: fastmap: Add fastmap control support for 'UBI_IOCATT' ioctl (2022-09-21 18:29:18 +0200)

----------------------------------------------------------------
This pull request contains updates for UBI and UBIFS

UBI:
- Use bitmap API to allocate bitmaps
- New attach mode, disable_fm, to attach without fastmap
- Fixes for various typos in comments

UBIFS:
- Fix for a deadlock when setting xattrs for encrypted file
- Fix for an assertion failures when truncating encrypted files
- Fixes for various typos in comments

----------------------------------------------------------------
Christophe JAILLET (1):
ubi: fastmap: Use the bitmap API to allocate bitmaps

Jason Wang (1):
ubi: ubi-media.h: Fix comment typo

Jiang Jian (1):
mtd: ubi: drop unexpected word 'a' in comments

Jilin Yuan (1):
ubi: Fix repeated words in comments

Julia Lawall (1):
ubi: block: Fix typos in comments

Li zeming (1):
ubi: block: Remove in vain semicolon

Yang Li (1):
ubifs: Fix ubifs_check_dir_empty() kernel-doc comment

Zhang Jiaming (1):
ubi: fastmap: Fix typo in comments

ZhaoLong Wang (1):
ubifs: Fix UBIFS ro fail due to truncate in the encrypted directory

Zhihao Cheng (2):
ubifs: Fix AA deadlock when setting xattr for encrypted file
ubi: fastmap: Add fastmap control support for 'UBI_IOCATT' ioctl

 drivers/mtd/ubi/block.c     |  4 ++--
 drivers/mtd/ubi/build.c     | 14 ++++++++++----
 drivers/mtd/ubi/cdev.c      |  4 ++--
 drivers/mtd/ubi/eba.c       |  2 +-
 drivers/mtd/ubi/fastmap.c   | 10 ++++------
 drivers/mtd/ubi/io.c        |  2 +-
 drivers/mtd/ubi/ubi-media.h |  2 +-
 drivers/mtd/ubi/ubi.h       |  9 +++++----
 drivers/mtd/ubi/vmt.c       |  4 ++--
 drivers/mtd/ubi/wl.c        |  8 ++++----
 fs/ubifs/crypto.c           | 11 +++++++++++
 fs/ubifs/dir.c              | 27 +++++++++++++++------------
 fs/ubifs/journal.c          | 28 +++++++++++++++++-----------
 fs/ubifs/ubifs.h            |  2 +-
 fs/ubifs/xattr.c            |  2 +-
 include/uapi/mtd/ubi-user.h |  8 +++++++-
 16 files changed, 84 insertions(+), 53 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Fri, 14 Oct 2022 23:17:13 +0200 (CEST):

The pull request you sent on Fri, 14 Oct 2022 23:17:13 +0200 (CEST):

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git tags/for-linus-6.1-rc1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b7cef0d21c379669c9f620c9692b5c7c885a6311

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html