Merge tag 'asm-generic-nommu' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...

Pull nommu generic uaccess updates from Arnd Bergmann:
 "asm-generic: kill <asm/segment.h> and improve nommu generic uaccess helpers

  Christoph Hellwig writes:

     This is a series doing two somewhat interwinded things. It improves
     the asm-generic nommu uaccess helper to optionally be entirely
     generic and not require any arch helpers for the actual uaccess.
     For the generic uaccess.h to actually be generically useful I also
     had to kill off the mess we made of <asm/segment.h>, which really
     shouldn't exist on most architectures"

* tag 'asm-generic-nommu' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic: optimize generic uaccess for 8-byte loads and stores
  asm-generic: provide entirely generic nommu uaccess
  arch: mostly remove <asm/segment.h>
  asm-generic: don't include <asm/segment.h> from <asm/uaccess.h>

diff --cc arch/arm/include/asm/Kbuild
index 0b2ecc9,1465d46..60de9d1
--- 1/arch/arm/include/asm/Kbuild
--- 2/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@@ -13,10 -12,11 +13,9 @@@ generic-y += mmiowb.
  generic-y += msi.h
  generic-y += parport.h
  generic-y += preempt.h
 -generic-y += rwsem.h
  generic-y += seccomp.h
- generic-y += segment.h
  generic-y += serial.h
  generic-y += simd.h
 -generic-y += sizes.h
  generic-y += trace_clock.h
  
  generated-y += mach-types.h

diff --cc arch/arm64/include/asm/Kbuild
index 9e977de,fd9574e..1de6e05
--- 1/arch/arm64/include/asm/Kbuild
--- 2/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@@ -17,9 -16,10 +17,8 @@@ generic-y += mmiowb.
  generic-y += msi.h
  generic-y += qrwlock.h
  generic-y += qspinlock.h
- generic-y += segment.h
 -generic-y += rwsem.h
  generic-y += serial.h
  generic-y += set_memory.h
 -generic-y += sizes.h
  generic-y += switch_to.h
  generic-y += trace_clock.h
  generic-y += unaligned.h

diff --cc arch/c6x/include/asm/Kbuild
Simple merge

diff --cc arch/h8300/Kconfig
Simple merge

diff --cc arch/h8300/include/asm/Kbuild
Simple merge

diff --cc arch/hexagon/include/asm/Kbuild
index 4a3d72f,75658fe..84bb1ed
--- 1/arch/hexagon/include/asm/Kbuild
--- 2/arch/hexagon/include/asm/Kbuild
+++ b/arch/hexagon/include/asm/Kbuild
@@@ -28,10 -26,11 +28,9 @@@ generic-y += mmiowb.
  generic-y += pci.h
  generic-y += percpu.h
  generic-y += preempt.h
 -generic-y += rwsem.h
  generic-y += sections.h
- generic-y += segment.h
  generic-y += serial.h
  generic-y += shmparam.h
 -generic-y += sizes.h
  generic-y += topology.h
  generic-y += trace_clock.h
  generic-y += unaligned.h

diff --cc arch/nds32/include/asm/Kbuild
index f67a327,668d309..d8ce778
--- 1/arch/nds32/include/asm/Kbuild
--- 2/arch/nds32/include/asm/Kbuild
+++ b/arch/nds32/include/asm/Kbuild
@@@ -37,8 -36,8 +37,7 @@@ generic-y += pci.
  generic-y += percpu.h
  generic-y += preempt.h
  generic-y += sections.h
- generic-y += segment.h
  generic-y += serial.h
 -generic-y += sizes.h
  generic-y += switch_to.h
  generic-y += timex.h
  generic-y += topology.h

diff --cc arch/nios2/include/asm/Kbuild
Simple merge

diff --cc arch/openrisc/include/asm/Kbuild
Simple merge

diff --cc arch/openrisc/mm/init.c
Simple merge

diff --cc arch/parisc/include/asm/Kbuild
Simple merge

diff --cc arch/unicore32/include/asm/Kbuild
index c93dc64,a6e4e06..5fe2426
--- 1/arch/unicore32/include/asm/Kbuild
--- 2/arch/unicore32/include/asm/Kbuild
+++ b/arch/unicore32/include/asm/Kbuild
@@@ -28,9 -26,9 +28,8 @@@ generic-y += parport.
  generic-y += percpu.h
  generic-y += preempt.h
  generic-y += sections.h
- generic-y += segment.h
  generic-y += serial.h
  generic-y += shmparam.h
 -generic-y += sizes.h
  generic-y += syscalls.h
  generic-y += topology.h
  generic-y += trace_clock.h

diff --cc lib/Kconfig
Simple merge