From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 May 2019 17:17:29 +0000 (-0700)
Subject: Merge tag 'nds32-for-linus-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.2-rc1~18
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=4489da7183099f569a7d3dd819c975073c04bc72

Merge tag 'nds32-for-linus-5.2-rc1' of git://git./linux/kernel/git/greentime/linux

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
---

4489da7183099f569a7d3dd819c975073c04bc72
diff --cc arch/nds32/Kconfig
index 55559ca0efe4,c0b13bfeb0ee..2245169c72af
--- a/arch/nds32/Kconfig
+++ b/arch/nds32/Kconfig
@@@ -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