diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2022-10-09 23:56:28 +0300 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2022-10-09 23:56:28 +0300 |
| commit | c7d7d2d345697eb3781198e58a22504feb74af63 (patch) | |
| tree | 66bf10cf2aeceea847adf863d616f545526edb74 /net/sched/cls_flower.c | |
| parent | 74b1b10e29b1f25e1a081fa82733baea65429d53 (diff) | |
| parent | ebdc416c9c0bed245d6cda92ae2a98483e513051 (diff) | |
| download | linux-c7d7d2d345697eb3781198e58a22504feb74af63.tar.xz | |
gfs2: Merge branch 'for-next.nopid' into for-next
Resolves a conflict in gfs2_inode_lookup() between the following commits:
gfs2: Use TRY lock in gfs2_inode_lookup for UNLINKED inodes
gfs2: Mark the remaining process-independent glock holders as GL_NOPID
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'net/sched/cls_flower.c')
0 files changed, 0 insertions, 0 deletions