linux

Files

Tejun Heo 959d851caa Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged

cgroup/for-3.5 contains the following changes which blk-cgroup needs
to proceed with the on-going cleanup.

* Dynamic addition and removal of cftypes to make config/stat file
  handling modular for policies.

* cgroup removal update to not wait for css references to drain to fix
  blkcg removal hang caused by cfq caching cfqgs.

Pull in cgroup/for-3.5 into block/for-3.5/core.  This causes the
following conflicts in block/blk-cgroup.c.

* 761b3ef50e "cgroup: remove cgroup_subsys argument from callbacks"
  conflicts with blkiocg_pre_destroy() addition and blkiocg_attach()
  removal.  Resolved by removing @subsys from all subsys methods.

* 676f7c8f84 "cgroup: relocate cftype and cgroup_subsys definitions in
  controllers" conflicts with ->pre_destroy() and ->attach() updates
  and removal of modular config.  Resolved by dropping forward
  declarations of the methods and applying updates to the relocated
  blkio_subsys.

* 4baf6e3325 "cgroup: convert all non-memcg controllers to the new
  cftype interface" builds upon the previous item.  Resolved by adding
  ->base_cftypes to the relocated blkio_subsys.

Signed-off-by: Tejun Heo <tj@kernel.org>

2012-04-01 12:55:00 -07:00

Merge tag 'for-linus-3.4-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

2012-03-28 09:58:38 -07:00

adfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

affs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

afs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

autofs4

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

befs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

bfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

btrfs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

2012-03-30 12:44:29 -07:00

cachefiles

switch touch_atime to struct path

2012-03-20 21:29:41 -04:00

ceph

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

2012-03-28 10:01:29 -07:00

cifs

[CIFS] Update CIFS version number to 1.77

2012-03-27 14:55:13 -05:00

coda

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

configfs

make configfs_pin_fs() return root dentry on success

2012-03-20 21:29:48 -04:00

cramfs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

debugfs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

devpts

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

dlm

Merge tag 'dlm-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

2012-03-21 13:54:22 -07:00

ecryptfs

ecryptfs: make register_filesystem() the last potential failure exit

2012-03-20 21:29:49 -04:00

efs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

exofs

Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

2012-03-28 20:04:27 -07:00

exportfs

…

ext2

migrate ext2_fs.h guts to fs/ext2/ext2.h

2012-03-31 16:03:16 -04:00

ext3

ext3: move headers to fs/ext3/

2012-03-31 16:03:16 -04:00

ext4

Revert "ext4: don't release page refs in ext4_end_bio()"

2012-03-29 17:00:56 -07:00

fat

fat: fix bug in enforcing Long File Name length

2012-03-23 16:58:40 -07:00

freevxfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

fscache

…

fuse

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

gfs2

get rid of pointless includes of ext2_fs.h

2012-03-31 16:03:15 -04:00

hfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

hfsplus

hfsplus: add an ioctl to bless files

2012-03-20 21:29:53 -04:00

hostfs

Merge branch 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

2012-03-27 18:29:53 -07:00

hpfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

hppfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

hugetlbfs

Merge branch 'akpm' (Andrew's patch-bomb)

2012-03-22 09:04:48 -07:00

isofs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

jbd

Merge tag 'pm-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2012-03-21 10:15:51 -07:00

jbd2

Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system

2012-03-28 15:58:21 -07:00

jffs2

Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

2012-03-30 17:31:56 -07:00

jfs

jfs: mising cleanup on register_filesystem() failure

2012-03-20 21:29:48 -04:00

lockd

Merge nfs containerization work from Trond's tree

2012-03-26 11:48:54 -04:00

logfs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

minix

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

ncpfs

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

nfs

Merge tag 'nfs-for-3.4-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

2012-03-28 19:02:35 -07:00

nfs_common

…

nfsd

Merge branch 'for-3.4' of git://linux-nfs.org/~bfields/linux

2012-03-29 14:53:25 -07:00

nilfs2

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

nls

…

notify

fs/notify/notification.c: make subsys_initcall function static

2012-03-23 16:58:31 -07:00

ntfs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

ocfs2

get rid of pointless includes of ext2_fs.h

2012-03-31 16:03:15 -04:00

omfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

openpromfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

proc

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

pstore

pstore: trim pstore_get_inode()

2012-03-31 16:03:15 -04:00

qnx4

qnx4: new helper - try_extent()

2012-03-20 21:29:52 -04:00

qnx6

fs: initial qnx6fs addition

2012-03-20 21:29:38 -04:00

quota

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

2012-03-28 10:00:14 -07:00

ramfs

tidy up after d_make_root() conversion

2012-03-20 21:29:37 -04:00

reiserfs

Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system

2012-03-28 15:58:21 -07:00

romfs

Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

2012-03-30 17:31:56 -07:00

squashfs

Merge tag 'squashfs-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next

2012-03-28 18:05:54 -07:00

sysfs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

sysv

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

ubifs

Merge tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubifs

2012-03-23 09:27:40 -07:00

udf

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

2012-03-28 10:00:14 -07:00

ufs

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

xfs

Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system

2012-03-28 15:58:21 -07:00

aio.c

aio: take final put_ioctx() into callers of io_destroy()

2012-03-31 16:03:15 -04:00

anon_inodes.c

anon_inodes: move allocation of anon_inode into ->mount()

2012-03-20 21:29:45 -04:00

attr.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

bad_inode.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

binfmt_aout.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

binfmt_elf_fdpic.c

Add #includes needed to permit the removal of asm/system.h

2012-03-28 18:30:03 +01:00

binfmt_elf.c

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

binfmt_em86.c

__register_binfmt() made void

2012-03-20 21:29:46 -04:00

binfmt_flat.c

Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system

2012-03-28 15:58:21 -07:00

binfmt_misc.c

magic.h: move some FS magic numbers into magic.h

2012-03-23 16:58:31 -07:00

binfmt_script.c

__register_binfmt() made void

2012-03-20 21:29:46 -04:00

binfmt_som.c

take removal of PF_FORKNOEXEC to flush_old_exec()

2012-03-20 21:29:51 -04:00

bio-integrity.c

fs: remove the second argument of k[un]map_atomic()

2012-03-20 21:48:21 +08:00

bio.c

Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged

2012-04-01 12:55:00 -07:00

block_dev.c

magic.h: move some FS magic numbers into magic.h

2012-03-23 16:58:31 -07:00

buffer.c

fs: only send IPI to invalidate LRU BH when needed

2012-03-28 17:14:35 -07:00

char_dev.c

char_dev.c: fix up some whitespace errors

2011-12-13 11:18:17 -08:00

compat_binfmt_elf.c

…

compat_ioctl.c

Merge tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2012-03-24 10:24:31 -07:00

compat.c

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

dcache.c

vfs: fix d_ancestor() case in d_materialize_unique

2012-03-28 09:54:34 -07:00

dcookies.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

direct-io.c

Restore direct_io / truncate locking API

2012-02-23 15:56:21 -08:00

drop_caches.c

…

eventfd.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

eventpoll.c

Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system

2012-03-28 15:58:21 -07:00

exec.c

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

fcntl.c

Wrap accesses to the fd_sets in struct fdtable

2012-02-19 10:30:52 -08:00

fhandle.c

vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb

2012-01-06 23:16:53 -05:00

fifo.c

…

file_table.c

vfs: drop_file_write_access() made static

2012-03-20 21:29:32 -04:00

file.c

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

filesystems.c

vfs: convert fs_supers to hlist

2012-01-03 22:52:39 -05:00

fs_struct.c

Merge tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2012-03-24 10:24:31 -07:00

fs-writeback.c

Merge tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux

2012-03-28 10:07:27 -07:00

generic_acl.c

…

inode.c

trim includes in inode.c

2012-03-20 21:29:51 -04:00

internal.h

vfs: protect remounting superblock read-only

2012-01-06 23:20:12 -05:00

ioctl.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

ioprio.c

block: remove ioc_*_changed()

2012-03-20 12:47:48 +01:00

Kconfig

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

Kconfig.binfmt

fs: binfmt_elf: create Kconfig variable for PIE randomization

2012-01-10 16:30:51 -08:00

libfs.c

Merge tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2012-03-24 10:24:31 -07:00

locks.c

vfs: fix handling of lock allocation failure in lease-break case

2011-12-26 10:25:26 -08:00

Makefile

fs: initial qnx6fs addition

2012-03-20 21:29:38 -04:00

mbcache.c

…

mount.h

vfs: keep list of mounts for each superblock

2012-01-06 23:20:12 -05:00

mpage.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

namei.c

vfs: fix out-of-date dentry_unhash() comment

2012-03-31 16:03:17 -04:00

namespace.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-01-08 13:21:22 -08:00

no-block.c

…

open.c

Wrap accesses to the fd_sets in struct fdtable

2012-02-19 10:30:52 -08:00

pipe.c

magic.h: move some FS magic numbers into magic.h

2012-03-23 16:58:31 -07:00

pnode.c

vfs: switch pnode.h macros to struct mount *

2012-01-03 22:57:11 -05:00

pnode.h

vfs: switch pnode.h macros to struct mount *

2012-01-03 22:57:11 -05:00

posix_acl.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

proc_namespace.c

vfs: switch ->show_options() to struct dentry *

2012-01-06 23:19:54 -05:00

read_write.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

read_write.h

…

readdir.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

select.c

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

seq_file.c

Merge tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2012-03-24 10:24:31 -07:00

signalfd.c

epoll: ep_unregister_pollwait() can use the freed pwq->whead

2012-02-24 11:42:50 -08:00

splice.c

Merge tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2012-03-24 10:24:31 -07:00

stack.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

stat.c

Merge tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2012-03-24 10:24:31 -07:00

statfs.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

super.c

Merge tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2012-03-24 10:24:31 -07:00

sync.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

timerfd.c

…

utimes.c

…

xattr_acl.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

xattr.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00