From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ingo Molnar Date: Tue, 19 Jan 2016 11:13:45 +0000 Subject: Re: [PATCH v4 10/11] dma: rename dma_*_writecombine() to dma_*_wc() Message-Id: <20160119111345.GA16880@gmail.com> List-Id: References: <1440443613-13696-1-git-send-email-mcgrof@do-not-panic.com> <1440443613-13696-11-git-send-email-mcgrof@do-not-panic.com> <20150825075318.GA2735@gmail.com> <20150825154837.GL8051@wotan.suse.de> <20150825134358.990073a55012c60a638b3144@linux-foundation.org> <20150825231912.GW8051@wotan.suse.de> <20150825162540.0591c8c8276b1ff279785e49@linux-foundation.org> <20150826042136.GA14584@gmail.com> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: "Luis R. Rodriguez" Cc: Julia Lawall , Andrew Morton , David Howells , Borislav Petkov , Bjorn Helgaas , Tomi Valkeinen , Dave Airlie , linux-fbdev , Andy Lutomirski , vinod.koul@intel.com, Dan Williams , Toshi Kani , Benjamin Herrenschmidt , "Michael S. Tsirkin" , Daniel Vetter , Konrad Rzeszutek Wilk , X86 ML , "linux-kernel@vger.kernel.org" , "linux-pci@vger.kernel.org" , "xen-devel@lists.xensource.com" * Luis R. Rodriguez wrote: > On Tue, Aug 25, 2015 at 9:21 PM, Ingo Molnar wrote: > > > > * Andrew Morton 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. > > Ingo, should we try this again some time? I have some ideas on how to > make these sorts of changes easier to manage in the future, it > involves having an automatic git rebase option to use Coccinelle for > you if a patch is annotated to have been completely done with > Coccinelle, but future tooling is needed for that [0]. In the meantime > I (or you) can simply run the script at any point in time to catch all > the names as-is in the kernel / point in time we decide to merge this > simple rename. > > [0] http://kernelnewbies.org/KernelProjects/linux-oven So beyond the rename, can we also keep the old names as compatibility helpers, with a #define mapping them to the new names? If so then please (re-)send the changes. Thanks, Ingo