From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Apr 2018 18:56:35 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Tag: android-x86-8.1-r1~1362
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=672a9c106966f8d418478830975288b8096bb058;p=android-x86%2Fkernel.git

Merge branch 'for-linus' of git://git./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
---

672a9c106966f8d418478830975288b8096bb058
diff --cc arch/x86/include/asm/atomic64_32.h
index 46e1ef17d92d,d4d4883080fa..92212bf0484f
--- a/arch/x86/include/asm/atomic64_32.h
+++ b/arch/x86/include/asm/atomic64_32.h
@@@ -123,10 -122,10 +123,10 @@@ static inline long long arch_atomic64_r
  	long long r;
  	alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
  	return r;
-  }
+ }
  
  /**
 - * atomic64_add_return - add and return
 + * arch_atomic64_add_return - add and return
   * @i: integer value to add
   * @v: pointer to type atomic64_t
   *
diff --cc net/socket.c
index 54dcb43e25a1,24c8e71583ad..f10f1d947c78
--- a/net/socket.c
+++ b/net/socket.c
@@@ -1536,11 -1516,11 +1536,11 @@@ SYSCALL_DEFINE2(listen, int, fd, int, b
   *
   *	1003.1g adds the ability to recvmsg() to query connection pending
   *	status to recvmsg. We need to add that support in a way thats
-  *	clean when we restucture accept also.
+  *	clean when we restructure accept also.
   */
  
 -SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
 -		int __user *, upeer_addrlen, int, flags)
 +int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr,
 +		  int __user *upeer_addrlen, int flags)
  {
  	struct socket *sock, *newsock;
  	struct file *newfile;