From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 Mar 2017 17:29:21 +0000 (-0700)
Subject: Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.11-rc4~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c23de630886e423ab298bce32a71486577bda5d;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'ext4_for_linus_stable' of git://git./linux/kernel/git/tytso/ext4

Pull ext4 fixes from Ted Ts'o:
 "Fix a memory leak on an error path, and two races when modifying
  inodes relating to the inline_data and metadata checksum features"

* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fix two spelling nits
  ext4: lock the xattr block before checksuming it
  jbd2: don't leak memory if setting up journal fails
  ext4: mark inode dirty after converting inline directory
---

1c23de630886e423ab298bce32a71486577bda5d