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@xxxxxxxxxx>
> > ---
> > 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@xxxxxxxxxx with my ack below at
> the appropriate time.
> Acked-by: Stephen Warren <swarren@xxxxxxxxxx>
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:
pgpyDIdusQup4.pgp
Description: PGP signature
