[GIT,PULL] UBIFS changes for 5.3-rc1
mbox series

Message ID 1267151613.38686.1563130929727.JavaMail.zimbra@nod.at
State New
Headers show
Series
  • [GIT,PULL] UBIFS changes for 5.3-rc1
Related show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git tags/upstream-5.3-rc1

Message

Richard Weinberger July 14, 2019, 7:02 p.m. UTC
Linus,

The following changes since commit 6fbc7275c7a9ba97877050335f290341a1fd8dbf:

  Linux 5.2-rc7 (2019-06-30 11:25:36 +0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git tags/upstream-5.3-rc1

for you to fetch changes up to 8009ce956c3d28022af6b122e50213ad830fc902:

  ubifs: Don't leak orphans on memory during commit (2019-07-08 20:01:34 +0200)

Please note there is a merge conflict between commits
334d581528b9 ("vfs: Convert ubifs to use the new mount API") and
eeabb9866e4c ("ubifs: Add support for zstd compression.")

For zstd we add a new mount parameter.
In case of doubt I'll happily review your merge resolution.

----------------------------------------------------------------
This pull request contains the following changes for UBIFS

- Support for zstd compression
- Support for offline signed filesystems
- Various fixes for regressions

----------------------------------------------------------------
Liu Song (3):
      ubifs: Simplify redundant code
      ubifs: Fix typo of output in get_cs_sqnum
      ubifs: remove unnecessary check in ubifs_log_start_commit

Michele Dionisio (1):
      ubifs: Add support for zstd compression.

Richard Weinberger (3):
      ubifs: Correctly use tnc_next() in search_dh_cookie()
      ubifs: Check link count of inodes when killing orphans.
      ubifs: Don't leak orphans on memory during commit

Sascha Hauer (1):
      ubifs: support offline signed images

 fs/ubifs/Kconfig       | 13 ++++++-
 fs/ubifs/auth.c        | 86 +++++++++++++++++++++++++++++++++++++++++++++
 fs/ubifs/compress.c    | 27 ++++++++++++++-
 fs/ubifs/log.c         |  5 +--
 fs/ubifs/master.c      | 53 ++++++++++++++++++++++++----
 fs/ubifs/orphan.c      | 94 +++++++++++++++++++++++++++++++-------------------
 fs/ubifs/recovery.c    |  2 +-
 fs/ubifs/sb.c          | 52 ++++++++++++++--------------
 fs/ubifs/super.c       | 46 ++++++++++++++++++------
 fs/ubifs/tnc.c         | 16 ++++++---
 fs/ubifs/ubifs-media.h | 30 +++++++++++++++-
 fs/ubifs/ubifs.h       |  6 ++--
 12 files changed, 338 insertions(+), 92 deletions(-)

Comments

pr-tracker-bot@kernel.org July 15, 2019, 12:30 a.m. UTC | #1
The pull request you sent on Sun, 14 Jul 2019 21:02:09 +0200 (CEST):

> git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git tags/upstream-5.3-rc1

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

Thank you!