From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Jon Smirl <jonsmirl@gmail.com>
Cc: grant.likely@secretlab.ca, alsa-devel@alsa-project.org
Subject: Re: [PATCH V1 01/13] Temporarily undo 2008f137e92220b98120c4803499cdddb2b0fb06
Date: Thu, 14 May 2009 17:25:41 +0100 [thread overview]
Message-ID: <1242318341.31458.1786.camel@finisterre> (raw)
In-Reply-To: <9e4733910905140737u74e594f5wfc17fc068dc36361@mail.gmail.com> (sfid-20090514_153719_357777_D8DDC275)
On Thu, 2009-05-14 at 10:37 -0400, Jon Smirl wrote:
> You and I can easily see how this patch can be folded into the next
> one. Git is broken in this situation. I've reported the issue to the
> git people and they acknowledge it, but no one has fixed it. Git's
> merge strategy does not handle the case of a file splitting. When git
> tries to merge this one-liner into the next patch that splits the
> files, it does the merge wrong which then messes up the entire patch
> stack.
It should be possible to do the relevant thing by hand - it's only a one
line change you're staging out. Like I say, not the end of the world
anyway.
next prev parent reply other threads:[~2009-05-14 16:25 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-14 1:58 [PATCH V1 00/13] mpc5200 audio rework for AC97 Jon Smirl
2009-05-14 1:59 ` [PATCH V1 01/13] Temporarily undo 2008f137e92220b98120c4803499cdddb2b0fb06 Jon Smirl
2009-05-14 10:13 ` Mark Brown
2009-05-14 14:37 ` Jon Smirl
2009-05-14 16:25 ` Mark Brown [this message]
2009-05-14 20:21 ` Jon Smirl
2009-05-14 1:59 ` [PATCH V1 02/13] Basic split of mpc5200 DMA code out from mpc5200_psc_i2s Jon Smirl
2009-05-14 1:59 ` [PATCH V1 03/13] Rename the PSC functions to DMA Jon Smirl
2009-05-14 10:14 ` Mark Brown
2009-05-14 1:59 ` [PATCH V1 04/13] redo 2008f137e92220b98120c4803499cdddb2b0fb06 Jon Smirl
2009-05-14 1:59 ` [PATCH V1 05/13] Add a few more mpc5200 PSC defines Jon Smirl
2009-05-14 10:15 ` Mark Brown
2009-05-14 1:59 ` [PATCH V1 06/13] Allow a custom ASOC fabric driver with soc-of-simple Jon Smirl
2009-05-14 10:41 ` Mark Brown
2009-05-14 1:59 ` [PATCH V1 07/13] Add SNDRV_PCM_FMTBIT_S32_BE as a valid AC97 format Jon Smirl
2009-05-14 11:53 ` Mark Brown
2009-05-14 1:59 ` [PATCH V1 08/13] Have the WM9712 driver self register itself Jon Smirl
2009-05-14 10:45 ` Mark Brown
2009-05-14 1:59 ` [PATCH V1 09/13] Main rewite of the mpc5200 audio DMA code Jon Smirl
2009-05-14 10:51 ` Mark Brown
2009-05-14 14:50 ` Jon Smirl
2009-05-14 19:14 ` Mark Brown
2009-05-14 1:59 ` [PATCH V1 10/13] Codec for STAC9766 used on the Efika Jon Smirl
2009-05-14 11:03 ` Mark Brown
2009-05-14 1:59 ` [PATCH V1 11/13] AC97 driver for mpc5200 Jon Smirl
2009-05-14 2:17 ` Jon Smirl
2009-05-14 11:39 ` Mark Brown
2009-05-14 1:59 ` [PATCH V1 12/13] Fabric bindings for STAC9766 on the Efika Jon Smirl
2009-05-14 1:59 ` [PATCH V1 13/13] Support for AC97 on Phytec pmc030 base board Jon Smirl
2009-05-14 2:03 ` [PATCH V1 00/13] mpc5200 audio rework for AC97 Jon Smirl
2009-05-14 3:34 ` Grant Likely
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=1242318341.31458.1786.camel@finisterre \
--to=broonie@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--cc=grant.likely@secretlab.ca \
--cc=jonsmirl@gmail.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.