[PATCH] powerpc: sort Kconfig selects under CONFIG_PPC
config PPC has a lot of selects under it. They're not sorted in any particular order, leading to merge conflicts when adding items at the end. Sort them alphabetically. Suggested-by: Michael Ellerman Signed-off-by: Andrew Donnellan --- On top of linux-next 20170130 --- arch/powerpc/Kconfig | 128 +-- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 689cf9218b21..570195c8a86a 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -80,91 +80,91 @@ config ARCH_HAS_DMA_SET_COHERENT_MASK config PPC bool default y - select BUILDTIME_EXTABLE_SORT + select ARCH_HAS_DEVMEM_IS_ALLOWED + select ARCH_HAS_DMA_SET_COHERENT_MASK + select ARCH_HAS_ELF_RANDOMIZE + select ARCH_HAS_GCOV_PROFILE_ALL + select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE + select ARCH_HAS_SG_CHAIN + select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST + select ARCH_HAS_UBSAN_SANITIZE_ALL + select ARCH_HAVE_NMI_SAFE_CMPXCHG select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO + select ARCH_SUPPORTS_ATOMIC_RMW + select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT + select ARCH_USE_BUILTIN_BSWAP + select ARCH_USE_CMPXCHG_LOCKREF if PPC64 + select ARCH_WANT_IPC_PARSE_VERSION + select ARCH_WEAK_RELEASE_ACQUIRE select BINFMT_ELF - select ARCH_HAS_ELF_RANDOMIZE - select OF - select OF_EARLY_FLATTREE - select OF_RESERVED_MEM - select HAVE_FTRACE_MCOUNT_RECORD + select BUILDTIME_EXTABLE_SORT + select CLONE_BACKWARDS + select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN + select EDAC_ATOMIC_SCRUB + select EDAC_SUPPORT + select GENERIC_ATOMIC64 if PPC32 + select GENERIC_CLOCKEVENTS + select GENERIC_CLOCKEVENTS_BROADCAST if SMP + select GENERIC_CMOS_UPDATE + select GENERIC_CPU_AUTOPROBE + select GENERIC_IRQ_SHOW + select GENERIC_IRQ_SHOW_LEVEL + select GENERIC_SMP_IDLE_THREAD + select GENERIC_STRNCPY_FROM_USER + select GENERIC_STRNLEN_USER + select GENERIC_TIME_VSYSCALL_OLD + select HAVE_ARCH_AUDITSYSCALL + select HAVE_ARCH_HARDENED_USERCOPY + select HAVE_ARCH_JUMP_LABEL + select HAVE_ARCH_KGDB + select HAVE_ARCH_SECCOMP_FILTER + select HAVE_ARCH_TRACEHOOK + select HAVE_CBPF_JIT if !PPC64 + select HAVE_DEBUG_KMEMLEAK + select HAVE_DEBUG_STACKOVERFLOW + select HAVE_DMA_API_DEBUG select HAVE_DYNAMIC_FTRACE select HAVE_DYNAMIC_FTRACE_WITH_REGS if MPROFILE_KERNEL - select HAVE_FUNCTION_TRACER + select HAVE_EBPF_JIT if PPC64 + select HAVE_EFFICIENT_UNALIGNED_ACCESS if !(CPU_LITTLE_ENDIAN && POWER7_CPU) + select HAVE_FTRACE_MCOUNT_RECORD select HAVE_FUNCTION_GRAPH_TRACER - select SYSCTL_EXCEPTION_TRACE - select VIRT_TO_BUS if !PPC64 + select HAVE_FUNCTION_TRACER + select HAVE_GENERIC_RCU_GUP + select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx) select HAVE_IDE select HAVE_IOREMAP_PROT - select HAVE_EFFICIENT_UNALIGNED_ACCESS if !(CPU_LITTLE_ENDIAN && POWER7_CPU) + select HAVE_IRQ_EXIT_ON_IRQ_STACK + select HAVE_KERNEL_GZIP select HAVE_KPROBES - select HAVE_ARCH_KGDB select HAVE_KRETPROBES - select HAVE_ARCH_TRACEHOOK + select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS select HAVE_MEMBLOCK select HAVE_MEMBLOCK_NODE_MAP - select HAVE_DMA_API_DEBUG + select HAVE_MOD_ARCH_SPECIFIC + select HAVE_NMI if PERF_EVENTS select HAVE_OPROFILE - select HAVE_DEBUG_KMEMLEAK - select ARCH_HAS_SG_CHAIN - select GENERIC_ATOMIC64 if PPC32 select HAVE_PERF_EVENTS + select HAVE_PERF_EVENTS_NMI if PPC64 select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP + select HAVE_RCU_TABLE_FREE if SMP select HAVE_REGS_AND_STACK_ACCESS_API - select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx) - select ARCH_WANT_IPC_PARSE_VERSION - select SPARSE_IRQ + select HAVE_SYSCALL_TRACEPOINTS + select HAVE_VIRT_CPU_ACCOUNTING select IRQ_DOMAIN - select GENERIC_IRQ_SHOW - select GENERIC_IRQ_SHOW_LEVEL select IRQ_FORCED_THREADING - select HAVE_RCU_TABLE_FREE if SMP - select HAVE_SYSCALL_TRACEPOINTS - select HAVE_CBPF_JIT if !PPC64 - select HAVE_EBPF_JIT if PPC64 - select HAVE_ARCH_JUMP_LABEL - select ARCH_HAVE_NMI_SAFE_CMPXCHG - select ARCH_HAS_GCOV_PROFILE_ALL - select GENERIC_SMP_IDLE_THREAD - select GENERIC_CMOS_UPDATE - select GENERIC_TIME_VSYSCALL_OLD - select GENERIC_CLOCKEVENTS - select GENERIC_CLOCKEVENTS_BROADCAS
Re: [PATCH] powerpc: sort Kconfig selects under CONFIG_PPC
Hi Michael, On Mon, 30 Jan 2017 20:56:12 +1100 Michael Ellerman wrote: > > Stephen Rothwell writes: > > On Mon, 30 Jan 2017 20:30:02 +1100 Andrew Donnellan > > wrote: > >> > >> config PPC has a lot of selects under it. They're not sorted in any > >> particular order, leading to merge conflicts when adding items at the end. > >> > >> Sort them alphabetically. > > > > Excellent, thanks. > > > >> Suggested-by: Michael Ellerman > >> Signed-off-by: Andrew Donnellan > >> --- > >> > >> On top of linux-next 20170130 > > > > Probably best done on top of powerpc-next and I can cope with the > > conflicts one more time. > > But I don't want to send that many conflicts to Linus. > > What we need to do is generate the patch just after 4.11-rc1 is out, > that way there should be zero skew between my fixes/next and Linus' > tree. I've been meaning to do it for a few releases but just never > remember. > > So Andrew if you can remember to do it then that would be awesome :) > > >> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig > >> index 689cf9218b21..570195c8a86a 100644 > >> --- a/arch/powerpc/Kconfig > >> +++ b/arch/powerpc/Kconfig > >> @@ -80,91 +80,91 @@ config ARCH_HAS_DMA_SET_COHERENT_MASK > >> config PPC > > > > Could we add a comment just above asking that the selects be kept in order? > > > > Actually at the bottom would make more sense I think, that's where > people will try to add new ones. Sure, both good ideas. -- Cheers, Stephen Rothwell
Re: [PATCH] powerpc: sort Kconfig selects under CONFIG_PPC
Stephen Rothwell writes: > On Mon, 30 Jan 2017 20:30:02 +1100 Andrew Donnellan > wrote: >> >> config PPC has a lot of selects under it. They're not sorted in any >> particular order, leading to merge conflicts when adding items at the end. >> >> Sort them alphabetically. > > Excellent, thanks. > >> Suggested-by: Michael Ellerman >> Signed-off-by: Andrew Donnellan >> --- >> >> On top of linux-next 20170130 > > Probably best done on top of powerpc-next and I can cope with the > conflicts one more time. But I don't want to send that many conflicts to Linus. What we need to do is generate the patch just after 4.11-rc1 is out, that way there should be zero skew between my fixes/next and Linus' tree. I've been meaning to do it for a few releases but just never remember. So Andrew if you can remember to do it then that would be awesome :) >> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig >> index 689cf9218b21..570195c8a86a 100644 >> --- a/arch/powerpc/Kconfig >> +++ b/arch/powerpc/Kconfig >> @@ -80,91 +80,91 @@ config ARCH_HAS_DMA_SET_COHERENT_MASK >> config PPC > > Could we add a comment just above asking that the selects be kept in order? Actually at the bottom would make more sense I think, that's where people will try to add new ones. cheers
Re: [PATCH] powerpc: sort Kconfig selects under CONFIG_PPC
Hi Andrew, On Mon, 30 Jan 2017 20:30:02 +1100 Andrew Donnellan wrote: > > config PPC has a lot of selects under it. They're not sorted in any > particular order, leading to merge conflicts when adding items at the end. > > Sort them alphabetically. Excellent, thanks. > Suggested-by: Michael Ellerman > Signed-off-by: Andrew Donnellan > --- > > On top of linux-next 20170130 Probably best done on top of powerpc-next and I can cope with the conflicts one more time. > diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig > index 689cf9218b21..570195c8a86a 100644 > --- a/arch/powerpc/Kconfig > +++ b/arch/powerpc/Kconfig > @@ -80,91 +80,91 @@ config ARCH_HAS_DMA_SET_COHERENT_MASK > config PPC Could we add a comment just above asking that the selects be kept in order? > bool > default y > - select BUILDTIME_EXTABLE_SORT > + select ARCH_HAS_DEVMEM_IS_ALLOWED > + select ARCH_HAS_DMA_SET_COHERENT_MASK -- Cheers, Stephen Rothwell
