From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Jul 2017 00:38:17 +0000 (-0700)
Subject: Merge tag 'gfs2-4.13.fixes.addendum' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.13-rc1~104
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1a86fc754fc2bae3be5fe00c1b553b91ba20e089;p=users%2Fhch%2Fblock.git

Merge tag 'gfs2-4.13.fixes.addendum' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2

Pull GFS2 fix from Bob Peterson:
 "Sorry for the additional merge request, but Andreas discovered this
  problem soon after you processed our last gfs2 merge.

  This fixes a regression introduced by a patch we did in mid-2015
  (commit 88ffbf3e037e: "GFS2: Use resizable hash table for glocks"), so
  best to get it fixed. Some code was reverted that should not have
  been.

  The patch from Andreas Gruenbacher just re-adds code that had been
  there originally"

* tag 'gfs2-4.13.fixes.addendum' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: Fix glock rhashtable rcu bug
---

1a86fc754fc2bae3be5fe00c1b553b91ba20e089