fs/exec.c · cdf3487b2315dc944974a0dce6b902ec75599ec9 · scorpio / kernel

Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android · 4dddf720

Kevin Hilman authored Aug 14, 2015

 Conflicts:
	fs/exec.c

 Resolution summary:

    Conflict between upstream/LTS commit 9eae8ac6 (fs: take
    i_mutex during prepare_binprm for set[ug]id executables) and
    android commit 9d0ff694 (sched: move no_new_privs into new
    atomic flags).  Resolution: move task_no_new_privs() usage into
    new function created by upstream/LTS comit.

4dddf720

exec.c 39.8 KB

Replace exec.c