]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Mar 2019 03:25:37 +0000 (19:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Mar 2019 03:25:37 +0000 (19:25 -0800)
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
  ...

15 files changed:
1  2 
MAINTAINERS
arch/powerpc/kernel/setup-common.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/mm/hash_utils_64.c
arch/powerpc/mm/ppc_mmu_32.c
arch/powerpc/platforms/pasemi/iommu.c
arch/powerpc/platforms/powernv/opal.c
arch/powerpc/sysdev/dart_iommu.c
arch/x86/configs/i386_defconfig
arch/x86/configs/x86_64_defconfig
fs/btrfs/ctree.h
fs/namei.c
include/linux/fs.h
kernel/sys.c
kernel/workqueue.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/namei.c
Simple merge
index 4ede9ffa362a010116888f847e24085b8b0533f5,1a775aa3e349313b824c7554665fa976966a1d6e..2cc540805a02e6d99ca50dd0a6607a0240737b28
@@@ -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>
diff --cc kernel/sys.c
Simple merge
Simple merge