projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3a3b7ce
58e20d8
)
Merge branch 'master' into next
author
James Morris
<jmorris@namei.org>
Fri, 14 Nov 2008 00:29:12 +0000
(11:29 +1100)
committer
James Morris
<jmorris@namei.org>
Fri, 14 Nov 2008 00:29:12 +0000
(11:29 +1100)
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>
23 files changed:
1
2
Documentation/kernel-parameters.txt
patch
|
diff1
|
diff2
|
blob
|
history
fs/autofs4/dev-ioctl.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/ext4/ialloc.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/fat/file.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/fat/inode.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/namespace.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/nfsd/vfs.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/ocfs2/namei.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/sched.h
patch
|
diff1
|
diff2
|
blob
|
history
include/net/scm.h
patch
|
diff1
|
diff2
|
blob
|
history
kernel/cgroup.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/exit.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/sched.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/timer.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/trace/trace.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/workqueue.c
patch
|
diff1
|
diff2
|
blob
|
history
mm/mempolicy.c
patch
|
diff1
|
diff2
|
blob
|
history
mm/migrate.c
patch
|
diff1
|
diff2
|
blob
|
history
mm/oom_kill.c
patch
|
diff1
|
diff2
|
blob
|
history
net/9p/client.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/dev.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/scm.c
patch
|
diff1
|
diff2
|
blob
|
history
net/unix/af_unix.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/kernel-parameters.txt
Simple merge
diff --cc
fs/autofs4/dev-ioctl.c
Simple merge
diff --cc
fs/ext4/ialloc.c
Simple merge
diff --cc
fs/fat/file.c
Simple merge
diff --cc
fs/fat/inode.c
Simple merge
diff --cc
fs/namespace.c
Simple merge
diff --cc
fs/nfsd/vfs.c
Simple merge
diff --cc
fs/ocfs2/namei.c
Simple merge
diff --cc
include/linux/sched.h
Simple merge
diff --cc
include/net/scm.h
Simple merge
diff --cc
kernel/cgroup.c
Simple merge
diff --cc
kernel/exit.c
Simple merge
diff --cc
kernel/sched.c
Simple merge
diff --cc
kernel/timer.c
Simple merge
diff --cc
kernel/trace/trace.c
Simple merge
diff --cc
kernel/workqueue.c
Simple merge
diff --cc
mm/mempolicy.c
Simple merge
diff --cc
mm/migrate.c
Simple merge
diff --cc
mm/oom_kill.c
Simple merge
diff --cc
net/9p/client.c
Simple merge
diff --cc
net/core/dev.c
Simple merge
diff --cc
net/core/scm.c
Simple merge
diff --cc
net/unix/af_unix.c
Simple merge