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)
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


Trivial merge