Merge commit 'f9fe1c1' into for-next
authorBob Peterson <rpeterso@redhat.com>
Fri, 24 Mar 2017 13:22:07 +0000 (09:22 -0400)
committerBob Peterson <rpeterso@redhat.com>
Mon, 3 Apr 2017 13:08:58 +0000 (09:08 -0400)
commitc369898759e0e143a513d022121290370f001d01
tree5c770207fcec81a9fac2380821a7fad02cdd32e2
parentcc963a11b67b796c25c5b827b25d2bcc92ce1779
parentf9fe1c12d126f9887441fa5bb165046f30ddd4b5
Merge commit 'f9fe1c1' into for-next

Andreas Gruenbacher added function rhashtable_lookup_get_insert_fast
to rhashtable.h. That patch went into the net-next tree. In a
subsequent patch, GFS2 makes use of this new function. Therefore, we
needed a merge commit to make the new function available to GFS2.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>