Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756086AbbHYUoD (ORCPT ); Tue, 25 Aug 2015 16:44:03 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:35932 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755944AbbHYUn7 (ORCPT ); Tue, 25 Aug 2015 16:43:59 -0400 Date: Tue, 25 Aug 2015 13:43:58 -0700 From: Andrew Morton To: "Luis R. Rodriguez" Cc: Ingo Molnar , "Luis R. Rodriguez" , 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() Message-Id: <20150825134358.990073a55012c60a638b3144@linux-foundation.org> In-Reply-To: <20150825154837.GL8051@wotan.suse.de> 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> X-Mailer: Sylpheed 3.4.1 (GTK+ 2.24.23; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 829 Lines: 21 On Tue, 25 Aug 2015 17:48:37 +0200 "Luis R. Rodriguez" wrote: > On Tue, Aug 25, 2015 at 09:53:18AM +0200, Ingo Molnar wrote: > > Which kernel is this against? It has conflicts in 3 files with Linus's latest: > > v4.2-rc8. > > Sorry I based it on linux-next, will respin the rename patch onto tip/auto-latest > Doing that will make the patch kinda useless, because then the patch will trash more mature work which is pending in linux-next, one week before the merge window opens. A better plan would be to base the patches on linux-next then wait for 4.3-rc1. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/