From: Paul Mundt <lethal@linux-sh.org>
To: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev@vger.kernel.org, linux-omap@vger.kernel.org
Subject: Re: [GIT PULL] omap display subsystem changes for 2.6.39
Date: Tue, 22 Mar 2011 05:40:50 +0000 [thread overview]
Message-ID: <20110322054049.GB25925@linux-sh.org> (raw)
In-Reply-To: <1300701083.2891.77.camel@deskari>
On Mon, Mar 21, 2011 at 11:51:23AM +0200, Tomi Valkeinen wrote:
> One problem I noticed just now, the committer names seem a bit messed
> up. For example, Archit Taneja has three different style names there. Do
> you think I should rebase and fix them? Not a big job, but it'll mean,
> well, rebasing.
>
No need, this is what .mailmap is for. It seems there are quite a few
variations, I've added entries now for all of:
Archit Taneja <archit@ti.com>
Mayuresh Janorkar <mayur@ti.com>
Mythri P K <mythripk@ti.com>
Sumit Semwal <sumit.semwal@ti.com>
which traps all of the offenders in these patches. There seems to be a
general issue of author names and sign-offs using reverse order naming, I
assume because this is some absurd convention used by TI's mail servers.
We can of course continue fixing them up as they pop up, but people
should ideally be aware of the need for consistency before committing
things, too. A bit of name mangling is certainly a lesser evil than
rewriting history, though.
> There's a minor conflict in Overo's board file. I have pushed
> "for-paul-merged" branch to gitorious, which contains a merge with
> Linus' tree. I'm not sure that is the best way to show how to fix the
> conflict, but hopefully it'll give the idea.
>
Seemed pretty straightforward, I took care of it and made sure that it
still built. I assume Tony or someone will yell loudly if I've
inadvertently broken something :-)
Pulled now. I'll send things off to Linus shortly.
WARNING: multiple messages have this Message-ID (diff)
From: Paul Mundt <lethal@linux-sh.org>
To: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev@vger.kernel.org, linux-omap@vger.kernel.org
Subject: Re: [GIT PULL] omap display subsystem changes for 2.6.39
Date: Tue, 22 Mar 2011 14:40:50 +0900 [thread overview]
Message-ID: <20110322054049.GB25925@linux-sh.org> (raw)
In-Reply-To: <1300701083.2891.77.camel@deskari>
On Mon, Mar 21, 2011 at 11:51:23AM +0200, Tomi Valkeinen wrote:
> One problem I noticed just now, the committer names seem a bit messed
> up. For example, Archit Taneja has three different style names there. Do
> you think I should rebase and fix them? Not a big job, but it'll mean,
> well, rebasing.
>
No need, this is what .mailmap is for. It seems there are quite a few
variations, I've added entries now for all of:
Archit Taneja <archit@ti.com>
Mayuresh Janorkar <mayur@ti.com>
Mythri P K <mythripk@ti.com>
Sumit Semwal <sumit.semwal@ti.com>
which traps all of the offenders in these patches. There seems to be a
general issue of author names and sign-offs using reverse order naming, I
assume because this is some absurd convention used by TI's mail servers.
We can of course continue fixing them up as they pop up, but people
should ideally be aware of the need for consistency before committing
things, too. A bit of name mangling is certainly a lesser evil than
rewriting history, though.
> There's a minor conflict in Overo's board file. I have pushed
> "for-paul-merged" branch to gitorious, which contains a merge with
> Linus' tree. I'm not sure that is the best way to show how to fix the
> conflict, but hopefully it'll give the idea.
>
Seemed pretty straightforward, I took care of it and made sure that it
still built. I assume Tony or someone will yell loudly if I've
inadvertently broken something :-)
Pulled now. I'll send things off to Linus shortly.
next prev parent reply other threads:[~2011-03-22 5:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-21 9:51 [GIT PULL] omap display subsystem changes for 2.6.39 Tomi Valkeinen
2011-03-21 9:51 ` Tomi Valkeinen
2011-03-21 13:05 ` Tomi Valkeinen
2011-03-21 13:05 ` Tomi Valkeinen
2011-03-21 17:43 ` John S
2011-03-21 17:55 ` John S
2011-03-21 18:17 ` Tomi Valkeinen
2011-03-21 18:17 ` Tomi Valkeinen
2011-03-22 5:40 ` Paul Mundt [this message]
2011-03-22 5:40 ` Paul Mundt
2011-03-22 5:55 ` Tomi Valkeinen
2011-03-22 5:55 ` Tomi Valkeinen
2011-03-22 18:49 ` Felipe Contreras
2011-03-22 18:49 ` Felipe Contreras
2011-03-23 7:46 ` Tomi Valkeinen
2011-03-23 7:46 ` Tomi Valkeinen
2011-03-28 21:07 ` Tony Lindgren
2011-03-28 21:07 ` Tony Lindgren
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=20110322054049.GB25925@linux-sh.org \
--to=lethal@linux-sh.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=tomi.valkeinen@ti.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.