linux-kernel - linux-next: manual merge of the akpm-current tree with Linus' 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>] [day] [month] [year] [list]

Date:	Tue, 29 Apr 2014 14:47:40 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Davidlohr Bueso <davidlohr@...com>,
	Linus <torvalds@...ux-foundation.org>
Subject: linux-next: manual merge of the akpm-current tree with Linus' tree

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
mm/vmacache.c between commit 50f5aa8a9b24 ("mm: don't pointlessly use
BUG_ON() for sanity check") from Linus' tree and commit 8beba5473820
("mm,vmacache: add debug data") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc mm/vmacache.c
index 1037a3bab505,61c38ae9f54b..000000000000
--- a/mm/vmacache.c
+++ b/mm/vmacache.c
@@@ -81,12 -93,11 +93,14 @@@ struct vm_area_struct *vmacache_find(st
  	for (i = 0; i < VMACACHE_SIZE; i++) {
  		struct vm_area_struct *vma = current->vmacache[i];
  
 -		if (vma && vma->vm_start <= addr && vma->vm_end > addr) {
 -			BUG_ON(vma->vm_mm != mm);
 +		if (!vma)
 +			continue;
 +		if (WARN_ON_ONCE(vma->vm_mm != mm))
 +			break;
- 		if (vma->vm_start <= addr && vma->vm_end > addr)
++		if (vma->vm_start <= addr && vma->vm_end > addr) {
+ 			count_vm_vmacache_event(VMACACHE_FIND_HITS);
  			return vma;
+ 		}
  	}
  
  	return NULL;

Content of type "application/pgp-signature" skipped