Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc changes from David S. Miller:
 "This has the generic strncpy_from_user() implementation architectures
  can now use, which we've been developing on linux-arch over the past
  few days.

  For good measure I ran both a 32-bit and a 64-bit glibc testsuite run,
  and the latter of which pointed out an adjustment I needed to make to
  sparc's user_addr_max() definition.  Linus, you were right, STACK_TOP
  was not the right thing to use, even on sparc itself :-)

  From Sam Ravnborg, we have a conversion of sparc32 over to the common
  alloc_thread_info_node(), since the aspect which originally blocked
  our doing so (sun4c) has been removed."

Fix up trivial arch/sparc/Kconfig and lib/Makefile conflicts.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Fix user_addr_max() definition.
  lib: Sparc's strncpy_from_user is generic enough, move under lib/
  kernel: Move REPEAT_BYTE definition into linux/kernel.h
  sparc: Increase portability of strncpy_from_user() implementation.
  sparc: Optimize strncpy_from_user() zero byte search.
  sparc: Add full proper error handling to strncpy_from_user().
  sparc32: use the common implementation of alloc_thread_info_node()

diff --cc arch/sparc/Kconfig
index 2d493a3bdfe119f355b75733297d39c2a8c08f8f,22474233205b794c417f174db4c994406ef014d1..15e9e05740da3382a43f9d8f4c45585ee461e1d1
--- 1/arch/sparc/Kconfig
--- 2/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@@ -32,15 -32,12 +32,15 @@@ config SPAR
        select HAVE_NMI_WATCHDOG if SPARC64
        select HAVE_BPF_JIT
        select GENERIC_SMP_IDLE_THREAD
 +      select GENERIC_CMOS_UPDATE
 +      select GENERIC_CLOCKEVENTS
+       select GENERIC_STRNCPY_FROM_USER
  
  config SPARC32
        def_bool !64BIT
        select GENERIC_ATOMIC64
        select CLZ_TAB
-       select ARCH_THREAD_INFO_ALLOCATOR
 +      select ARCH_USES_GETTIMEOFFSET
  
  config SPARC64
        def_bool 64BIT

diff --cc arch/sparc/include/asm/processor_64.h
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc lib/Kconfig
Simple merge

diff --cc lib/Makefile
index 74290c9e2864e6bbec87bb065fcd86b0d0441ee2,57538b4d01d291df6c7629a494e7db7a81c6e65a..b98df505f335de2e6562c3196d72f924f57f7f10
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -123,8 -123,8 +123,10 @@@ obj-$(CONFIG_SIGNATURE) += digsig.
  
  obj-$(CONFIG_CLZ_TAB) += clz_tab.o
  
 +obj-$(CONFIG_DDR) += jedec_ddr_data.o
 +
+ obj-$(CONFIG_GENERIC_STRNCPY_FROM_USER) += strncpy_from_user.o
+ 
  hostprogs-y   := gen_crc32table
  clean-files   := crc32table.h