Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: mm/mmap.c between commit: 490fc053865c ("mm: make vm_area_alloc() initialize core fields") from Linus' tree and commit: 97478b56e246 ("mm: Fix vma_is_anonymous() false-positives") from the akpm-current tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc mm/mmap.c index ff1944d8d458,b9636fa18f3c..000000000000 --- a/mm/mmap.c +++ b/mm/mmap.c @@@ -2983,6 -3001,9 +2994,7 @@@ static int do_brk_flags(unsigned long a return -ENOMEM; } - INIT_LIST_HEAD(&vma->anon_vma_chain); - vma->vm_mm = mm; + vma->vm_ops = &anon_vm_ops; vma->vm_start = addr; vma->vm_end = addr + len; vma->vm_pgoff = pgoff;
Attachment:
pgpltev3uWL1A.pgp
Description: OpenPGP digital signature