Merge branch 'userprog-merge' into 'master'

Update variable references between conflicting merges to refer to the same...

See merge request lab2425_autumn/pintos_22!35

src/userprog/process.c

@@ -137,7 +137,10 @@ start_process (void *proc_start_data)
       goto fail;
     }
 
-  struct file *exec_file = filesys_open (file_name);
+  /* NOTE: Currently, the file being executed is closed in load () and then 
+           reopened here. Because load is an exported public function, this
+           might be necessary. */
+  struct file *exec_file = filesys_open (data->file_name);
   thread_current ()->exec_file = exec_file;
   file_deny_write (exec_file);