diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-20 16:08:27 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-20 16:08:27 +0300 |
| commit | 26440c835f8b1a491e2704118ac55bf87334366c (patch) | |
| tree | 3c2d23b59fd49b252fdbf6c09efc41b354933fc6 /include/linux/string.h | |
| parent | 371f1c7e0d854796adc622cc3bacfcc5fc638db1 (diff) | |
| parent | 1099f86044111e9a7807f09523e42d4c9d0fb781 (diff) | |
| download | linux-26440c835f8b1a491e2704118ac55bf87334366c.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/asix_common.c
net/ipv4/inet_connection_sock.c
net/switchdev/switchdev.c
In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.
The other two conflicts were overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/string.h')
| -rw-r--r-- | include/linux/string.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index a8d90db9c4b0..9ef7795e65e4 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -25,6 +25,9 @@ extern char * strncpy(char *,const char *, __kernel_size_t); #ifndef __HAVE_ARCH_STRLCPY size_t strlcpy(char *, const char *, size_t); #endif +#ifndef __HAVE_ARCH_STRSCPY +ssize_t __must_check strscpy(char *, const char *, size_t); +#endif #ifndef __HAVE_ARCH_STRCAT extern char * strcat(char *, const char *); #endif |