diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-08 02:38:17 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-08 02:38:17 +0200 |
| commit | 1a86fc754fc2bae3be5fe00c1b553b91ba20e089 (patch) | |
| tree | f5568e55bebc40461a012f27391670978b777a2b /drivers/nfc/st-nci/spi.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
| parent | gfs2: Fix glock rhashtable rcu bug (diff) | |
| download | linux-1a86fc754fc2bae3be5fe00c1b553b91ba20e089.tar.xz linux-1a86fc754fc2bae3be5fe00c1b553b91ba20e089.zip | |
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
Diffstat (limited to 'drivers/nfc/st-nci/spi.c')
0 files changed, 0 insertions, 0 deletions