From: Ingo Molnar <mingo@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Luis R. Rodriguez" <mcgrof@suse.com>,
David Howells <dhowells@redhat.com>,
"Luis R. Rodriguez" <mcgrof@do-not-panic.com>,
bp@suse.de, bhelgaas@google.com, tomi.valkeinen@ti.com,
airlied@linux.ie, linux-fbdev@vger.kernel.org,
luto@amacapital.net, vinod.koul@intel.com,
dan.j.williams@intel.com, toshi.kani@hp.com,
benh@kernel.crashing.org, mst@redhat.com, daniel.vetter@ffwll.ch,
konrad.wilk@oracle.com, x86@kernel.org,
linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
xen-devel@lists.xensource.com
Subject: Re: [PATCH v4 10/11] dma: rename dma_*_writecombine() to dma_*_wc()
Date: Wed, 26 Aug 2015 04:21:36 +0000 [thread overview]
Message-ID: <20150826042136.GA14584@gmail.com> (raw)
In-Reply-To: <20150825162540.0591c8c8276b1ff279785e49@linux-foundation.org>
* Andrew Morton <akpm@linux-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
next prev parent reply other threads:[~2015-08-26 4:21 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-24 19:13 [PATCH v4 00/11] x86/dma: RIP MTRR and dma write-combine API rename Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 01/11] PCI: Add pci_ioremap_wc_bar() Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 02/11] drivers/video/fbdev/i740fb: Use arch_phys_wc_add() and pci_ioremap_wc_bar() Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 03/11] drivers/video/fbdev/kyrofb: " Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 04/11] drivers/video/fbdev/gxt4500: Use pci_ioremap_wc_bar() to map framebuffer Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 05/11] PCI: Add pci_iomap_wc() variants Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 06/11] drivers/video/fbdev/arkfb.c: Use arch_phys_wc_add() and pci_iomap_wc() Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 07/11] drivers/video/fbdev/s3fb: " Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 08/11] drivers/video/fbdev/vt8623fb: " Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 09/11] drivers/dma/iop-adma: Use dma_alloc_writecombine() kernel-style Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 10/11] dma: rename dma_*_writecombine() to dma_*_wc() Luis R. Rodriguez
2015-08-25 7:53 ` Ingo Molnar
2015-08-25 15:48 ` Luis R. Rodriguez
2015-08-25 20:43 ` Andrew Morton
2015-08-25 23:19 ` Luis R. Rodriguez
2015-08-25 23:25 ` Andrew Morton
2015-08-26 4:21 ` Ingo Molnar [this message]
2016-01-15 18:24 ` Luis R. Rodriguez
2016-01-19 11:13 ` Ingo Molnar
2016-01-23 2:34 ` [PATCH v5] " Luis R. Rodriguez
2015-08-25 15:53 ` [PATCH v5 10/11] " Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 11/11] mtrr: bury MTRR - unexport mtrr_add() and mtrr_del() Luis R. Rodriguez
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=20150826042136.GA14584@gmail.com \
--to=mingo@kernel.org \
--cc=airlied@linux.ie \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=bp@suse.de \
--cc=dan.j.williams@intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dhowells@redhat.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mcgrof@do-not-panic.com \
--cc=mcgrof@suse.com \
--cc=mst@redhat.com \
--cc=tomi.valkeinen@ti.com \
--cc=toshi.kani@hp.com \
--cc=vinod.koul@intel.com \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xensource.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).