From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Mar 2019 03:25:37 +0000 (-0800)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: v5.4-rc1~1483
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5dd0c658c31b469ccff1b637e5124851e7a4a1c;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'akpm' (patches from Andrew)

Merge more updates from Andrew Morton:

 - some of the rest of MM

 - various misc things

 - dynamic-debug updates

 - checkpatch

 - some epoll speedups

 - autofs

 - rapidio

 - lib/, lib/lzo/ updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (83 commits)
  samples/mic/mpssd/mpssd.h: remove duplicate header
  kernel/fork.c: remove duplicated include
  include/linux/relay.h: fix percpu annotation in struct rchan
  arch/nios2/mm/fault.c: remove duplicate include
  unicore32: stop printing the virtual memory layout
  MAINTAINERS: fix GTA02 entry and mark as orphan
  mm: create the new vm_fault_t type
  arm, s390, unicore32: remove oneliner wrappers for memblock_alloc()
  arch: simplify several early memory allocations
  openrisc: simplify pte_alloc_one_kernel()
  sh: prefer memblock APIs returning virtual address
  microblaze: prefer memblock API returning virtual address
  powerpc: prefer memblock APIs returning virtual address
  lib/lzo: separate lzo-rle from lzo
  lib/lzo: implement run-length encoding
  lib/lzo: fast 8-byte copy on arm64
  lib/lzo: 64-bit CTZ on arm64
  lib/lzo: tidy-up ifdefs
  ipc/sem.c: replace kvmalloc/memset with kvzalloc and use struct_size
  ipc: annotate implicit fall through
  ...
---

b5dd0c658c31b469ccff1b637e5124851e7a4a1c
diff --cc include/linux/fs.h
index 4ede9ff,1a775aa..2cc5408
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -37,7 -37,8 +37,9 @@@
  #include <linux/uuid.h>
  #include <linux/errseq.h>
  #include <linux/ioprio.h>
 +#include <linux/fs_types.h>
+ #include <linux/build_bug.h>
+ #include <linux/stddef.h>
  
  #include <asm/byteorder.h>
  #include <uapi/linux/fs.h>