commit | c369898759e0e143a513d022121290370f001d01 | [log] [tgz] |
---|---|---|
author | Bob Peterson <rpeterso@redhat.com> | Fri Mar 24 09:22:07 2017 -0400 |
committer | Bob Peterson <rpeterso@redhat.com> | Mon Apr 03 09:08:58 2017 -0400 |
tree | 5c770207fcec81a9fac2380821a7fad02cdd32e2 | |
parent | cc963a11b67b796c25c5b827b25d2bcc92ce1779 [diff] | |
parent | f9fe1c12d126f9887441fa5bb165046f30ddd4b5 [diff] |
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>