diff options
author | Jani Nikula <jani.nikula@intel.com> | 2020-11-05 10:25:17 +0200 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2020-11-05 10:25:17 +0200 |
commit | 5f8f965287494d55e8ba3551e3727a5e9d0eb702 (patch) | |
tree | 22a814cce4bf9de25a2af9af704da77787ac1e14 /include/linux/sunrpc/cache.h | |
parent | ba8a5cb234ba3bf0a585fd38e5f36d7e7ce33661 (diff) | |
parent | e047c7be173caab95f3876ab30c03ebcf654c300 (diff) |
Merge drm/drm-next into drm-intel-next-queued
Catch up with v5.10-rc2 and drm-misc-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/linux/sunrpc/cache.h')
-rw-r--r-- | include/linux/sunrpc/cache.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h index 10891b70fc7b..d0965e2997b0 100644 --- a/include/linux/sunrpc/cache.h +++ b/include/linux/sunrpc/cache.h @@ -45,7 +45,8 @@ */ struct cache_head { struct hlist_node cache_list; - time64_t expiry_time; /* After time time, don't use the data */ + time64_t expiry_time; /* After time expiry_time, don't use + * the data */ time64_t last_refresh; /* If CACHE_PENDING, this is when upcall was * sent, else this is when update was * received, though it is alway set to |