From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 18 Jun 2018 22:47:32 +0000 (+0900)
Subject: Merge tag 'jfs-4.18' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: v4.18-rc2~32
X-Git-Url: https://git.codelabs.ch/?p=muen%2Flinux.git;a=commitdiff_plain;h=ba4dbdedd3edc2798659bcd8b1a184ea8bdd04dc

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

ba4dbdedd3edc2798659bcd8b1a184ea8bdd04dc