diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-05-17 09:30:24 -0400 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-05-17 09:30:24 -0400 |
| commit | 9c3a985f88fa4de82bf4bda906095ce6444e9039 (patch) | |
| tree | 4b02653fcb1ba1e6b342d98ac58f6206c56be935 /include/uapi/linux/dlmconstants.h | |
| parent | 86634ba3dfc789497805da3d5774fcc1953cbe41 (diff) | |
| parent | ac9a78681b921877518763ba0e89202254349d1b (diff) | |
| download | lwn-9c3a985f88fa4de82bf4bda906095ce6444e9039.tar.gz lwn-9c3a985f88fa4de82bf4bda906095ce6444e9039.zip | |
Merge drm/drm-next into drm-intel-next
Backmerge to get some hwmon dependencies.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/uapi/linux/dlmconstants.h')
| -rw-r--r-- | include/uapi/linux/dlmconstants.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/uapi/linux/dlmconstants.h b/include/uapi/linux/dlmconstants.h index a8ae47c32a37..6ca77a6388bc 100644 --- a/include/uapi/linux/dlmconstants.h +++ b/include/uapi/linux/dlmconstants.h @@ -87,7 +87,6 @@ * DLM_LKF_NODLCKWT * * Do not cancel the lock if it gets into conversion deadlock. - * Exclude this lock from being monitored due to DLM_LSFL_TIMEWARN. * * DLM_LKF_NODLCKBLK * @@ -132,6 +131,10 @@ * Unlock the lock even if it is converting or waiting or has sublocks. * Only really for use by the userland device.c code. * + * DLM_LKF_TIMEOUT + * + * This value is deprecated and reserved. DO NOT USE! + * */ #define DLM_LKF_NOQUEUE 0x00000001 |