Merge tag 'jfs-4.18' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jun 2018 22:47:32 +0000 (07:47 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jun 2018 22:47:32 +0000 (07:47 +0900)
commitba4dbdedd3edc2798659bcd8b1a184ea8bdd04dc
treed04d912d17bfff0151922840c9dffbcabdcd6f41
parentc0d1a7eb1e601f54d301ff8a11a994e164ee65ae
parent92d34134193e5b129dc24f8d79cb9196626e8d7a
Merge tag 'jfs-4.18' of git://github.com/kleikamp/linux-shaggy

Pull jfs fix from Dave Kleikamp:
 "This fixes a too-small allocation in the xattr code"

* tag 'jfs-4.18' of git://github.com/kleikamp/linux-shaggy:
  jfs: Fix inconsistency between memory allocation and ea_buf->max_size