summaryrefslogtreecommitdiff
path: root/include/linux/socket.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2025-03-05 22:10:50 +0300
committerMark Brown <broonie@kernel.org>2025-03-05 22:10:50 +0300
commitc6141ba0110f98266106699aca071fed025c3d64 (patch)
tree5b2c335cbed607d85e2fa51c54e29a2e4b0eb24d /include/linux/socket.h
parenta1462fb8b5dd1018e3477a6861822d75c6a59449 (diff)
parent927e6bec5cf3624665b0a2e9f64a1d32f3d22cdd (diff)
downloadlinux-c6141ba0110f98266106699aca071fed025c3d64.tar.xz
ASoC: Merge up fixes
Merge branch 'for-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-6.15 to avoid a bunch of add/add conflicts.
Diffstat (limited to 'include/linux/socket.h')
-rw-r--r--include/linux/socket.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h
index d18cc47e89bd..c3322eb3d686 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -392,6 +392,8 @@ struct ucred {
extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr_storage *kaddr);
extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);
+extern int put_cmsg_notrunc(struct msghdr *msg, int level, int type, int len,
+ void *data);
struct timespec64;
struct __kernel_timespec;