Merge branch 'for-next' into for-linus

2026-10-16 22:39:48 +00:00 · 2013-09-12 17:54:48 -04:00 · 2013-09-12 17:54:48 -04:00 · bf2ba3bc18
commit bf2ba3bc18
parent bcceeeba9b f5e1dd3456
54 changed files with 1755 additions and 1129 deletions
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
--- a/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
--- a/drivers/md/bcache/sysfs.c
+++ b/drivers/md/bcache/sysfs.c
--- a/drivers/md/dm-bufio.c
+++ b/drivers/md/dm-bufio.c
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
--- a/drivers/staging/lustre/lustre/obdclass/lu_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/lu_object.c
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
--- a/fs/dcache.c
+++ b/fs/dcache.c
--- a/fs/drop_caches.c
+++ b/fs/drop_caches.c
--- a/fs/ext4/extents_status.c
+++ b/fs/ext4/extents_status.c
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
--- a/fs/gfs2/main.c
+++ b/fs/gfs2/main.c
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
--- a/fs/gfs2/quota.h
+++ b/fs/gfs2/quota.h
--- a/fs/inode.c
+++ b/fs/inode.c
--- a/fs/internal.h
+++ b/fs/internal.h
--- a/fs/mbcache.c
+++ b/fs/mbcache.c
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
--- a/fs/super.c
+++ b/fs/super.c
--- a/fs/ubifs/shrinker.c
+++ b/fs/ubifs/shrinker.c
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
--- a/fs/xfs/xfs_buf.h
+++ b/fs/xfs/xfs_buf.h
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
--- a/fs/xfs/xfs_icache.h
+++ b/fs/xfs/xfs_icache.h
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
--- a/fs/xfs/xfs_qm.h
+++ b/fs/xfs/xfs_qm.h
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/list_lru.h
+++ b/include/linux/list_lru.h
--- a/include/linux/shrinker.h
+++ b/include/linux/shrinker.h
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
--- a/include/uapi/linux/fs.h
+++ b/include/uapi/linux/fs.h
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
--- a/mm/Makefile
+++ b/mm/Makefile
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
--- a/mm/list_lru.c
+++ b/mm/list_lru.c
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c