From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Nov 2017 21:53:18 +0000 (-0800)
Subject: Merge tag 'jfs-4.15' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: v4.15-rc1~134
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ac446dcc8360b3d31a87f0c6390ab75a18fc44ba;p=users%2Fhch%2Fuuid.git

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

Pull jfs updates from David Kleikamp:
 "A couple small fixes for jfs"

* tag 'jfs-4.15' of git://github.com/kleikamp/linux-shaggy:
  jfs: Add missing NULL pointer check in __get_metapage
  jfs: remove increment of i_version counter
---

ac446dcc8360b3d31a87f0c6390ab75a18fc44ba