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

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/atomic64_32.h
index 46e1ef17d92d01f3ee5336f012cf1ae63b12e8cf,d4d4883080fa7d5f08fb2beef8af9405f81823a3..92212bf0484fecdd3922fefd3ab16c71e17b476f
--- 1/arch/x86/include/asm/atomic64_32.h
--- 2/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 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/core/dc.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_cdclk.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/xmit.c
Simple merge

diff --cc fs/xfs/xfs_export.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc net/socket.c
index 54dcb43e25a152429cb43f3b6a938934307ba4f8,24c8e71583ad354a7e62eab68381d4b79919fc18..f10f1d947c78c193b49379b0ec641d81367fb4cf
--- 1/net/socket.c
--- 2/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;

diff --cc sound/soc/fsl/fsl_dma.c
Simple merge