Merge tag 'nds32-for-linus-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 May 2019 17:17:29 +0000 (10:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 May 2019 17:17:29 +0000 (10:17 -0700)
Pull nds32 updates from Greentime Hu:

 - Clean up codes and Makefile

 - Fix a vDSO bug

 - Remove useless functions/header files

 - Update git repo path in MAINTAINERS

* tag 'nds32-for-linus-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux:
  nds32: Fix vDSO clock_getres()
  MAINTAINERS: update nds32 git repo path
  nds32: don't export low-level cache flushing routines
  arch: nds32: Kconfig: pedantic formatting
  nds32: fix semicolon code style issue
  nds32: vdso: drop unnecessary cc-ldoption
  nds32: remove unused generic-y += cmpxchg-local.h
  nds32: Use the correct style for SPDX License Identifier
  nds32: remove __virt_to_bus and __bus_to_virt
  nds32: vdso: fix and clean-up Makefile
  nds32: add vmlinux.lds and vdso.so to .gitignore
  nds32: ex-exit: Remove unneeded need_resched() loop
  nds32/io: Remove useless definition of mmiowb()
  nds32: Removed unused thread flag TIF_USEDFPU

1  2 
MAINTAINERS
arch/nds32/Kconfig
arch/nds32/include/asm/Kbuild
arch/nds32/include/asm/elf.h
arch/nds32/include/asm/pgtable.h
arch/nds32/include/asm/syscall.h
arch/nds32/include/asm/tlb.h
arch/nds32/include/asm/tlbflush.h
arch/nds32/mm/init.c

diff --cc MAINTAINERS
Simple merge
index 55559ca0efe404ce78d7039f9fa09a72df7c0ad3,c0b13bfeb0eeb511fdbf0abbd8478a0a66e70109..2245169c72af0dc5f4d1346e817cb18ee5600cfc
@@@ -51,15 -51,18 +51,15 @@@ config GENERIC_CALIBRATE_DELA
        def_bool y
  
  config GENERIC_CSUM
-         def_bool y
+       def_bool y
  
  config GENERIC_HWEIGHT
-         def_bool y
+       def_bool y
  
  config GENERIC_LOCKBREAK
-         def_bool y
+       def_bool y
        depends on PREEMPT
  
 -config RWSEM_GENERIC_SPINLOCK
 -      def_bool y
 -
  config TRACE_IRQFLAGS_SUPPORT
        def_bool y
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge