OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c1b8940
e2e40f2
)
Merge branch 'iocb' into for-next
author
Al Viro
<viro@zeniv.linux.org.uk>
Sun, 12 Apr 2015 02:24:41 +0000
(22:24 -0400)
committer
Al Viro
<viro@zeniv.linux.org.uk>
Sun, 12 Apr 2015 02:24:41 +0000
(22:24 -0400)
20 files changed:
1
2
arch/s390/hypfs/inode.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/hw/qib/qib_file_ops.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/sg.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/aio.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/btrfs/file.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/btrfs/inode.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/ceph/file.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/ecryptfs/file.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/ext4/indirect.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/ext4/inode.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/fuse/dev.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/nfs/direct.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/nfs/file.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/ntfs/file.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/xfs/xfs_file.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/fs.h
patch
|
diff1
|
diff2
|
blob
|
history
kernel/printk/printk.c
patch
|
diff1
|
diff2
|
blob
|
history
mm/shmem.c
patch
|
diff1
|
diff2
|
blob
|
history
net/socket.c
patch
|
diff1
|
diff2
|
blob
|
history
sound/core/pcm_native.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/s390/hypfs/inode.c
Simple merge
diff --cc
drivers/infiniband/hw/qib/qib_file_ops.c
Simple merge
diff --cc
drivers/scsi/sg.c
Simple merge
diff --cc
fs/aio.c
Simple merge
diff --cc
fs/btrfs/file.c
Simple merge
diff --cc
fs/btrfs/inode.c
Simple merge
diff --cc
fs/ceph/file.c
Simple merge
diff --cc
fs/ecryptfs/file.c
Simple merge
diff --cc
fs/ext4/indirect.c
Simple merge
diff --cc
fs/ext4/inode.c
Simple merge
diff --cc
fs/fuse/dev.c
Simple merge
diff --cc
fs/nfs/direct.c
Simple merge
diff --cc
fs/nfs/file.c
Simple merge
diff --cc
fs/ntfs/file.c
Simple merge
diff --cc
fs/xfs/xfs_file.c
index
a2e1cb8
,
f527618
..
f44212f
---
1
/
fs/xfs/xfs_file.c
---
2
/
fs/xfs/xfs_file.c
+++ b/
fs/xfs/xfs_file.c
@@@
-36,9
-36,7
+36,8
@@@
#include "xfs_trace.h"
#include "xfs_log.h"
#include "xfs_icache.h"
+#include "xfs_pnfs.h"
- #include <linux/aio.h>
#include <linux/dcache.h>
#include <linux/falloc.h>
#include <linux/pagevec.h>
diff --cc
include/linux/fs.h
Simple merge
diff --cc
kernel/printk/printk.c
Simple merge
diff --cc
mm/shmem.c
Simple merge
diff --cc
net/socket.c
Simple merge
diff --cc
sound/core/pcm_native.c
Simple merge