Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Pull arch/tile updates from Chris Metcalf:
 "This is an even quieter cycle than usual"

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  Fix typo
  Fix typo
  Fix typo
  tile: sort the "select" lines in the TILE/TILEGX configs
  tile: clarify barrier semantics of atomic_add_return
  tile/defconfigs: Remove CONFIG_IPV6_PRIVACY

diff --cc arch/tile/Kconfig
index 76989b878f3ce63a1c1d6b9d67afef4396998a18,c3bbb295bc4a736f0fa3daa4a09855e91d474158..4820a02838ace2e1d05f8e9ed5e43e18b48a5569
--- 1/arch/tile/Kconfig
--- 2/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@@ -35,17 -18,21 +18,23 @@@ config TIL
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
        select HAVE_ARCH_SECCOMP_FILTER
- 
- # FIXME: investigate whether we need/want these options.
- #     select HAVE_IOREMAP_PROT
- #     select HAVE_OPTPROBES
- #     select HAVE_REGS_AND_STACK_ACCESS_API
- #     select HAVE_HW_BREAKPOINT
- #     select PERF_EVENTS
- #     select HAVE_USER_RETURN_NOTIFIER
- #     config NO_BOOTMEM
- #     config ARCH_SUPPORTS_DEBUG_PAGEALLOC
- #     config HUGETLB_PAGE_SIZE_VARIABLE
+       select HAVE_ARCH_TRACEHOOK
+       select HAVE_CONTEXT_TRACKING
+       select HAVE_DEBUG_BUGVERBOSE
+       select HAVE_DEBUG_KMEMLEAK
+       select HAVE_DEBUG_STACKOVERFLOW
+       select HAVE_DMA_API_DEBUG
++      select HAVE_EXIT_THREAD
+       select HAVE_KVM if !TILEGX
++      select HAVE_NMI if USE_PMC
+       select HAVE_PERF_EVENTS
+       select HAVE_SYSCALL_TRACEPOINTS
+       select MODULES_USE_ELF_RELA
+       select SYSCTL_EXCEPTION_TRACE
+       select SYS_HYPERVISOR
+       select USER_STACKTRACE_SUPPORT
+       select USE_PMC if PERF_EVENTS
+       select VIRT_TO_BUS
  
  config MMU
        def_bool y

diff --cc arch/tile/configs/tilegx_defconfig
Simple merge

diff --cc arch/tile/configs/tilepro_defconfig
Simple merge