forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
commit 2b82892565
538 changed files with 20119 additions and 5830 deletions
Download patch file Download diff file Expand all files Collapse all files

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