diff options
| author | Linus Torvalds | 2019-07-10 19:21:38 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2019-07-10 19:21:38 -0700 |
| commit | 988052f47adc5c3b0b004180b59bb3761d91b752 (patch) | |
| tree | 044dbcb77fa966b01ad1a4c9b211dccaa62b29a0 /fs/nfs/nfsroot.c | |
| parent | 028db3e290f15ac509084c0fc3b9d021f668f877 (diff) | |
| parent | 387e3746d01c34457d6a73688acd90428725070b (diff) | |
Merge tag 'locks-v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
Pull file locking updates from Jeff Layton:
"Just a couple of small lease-related patches this cycle.
One from Ira to add a new tracepoint that fires during lease conflict
checks, and another patch from Amir to reduce false positives when
checking for lease conflicts"
* tag 'locks-v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
locks: eliminate false positive conflicts for write lease
locks: Add trace_leases_conflict
Diffstat (limited to 'fs/nfs/nfsroot.c')
0 files changed, 0 insertions, 0 deletions