xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
Conflicts:
	security/keys/internal.h
	security/keys/process_keys.c
	security/keys/request_key.c

Fixed conflicts above by using the non 'tsk' versions.

Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
James Morris
2008-11-14 11:29:12 +11:00
parent 3a3b7ce933 58e20d8d34
commit 2b82892565
538 changed files with 20119 additions and 5830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/af_unix.h
View File

@@ -54,6 +54,7 @@ struct unix_sock {
atomic_long_t inflight;
spinlock_t lock;
unsigned int gc_candidate : 1;
unsigned int gc_maybe_cycle : 1;
wait_queue_head_t peer_wait;
};
#define unix_sk(__sk) ((struct unix_sock *)__sk)

5
include/net/scm.h
View File

@@ -14,8 +14,9 @@
struct scm_fp_list
{
int count;
struct file *fp[SCM_MAX_FD];
struct list_head list;
int count;
struct file *fp[SCM_MAX_FD];
};
struct scm_cookie