From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932195AbcCJUiS (ORCPT ); Thu, 10 Mar 2016 15:38:18 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:56550 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932120AbcCJUiP (ORCPT ); Thu, 10 Mar 2016 15:38:15 -0500 Date: Thu, 10 Mar 2016 12:38:14 -0800 From: Andrew Morton To: Ingo Molnar Cc: Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" Subject: Re: linux-next: manual merge of the akpm tree with the tip tree Message-Id: <20160310123814.3225ce5fb9fdbf8a01c920af@linux-foundation.org> In-Reply-To: <20160310080025.GA8618@gmail.com> References: <20160310162856.3330418f@canb.auug.org.au> <20160310080025.GA8618@gmail.com> 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 On Thu, 10 Mar 2016 09:00:25 +0100 Ingo Molnar wrote: > > * Stephen Rothwell wrote: > > > Hi Andrew, > > > > Today's linux-next merge of the akpm tree got a conflict in: > > > > drivers/gpu/drm/omapdrm/omap_gem.c > > > > between commit: > > > > f6e45661f9be ("dma, mm/pat: Rename dma_*_writecombine() to dma_*_wc()") > > > > from the tip tree and patch: > > > > "dma-mapping: rename dma_*_writecombine() to dma_*_wc()" > > > > from the akpm tree. > > > > These a basically the same patch, so I dropped the one from the akpm tree. > > Andrew, what's your preference for merging it? I can drop it too. > I've dropped the -mm copy. That's what I do in 99.99% of cases. Which means that if the version which was in someone else's -next tree later gets lost (happens sometimes), the patch is lost altogether.