linux-next: manual merge of the akpm tree with the vfs tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in mm/nommu.c
between commit f9bd4f3ed24d ("make get_file() return its argument") from
the vfs tree and commit "mm: kill vma flag VM_EXECUTABLE and
mm->num_exe_file_vmas" from the akpm tree.

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

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc mm/nommu.c
index 98318dc,5583325..0000000
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@@ -1282,12 -1279,10 +1279,8 @@@ unsigned long do_mmap_pgoff(struct fil
        vma->vm_pgoff = pgoff;
  
        if (file) {
 -              region->vm_file = file;
 -              get_file(file);
 -              vma->vm_file = file;
 -              get_file(file);
 +              region->vm_file = get_file(file);
 +              vma->vm_file = get_file(file);
-               if (vm_flags & VM_EXECUTABLE) {
-                       added_exe_file_vma(current->mm);
-                       vma->vm_mm = current->mm;
-               }
        }
  
        down_write(&nommu_region_sem);

pgpUAdJEc6eq6.pgp
Description: PGP signature