diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-11 19:23:51 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-11 19:23:51 (GMT) |
commit | 01cab5549c3e9a0fe7248fc5ad0fd79361cc0d39 (patch) | |
tree | 8b61b4fac425eb23a46df1765d7ff9342c211bc1 /drivers/net/veth.c | |
parent | 64d1def7d33856824d2c5c6fd6d4579d4d54bb87 (diff) | |
parent | 8f7e0a806db0a3ba33234af3c39d68ed8c144071 (diff) | |
download | linux-01cab5549c3e9a0fe7248fc5ad0fd79361cc0d39.tar.xz |
Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2
Pull GFS2 updates from Bob Peterson:
"Here is a list of patches we've accumulated for GFS2 for the current
upstream merge window. This time we've only got six patches, many of
which are very small:
- three cleanups from Andreas Gruenbacher, including a nice cleanup
of the sequence file code for the sbstats debugfs file.
- a patch from Ben Hutchings that changes statistics variables from
signed to unsigned.
- two patches from me that increase GFS2's glock scalability by
switching from a conventional hash table to rhashtable"
* tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
gfs2: A minor "sbstats" cleanup
gfs2: Fix a typo in a comment
gfs2: Make statistics unsigned, suitable for use with do_div()
GFS2: Use resizable hash table for glocks
GFS2: Move glock superblock pointer to field gl_name
gfs2: Simplify the seq file code for "sbstats"
Diffstat (limited to 'drivers/net/veth.c')
0 files changed, 0 insertions, 0 deletions