diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2021-02-22 23:22:16 +0300 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2021-02-23 20:54:22 +0300 |
| commit | 803074ad77b91e270c1ce90793a924cdb4547162 (patch) | |
| tree | a74d00c81d7b3c15b2f88e23b40a1c53b78ba46a /include/uapi | |
| parent | 7009fa9cd9a5262944b30eb7efb1f0561d074b68 (diff) | |
| parent | 4fc7ec31c3c44031e8a8872bb8432cf4f6cb6ddd (diff) | |
| parent | 2129b4288852cf872c42870c7f6e813ce0611199 (diff) | |
| download | linux-803074ad77b91e270c1ce90793a924cdb4547162.tar.xz | |
Merge branches 'rgrp-glock-sharing' and 'gfs2-revoke' from https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
Merge the resource group glock sharing feature and the revoke accounting rework.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>