From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 Jun 2015 20:55:08 +0000 (-0700)
Subject: Merge branch 'for-linus-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~15535
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21dc2e6c6d552702736ad3603fe9b074654d3932;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-linus-4.2-rc1' of git://git./linux/kernel/git/rw/uml

Pull UML updates from Richard Weinberger:

 - remove hppfs ("HonePot ProcFS")

 - initial support for musl libc

 - uaccess cleanup

 - random cleanups and bug fixes all over the place

* 'for-linus-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: (21 commits)
  um: Don't pollute kernel namespace with uapi
  um: Include sys/types.h for makedev(), major(), minor()
  um: Do not use stdin and stdout identifiers for struct members
  um: Do not use __ptr_t type for stack_t's .ss pointer
  um: Fix mconsole dependency
  um: Handle tracehook_report_syscall_entry() result
  um: Remove copy&paste code from init.h
  um: Stop abusing __KERNEL__
  um: Catch unprotected user memory access
  um: Fix warning in setup_signal_stack_si()
  um: Rework uaccess code
  um: Add uaccess.h to ldt.c
  um: Add uaccess.h to syscalls_64.c
  um: Add asm/elf.h to vma.c
  um: Cleanup mem_32/64.c headers
  um: Remove hppfs
  um: Move syscall() declaration into os.h
  um: kernel: ksyms: Export symbol syscall() for fixing modpost issue
  um/os-Linux: Use char[] for syscall_stub declarations
  um: Use char[] for linker script address declarations
  ...
---

21dc2e6c6d552702736ad3603fe9b074654d3932
diff --cc arch/um/include/asm/Kbuild
index b7df3ae,ea9ec2e..3d63ff6
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@@ -21,7 -21,7 +21,6 @@@ generic-y += param.
  generic-y += pci.h
  generic-y += percpu.h
  generic-y += preempt.h
- generic-y += sections.h
 -generic-y += scatterlist.h
  generic-y += switch_to.h
  generic-y += topology.h
  generic-y += trace_clock.h