Hi Andrew, On Mon, 30 Jan 2017 20:30:02 +1100 Andrew Donnellan <andrew.donnellan@xxxxxxxxxxx> 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 <mpe@xxxxxxxxxxxxxx> > Signed-off-by: Andrew Donnellan <andrew.donnellan@xxxxxxxxxxx> > --- > > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
