From: Michael Ellerman <mpe@ellerman.id.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Cc: linuxppc-dev@lists.ozlabs.org, paulmck@linux.vnet.ibm.com,
benh@kernel.crashing.org, linux-kernel@vger.kernel.org,
linux-next@vger.kernel.org
Subject: Re: [PATCH] powerpc: sort Kconfig selects under CONFIG_PPC
Date: Mon, 30 Jan 2017 20:56:12 +1100 [thread overview]
Message-ID: <87lgtsx45f.fsf@concordia.ellerman.id.au> (raw)
In-Reply-To: <20170130204102.423cebea@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> On Mon, 30 Jan 2017 20:30:02 +1100 Andrew Donnellan <andrew.donnellan@au1.ibm.com> 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@ellerman.id.au>
>> Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
>> ---
>>
>> 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
next prev parent reply other threads:[~2017-01-30 9:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-30 2:46 linux-next: manual merge of the rcu tree with the powerpc-fixes tree Stephen Rothwell
2017-01-30 4:00 ` Michael Ellerman
2017-01-30 9:30 ` [PATCH] powerpc: sort Kconfig selects under CONFIG_PPC Andrew Donnellan
2017-01-30 9:41 ` Stephen Rothwell
2017-01-30 9:56 ` Michael Ellerman [this message]
2017-01-30 10:21 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lgtsx45f.fsf@concordia.ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=andrew.donnellan@au1.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).