linux-kernel - Re: linux-next: manual merge of the akpm tree with the tip tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20160310123814.3225ce5fb9fdbf8a01c920af@linux-foundation.org>
Date:	Thu, 10 Mar 2016 12:38:14 -0800
From:	Andrew Morton <akpm@...ux-foundation.org>
To:	Ingo Molnar <mingo@...nel.org>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Luis R. Rodriguez" <mcgrof@...e.com>
Subject: Re: linux-next: manual merge of the akpm tree with the tip tree

On Thu, 10 Mar 2016 09:00:25 +0100 Ingo Molnar <mingo@...nel.org> wrote:

> 
> * Stephen Rothwell <sfr@...b.auug.org.au> 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.