Merge tag 'jfs-4.15' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Nov 2017 21:53:18 +0000 (13:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Nov 2017 21:53:18 +0000 (13:53 -0800)
commitac446dcc8360b3d31a87f0c6390ab75a18fc44ba
treedf69518285fd456b0c54a1c7bd83fb7ef3341dde
parent5cea7647e64657138138a3794ae172ee0fc175da
parent88a96fa84186deadb8b1ecc8cb066cd7afeb5bf2
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