Linux Tegra architecture development
 help / color / mirror / Atom feed
From: Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [PATCH] ARM: tegra: Enable DMA CMA support
Date: Mon, 9 Sep 2013 15:04:39 +0200	[thread overview]
Message-ID: <20130909130438.GE22197@ulmo> (raw)
In-Reply-To: <522621A4.1040308-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>

[-- Attachment #1: Type: text/plain, Size: 1459 bytes --]

On Tue, Sep 03, 2013 at 11:51:32AM -0600, Stephen Warren wrote:
> On 09/03/2013 02:05 AM, Thierry Reding wrote:
> > Commit f825c73 ("mm/cma: Move dma contiguous changes into a seperate
> > config") renamed the CMA option to DMA_CMA but didn't update any default
> > configurations.
> > 
> > Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> > ---
> > Note that this should be applied after 3.12-rc1, since the above patch
> > will presumably go into 3.12 during the merge window.
> > 
> > Ideally this would've gone into the original commit and in fact digging
> > through some archives it turns out that an initial version of the patch
> > did modify the default configurations, but the hunks were dropped when
> > the patch was applied because of the potential for merge conflicts...
> 
> I think you should take this up with the original author/committer of
> the problematic patch. If they rename something, they have to deal with
> the fallout of the rename. If this causes merge conflicts, this is
> something Linus wants to see.
> 
> If not, feel free to forward this to arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org with my ack below at
> the appropriate time.
> Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

I brought up the issue in the pull request that contained the commit and
Linus fixed it up during the merge, so we shouldn't have any breakage.

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

      parent reply	other threads:[~2013-09-09 13:04 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-03  8:05 [PATCH] ARM: tegra: Enable DMA CMA support Thierry Reding
     [not found] ` <1378195505-28753-1-git-send-email-treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-09-03 17:51   ` Stephen Warren
     [not found]     ` <522621A4.1040308-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-09-09 13:04       ` Thierry Reding [this message]

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=20130909130438.GE22197@ulmo \
    --to=thierry.reding-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org \
    /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