github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
2ce503ed6b
linux/fs
History
黄涛 7fe47454f2 lsk-android 14.04 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTWERtAAoJELSic+t+oim9JWYP/0QCExvsT5PIzWueVqblD8Kz
 QlJ/fnFd5xHlVUtF7EJJHlJP6psANlF3ol7UJSofS+V7DFKKU460c5qEqC6XpuXD
 9JdAByrHBfxhOolg0BCSTqSEM7KoZE6LDuEN+ZcDvR5mplHOfTPdtQIjNt2ZQ1A4
 IToz1gAc8yZLzsBSBY7lijLZ3cZAXG3EFwi6imHgdBn2YfK2W/A4qjVTOSdV/ntq
 ISSHDN30EI0dcJJP74pzP5c7S5M9liMDVaEwvzs9+8jYO7TkMqsUz37d2d1u91av
 HyXKMjp07dO4Ym0/iaONv44c3tmVfHrnJDTLZHU2V142KPgpmoplbvouqb9i6DmM
 Euv20a5f8IridDPsIYk1nfmMOP42DVeND2YGgdUFOvSMThE2S5dfhOSgxHeHqXms
 LKXC9ocYYugzDi8rwSCr85K/3rTueR9GUL5730W5ObEq/A8MladQSxtqybroE3uP
 VctJOlrLU2mxfzYU99pybU9CmUz5aZRQP0IUVUgRwK+NxpLhYevhbc22oOR8F/Fu
 qJ9sqNDohHWKH8MCN1NVfsad1CmefQbl5STffQuu1GpRx7elV+/Ri39P6J/0m1UI
 rNbTpGxhHD+0nEMCuxqMS/sknV/vIz4ht9WCAUTcLyUIaFiuihzWnaVo2n3//nDp
 hwg7gOS0O3m0VWxhSh9U
 =+kRa
 -----END PGP SIGNATURE-----

Merge tag 'lsk-android-14.04' into develop-3.10

lsk-android 14.04

Conflicts:
	Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
	drivers/pinctrl/pinconf-generic.c
	include/linux/pinctrl/consumer.h
	include/linux/pinctrl/pinconf-generic.h
2014-04-24 19:04:10 +08:00
..
9p rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
adfs fs: Limit sys_mount to only request filesystem modules. 2013-03-03 19:36:31 -08:00
affs fs: Limit sys_mount to only request filesystem modules. 2013-03-03 19:36:31 -08:00
afs rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
autofs4 rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
befs rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
bfs fs: Limit sys_mount to only request filesystem modules. 2013-03-03 19:36:31 -08:00
btrfs Btrfs: fix data corruption when reading/updating compressed extents 2014-03-23 21:38:20 -07:00
cachefiles lift sb_start_write() out of ->write() 2013-04-09 14:12:56 -04:00
ceph ceph: allow sync_read/write return partial successed size of read/write. 2014-01-09 12:24:25 -08:00
cifs Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-03-09 07:33:42 +00:00
coda lift sb_start_write() out of ->write() 2013-04-09 14:12:56 -04:00
configfs configfs: fix race between dentry put and lookup 2013-11-29 11:11:53 -08:00
cramfs rk: temp revert rk change 2013-11-08 21:33:42 +08:00
debugfs debugfs: debugfs_remove_recursive() must not rely on list_empty(d_subdirs) 2013-08-14 22:59:10 -07:00
devpts devpts: plug the memory leak in kill_sb 2013-12-04 10:55:49 -08:00
dlm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2013-05-01 14:08:52 -07:00
ecryptfs ecryptfs: Fix memory leakage in keystore.c 2013-11-13 12:05:31 +09:00
efivarfs efivarfs: Never return ENOENT from firmware again 2013-05-13 20:12:10 +01:00
efs fs: Limit sys_mount to only request filesystem modules. 2013-03-03 19:36:31 -08:00
exofs ore: Fix wrong math in allocation of per device BIO 2014-02-13 13:48:00 -08:00
exportfs hlist: drop the node parameter from iterators 2013-02-27 19:10:24 -08:00
ext2 aio: don't include aio.h in sched.h 2013-05-07 20:16:25 -07:00
ext3 rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
ext4 ext4: atomically set inode->i_flags in ext4_set_inode_flags() 2014-04-03 12:01:04 -07:00
f2fs f2fs updates for v3.10 2013-05-08 15:11:48 -07:00
fat rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
freevxfs fs: Readd the fs module aliases. 2013-03-12 18:55:21 -07:00
fscache fs/fscache/stats.c: fix memory leak 2013-04-29 15:54:27 -07:00
fuse Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-02-14 12:15:57 +00:00
gfs2 GFS2: Increase i_writecount during gfs2_setattr_chown 2014-01-25 08:27:11 -08:00
hfs rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
hfsplus rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
hostfs hostfs: use kmalloc instead of kzalloc 2013-05-04 15:48:45 -04:00
hpfs hpfs: better test for errors 2013-07-13 11:42:26 -07:00
hppfs rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
hugetlbfs rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
isofs rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
jbd rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
jbd2 jbd2: don't BUG but return ENOSPC if a handle runs out of space 2014-01-09 12:24:24 -08:00
jffs2 rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
jfs jfs: fix error path in ialloc 2013-11-13 12:05:31 +09:00
lockd lockd: send correct lock when granting a delayed lock. 2014-02-22 12:41:27 -08:00
logfs block: Remove bi_idx references 2013-03-23 14:15:31 -07:00
minix fs: Limit sys_mount to only request filesystem modules. 2013-03-03 19:36:31 -08:00
ncpfs ncpfs: fix rmdir returns Device or resource busy 2013-06-07 12:15:38 -04:00
nfs Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-03-28 11:07:37 +08:00
nfs_common nfs_common: Update the translation between nfsv3 acls linux posix acls 2013-02-13 06:15:14 -08:00
nfsd nfsd: when reusing an existing repcache entry, unhash it first 2013-12-20 07:45:08 -08:00
nilfs2 nilfs2: fix segctor bug that causes file system corruption 2014-01-25 08:27:12 -08:00
nls rk: temp revert rk change 2013-11-08 21:33:42 +08:00
notify compat: fix sys_fanotify_mark 2014-02-13 13:48:00 -08:00
ntfs aio: don't include aio.h in sched.h 2013-05-07 20:16:25 -07:00
ocfs2 ocfs2 syncs the wrong range... 2014-03-23 21:38:09 -07:00
omfs fs: Limit sys_mount to only request filesystem modules. 2013-03-03 19:36:31 -08:00
openpromfs fs: Limit sys_mount to only request filesystem modules. 2013-03-03 19:36:31 -08:00
proc lsk-android 14.04 2014-04-24 19:04:10 +08:00
pstore Couple of pstore cleanups 2013-05-09 16:42:10 -07:00
qnx4 fs: Limit sys_mount to only request filesystem modules. 2013-03-03 19:36:31 -08:00
qnx6 qnx6: qnx6_readdir() has a braino in pos calculation 2013-05-31 15:17:31 -04:00
quota quota: Fix race between dqput() and dquot_scan_active() 2014-03-06 21:30:12 -08:00
ramfs rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
reiserfs rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
romfs romfs: fix nommu map length to keep inside filesystem 2013-04-29 09:17:57 +10:00
squashfs rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
sysfs rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
sysv sysv: Add forgotten superblock lock init for v7 fs 2013-10-05 07:13:09 -07:00
ubifs rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
udf rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
ufs Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2013-04-30 09:36:50 -07:00
xfs xfs: underflow bug in xfs_attrlist_by_handle() 2013-12-20 07:45:08 -08:00
aio.c aio: restore locking of ioctx list on removal 2013-12-08 07:29:27 -08:00
anon_inodes.c get_empty_filp()/alloc_file() leave both ->f_pos and ->f_version zero 2013-02-26 02:46:11 -05:00
attr.c fs: fix iversion handling 2014-03-06 21:30:06 -08:00
bad_inode.c
binfmt_aout.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2013-05-01 17:51:54 -07:00
binfmt_elf_fdpic.c Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2013-05-02 10:16:16 -07:00
binfmt_elf.c rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
binfmt_em86.c
binfmt_flat.c new helper: read_code() 2013-04-29 15:40:23 -04:00
binfmt_misc.c rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
binfmt_script.c rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
binfmt_som.c
bio-integrity.c bio-integrity: Fix bio_integrity_verify segment start bug 2014-03-23 21:38:21 -07:00
bio.c block: Fix bio_copy_data() 2013-10-05 07:13:09 -07:00
block_dev.c rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
buffer.c mm: __set_page_dirty uses spin_lock_irqsave instead of spin_lock_irq 2014-02-20 11:06:11 -08:00
char_dev.c
compat_binfmt_elf.c
compat_ioctl.c rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
compat.c rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
coredump.c do_coredump(): don't wait for thaw if coredump has already been interrupted 2013-05-04 14:45:54 -04:00
coredump.h
dcache.c vfs: In d_path don't call d_dname on a mount point 2014-01-25 08:27:11 -08:00
dcookies.c fs/compat: fix lookup_dcookie() parameter handling 2014-02-13 13:48:00 -08:00
direct-io.c Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block 2013-05-08 10:13:35 -07:00
drop_caches.c
eventfd.c
eventpoll.c epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled 2013-11-25 11:05:09 -08:00
exec.c exec/ptrace: fix get_dumpable() incorrect tests 2013-11-29 11:11:44 -08:00
fcntl.c new helper: file_inode(file) 2013-02-22 23:31:31 -05:00
fhandle.c
file_table.c fput: task_work_add() can fail if the caller has passed exit_task_work() 2013-06-15 05:39:08 +04:00
file.c fs/file.c:fdtable: avoid triggering OOMs from alloc_fdmem 2014-02-22 12:41:25 -08:00
filesystems.c fs: Limit sys_mount to only request filesystem modules. 2013-03-03 19:36:31 -08:00
fs_struct.c constify path_get/path_put and fs_struct.c stuff 2013-03-01 23:51:07 -05:00
fs-writeback.c Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-01-27 14:57:42 +00:00
generic_acl.c
inode.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2013-05-01 17:51:54 -07:00
internal.h splice: don't pass the address of ->f_pos to methods 2013-06-20 19:02:45 +04:00
ioctl.c new helper: file_inode(file) 2013-02-22 23:31:31 -05:00
ioprio.c
Kconfig rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
Kconfig.binfmt fs: make binfmt support for #! scripts modular and removable 2013-04-30 17:04:04 -07:00
libfs.c
locks.c rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
Makefile rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
mbcache.c
mount.h vfs: Is mounted should be testing mnt_ns for NULL or error. 2014-02-06 11:08:16 -08:00
mpage.c
namei.c Fix mountpoint reference leakage in linkat 2014-03-23 21:38:20 -07:00
namespace.c rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
no-block.c
open.c rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
pipe.c vfs: fix subtle use-after-free of pipe_inode_info 2013-12-11 22:36:26 -08:00
pnode.c vfs: Fix invalid ida_remove() call 2013-05-31 15:16:33 -04:00
pnode.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2013-05-01 17:51:54 -07:00
posix_acl.c
proc_namespace.c
read_write.c fs/compat: fix parameter handling for compat readv/writev syscalls 2014-02-13 13:48:00 -08:00
readdir.c new helper: file_inode(file) 2013-02-22 23:31:31 -05:00
select.c select: use freezable blocking call 2013-07-01 15:45:28 -07:00
seq_file.c seq_file: always update file->f_pos in seq_lseek() 2013-11-13 12:05:34 +09:00
signalfd.c rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
splice.c fuse: fix pipe_buf_operations 2014-02-13 13:47:59 -08:00
stack.c
stat.c rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
statfs.c rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
super.c rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00
sync.c teach SYSCALL_DEFINE<n> how to deal with long long/unsigned long long 2013-03-03 22:46:22 -05:00
timerfd.c timerfd: support CLOCK_BOOTTIME clock 2013-12-13 23:04:58 +00:00
utimes.c
xattr_acl.c
xattr.c