A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'next' into for-linus

Browse source 
Conflicts:
	security/integrity/evm/evm_crypto.c

Resolved upstream fix vs. next conflict manually.

Signed-off-by: James Morris <[email protected]>
This commit is contained in:
James Morris 2012-01-09 12:16:48 +11:00
commit 8fcc995495
59 changed files with 7026 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

2
security/tomoyo/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
builtin-policy.h
policy/

2
security/tomoyo/common.h
View file

@ -1122,7 +1122,7 @@ static inline pid_t tomoyo_sys_getppid(void)
{
pid_t pid;
rcu_read_lock();
pid = task_tgid_vnr(current->real_parent);
pid = task_tgid_vnr(rcu_dereference(current->real_parent));
rcu_read_unlock();
return pid;
}