diff options
| author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2019-10-15 11:18:26 +0300 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2019-10-15 11:18:26 +0300 |
| commit | fa41d6ee904266fa8739cafa6ec038c3a8e435b7 (patch) | |
| tree | 4d5439bafd38dc730838bb15e6a49e747793d4a7 /include/linux/string.h | |
| parent | 9cd20ef7803cc53a00c6eb7198b3d870ac7b3766 (diff) | |
| parent | 7ed093602e0e1b60a0fc074a9692687e7d2b723d (diff) | |
| download | cachepc-linux-fa41d6ee904266fa8739cafa6ec038c3a8e435b7.tar.gz cachepc-linux-fa41d6ee904266fa8739cafa6ec038c3a8e435b7.zip | |
Merge drm/drm-next into drm-intel-next-queued
Backmerging to pull in HDR DP code:
https://lists.freedesktop.org/archives/dri-devel/2019-September/236453.html
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'include/linux/string.h')
| -rw-r--r-- | include/linux/string.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index 4deb11f7976b..b2f9df7f0761 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -474,8 +474,9 @@ static inline void memcpy_and_pad(void *dest, size_t dest_len, * But this can lead to bugs due to typos, or if prefix is a pointer * and not a constant. Instead use str_has_prefix(). * - * Returns: 0 if @str does not start with @prefix - strlen(@prefix) if @str does start with @prefix + * Returns: + * * strlen(@prefix) if @str starts with @prefix + * * 0 if @str does not start with @prefix */ static __always_inline size_t str_has_prefix(const char *str, const char *prefix) { |