From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Oct 2018 16:22:16 +0000 (+0100)
Subject: Merge tag 'jfs-for-4.20' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: v4.20-rc1~143
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=deba28b12bcb5e11c6f6689f4edd96eea4929162;p=linux.git

Merge tag 'jfs-for-4.20' of git://github.com/kleikamp/linux-shaggy

Pull jfs updates from David Kleikamp:
 "Just a few small fixes"

* tag 'jfs-for-4.20' of git://github.com/kleikamp/linux-shaggy:
  jfs: remove redundant dquot_initialize() in jfs_evict_inode()
  jfs: remove quota option from ignore list
  jfs: cache NULL when both default_acl and acl are NULL
---

deba28b12bcb5e11c6f6689f4edd96eea4929162