[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150826042136.GA14584@gmail.com>
Date: Wed, 26 Aug 2015 06:21:36 +0200
From: Ingo Molnar <mingo@...nel.org>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: "Luis R. Rodriguez" <mcgrof@...e.com>,
David Howells <dhowells@...hat.com>,
"Luis R. Rodriguez" <mcgrof@...not-panic.com>, bp@...e.de,
bhelgaas@...gle.com, tomi.valkeinen@...com, airlied@...ux.ie,
linux-fbdev@...r.kernel.org, luto@...capital.net,
vinod.koul@...el.com, dan.j.williams@...el.com, toshi.kani@...com,
benh@...nel.crashing.org, mst@...hat.com, daniel.vetter@...ll.ch,
konrad.wilk@...cle.com, x86@...nel.org,
linux-kernel@...r.kernel.org, linux-pci@...r.kernel.org,
xen-devel@...ts.xensource.com
Subject: Re: [PATCH v4 10/11] dma: rename dma_*_writecombine() to dma_*_wc()
* Andrew Morton <akpm@...ux-foundation.org> wrote:
> > There's a catch-22 issue here either way, for instance this rename patch has
> > been being baked for probably 2 releases already but the difficulty has been
> > trying to find the appropriate time to merge it without conflict.
> >
> > If you do it in the beginning of the merge window, you have to ask yourself in
> > what tree it will be done. Since subsystems are topic specific that means that
> > subsystem will end up having a conflict at the end of the merge window.
>
> Yes it's a special case. I think the best way of handling such things is to get
> them in to Linus either right at the end of the merge window or the day after he
> releases -rc1. This is when most people's trees are mostly empty.
Yes, that was the plan last time around as well - but the end of the merge window
is when we have the least maintainer bandwidth as well ...
Anyway, I applied most of the patches (sans the rename), so the rename patch
should be a lot simpler to execute at the right moment this time around.
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists