public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Documentation: devres: Sort managed interfaces
Date: Wed, 9 Jul 2014 16:32:48 -0700	[thread overview]
Message-ID: <20140709233248.GA12171@kroah.com> (raw)
In-Reply-To: <1404919578-4457-1-git-send-email-geert+renesas@glider.be>

On Wed, Jul 09, 2014 at 05:26:18PM +0200, Geert Uytterhoeven wrote:
> Sort the list of managed interfaces and their lists of methods
> alphabetically, to reduce the risk of merge conflicts and duplicates.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> I got annoyed by the merge conflicts when merging several for-next
> branches a while ago, so I sorted the list after everything became
> quiet.
> ---
>  Documentation/driver-model/devres.txt | 108 +++++++++++++++++-----------------
>  1 file changed, 54 insertions(+), 54 deletions(-)

What tree/version is this against?  I get merge issues with my
driver-core-next tree :(

thanks,

greg k-h

  reply	other threads:[~2014-07-09 23:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-09 15:26 [PATCH] Documentation: devres: Sort managed interfaces Geert Uytterhoeven
2014-07-09 23:32 ` Greg Kroah-Hartman [this message]
2014-07-10  7:34   ` Geert Uytterhoeven
2014-07-10 15:14     ` Greg Kroah-Hartman
2014-07-10 15:23       ` Geert Uytterhoeven

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=20140709233248.GA12171@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=geert+renesas@glider.be \
    --cc=linux-kernel@vger.kernel.org \
    --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