diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-05 14:56:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-05 14:56:35 -0400 |
| commit | 672a9c106966f8d418478830975288b8096bb058 (patch) | |
| tree | e47259d8a96084affaab87b0104b56ac352dc0eb /net/socket.c | |
| parent | e8403b493fd5180e351ca67eb66406d95dadcd0b (diff) | |
| parent | 75a24b822d383489badd343cab4cb171d09f93ef (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
kfifo: fix inaccurate comment
tools/thermal: tmon: fix for segfault
net: Spelling s/stucture/structure/
edd: don't spam log if no EDD information is present
Documentation: Fix early-microcode.txt references after file rename
tracing: Block comments should align the * on each line
treewide: Fix typos in printk
GenWQE: Fix a typo in two comments
treewide: Align function definition open/close braces
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 54dcb43e25a1..f10f1d947c78 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -1536,7 +1536,7 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog) | |||
| 1536 | * | 1536 | * |
| 1537 | * 1003.1g adds the ability to recvmsg() to query connection pending | 1537 | * 1003.1g adds the ability to recvmsg() to query connection pending |
| 1538 | * status to recvmsg. We need to add that support in a way thats | 1538 | * status to recvmsg. We need to add that support in a way thats |
| 1539 | * clean when we restucture accept also. | 1539 | * clean when we restructure accept also. |
| 1540 | */ | 1540 | */ |
| 1541 | 1541 | ||
| 1542 | int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, | 1542 | int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, |