Re: [GIT PULL] Audit subsystem for v3.15

On Thu, Apr 10, 2014 at 4:53 PM, Eric Paris wrote: > > Please pull the audit tree for v3.15. You will have merge conflicts. The merge conflicts were easy to resolve. I appreciate you spending the time to explain them, but quite frankly, I can figure out trivial ones on my own. What I really real

Re: [GIT PULL] Audit subsystem for v3.15

My tree is fine, your tree is fine, but the merge (even if you solve the conflicts) has a build failure on MIPS just discovered when I published by 'merge-test' branch because of the syscall_get_arch(void) changes. (thanks to the kbuild test robot) attached is my solution which I just sent to the

[GIT PULL] Audit subsystem for v3.15

Linus, Please pull the audit tree for v3.15. You will have merge conflicts. I'll publish my branch "merge-test" where I attempted to resolve them the way you will. The main issue is an across tree change to syscall_get_arch(). I change it from taking a task_struct and pt_regs to take a void. N