You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux ... * 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits) Revert "tracing: Include module.h in define_trace.h" irq: don't put module.h into irq.h for tracking irqgen modules. bluetooth: macroize two small inlines to avoid module.h ip_vs.h: fix implicit use of module_get/module_put from module.h nf_conntrack.h: fix up fallout from implicit moduleparam.h presence include: replace linux/module.h with "struct module" wherever possible include: convert various register fcns to macros to avoid include chaining crypto.h: remove unused crypto_tfm_alg_modname() inline uwb.h: fix implicit use of asm/page.h for PAGE_SIZE pm_runtime.h: explicitly requires notifier.h linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h miscdevice.h: fix up implicit use of lists and types stop_machine.h: fix implicit use of smp.h for smp_processor_id of: fix implicit use of errno.h in include/linux/of.h of_platform.h: delete needless include <linux/module.h> acpi: remove module.h include from platform/aclinux.h miscdevice.h: delete unnecessary inclusion of module.h device_cgroup.h: delete needless include <linux/module.h> net: sch_generic remove redundant use of <linux/module.h> net: inet_timewait_sock doesnt need <linux/module.h> ... Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in - drivers/media/dvb/frontends/dibx000_common.c - drivers/media/video/{mt9m111.c,ov6650.c} - drivers/mfd/ab3550-core.c - include/linux/dmaengine.h		13 years ago
..
cluster	fs: add export.h to files using EXPORT_SYMBOL/THIS_MODULE macros	13 years ago
dlm	fs: add export.h to files using EXPORT_SYMBOL/THIS_MODULE macros	13 years ago
dlmfs	ocfs2: change incorrect 'extern' keyword to 'static' in dlmfs	14 years ago
Kconfig	ocfs2: Make OCFS2_FS depend on CONFIGFS_FS	14 years ago
Makefile	Ocfs2/move_extents: Add basic framework and source files for extent moving.	14 years ago
acl.c	switch posix_acl_equiv_mode() to umode_t *	14 years ago
acl.h	fs: take the ACL checks to common code	14 years ago
alloc.c	ocfs2: Add trace event for trim.	14 years ago
alloc.h	ocfs2: Add ocfs2_trim_fs for SSD trim support.	14 years ago
aops.c	fs: move inode_dio_done to the end_io handler	14 years ago
aops.h	Fix common misspellings	14 years ago
blockcheck.c	…
blockcheck.h	…
buffer_head_io.c	ocfs2: Remove masklog ML_UPTODATE.	14 years ago
buffer_head_io.h	…
dcache.c	ocfs2: fix d_revalidate oopsen on NFS exports	14 years ago
dcache.h	…
dir.c	filesystems: add set_nlink()	13 years ago
dir.h	…
dlmglue.c	filesystems: add set_nlink()	13 years ago
dlmglue.h	…
export.c	exportfs: Return the minimum required handle size	14 years ago
export.h	…
extent_map.c	ocfs2: Remove masklog ML_EXTENT_MAP.	14 years ago
extent_map.h	…
file.c	fs: take the ACL checks to common code	14 years ago
file.h	->permission() sanitizing: don't pass flags to ->permission()	14 years ago
heartbeat.c	ocfs2: Remove mlog(0) from fs/ocfs2/heartbeat.c	14 years ago
heartbeat.h	…
inode.c	filesystems: add set_nlink()	13 years ago
inode.h	…
ioctl.c	Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window	14 years ago
ioctl.h	…
journal.c	ocfs2: Skip mount recovery for hard-ro mounts	14 years ago
journal.h	Fix common misspellings	14 years ago
localalloc.c	ocfs2: Remove EXIT from masklog.	14 years ago
localalloc.h	…
locks.c	ocfs2: remove INODE from unused files.	14 years ago
locks.h	…
mmap.c	ocfs2: Remove FILE_IO from masklog.	14 years ago
mmap.h	…
move_extents.c	treewide: remove duplicate includes	14 years ago
move_extents.h	Ocfs2/move_extents: move/defrag extents within a certain range.	14 years ago
namei.c	filesystems: add set_nlink()	13 years ago
namei.h	…
ocfs1_fs_compat.h	…
ocfs2.h	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	14 years ago
ocfs2_fs.h	Revert wrong fixes for common misspellings	14 years ago
ocfs2_ioctl.h	Ocfs2/move_extents: Adding new ioctl code 'OCFS2_IOC_MOVE_EXT' to ocfs2.	14 years ago
ocfs2_lockid.h	…
ocfs2_lockingver.h	…
ocfs2_trace.h	ocfs2: Add trace event for trim.	14 years ago
quota.h	ocfs2: use system_wq instead of ocfs2_quota_wq	14 years ago
quota_global.c	Fix common misspellings	14 years ago
quota_local.c	ocfs2: Remove mlog(0) from quota_local.c.	14 years ago
refcounttree.c	new helpers: kern_path_create/user_path_create	14 years ago
refcounttree.h	Ocfs2/refcounttree: Publicize couple of funcs from refcounttree.c	14 years ago
reservations.c	ocfs2: Remove masklog ML_RESERVATIONS.	14 years ago
reservations.h	Fix common misspellings	14 years ago
resize.c	ocfs2: Remove mlog(0) from fs/ocfs2/suballoc.c	14 years ago
resize.h	…
slot_map.c	ocfs2: Remove mlog(0) from fs/ocfs2/slot_map.c	14 years ago
slot_map.h	…
stack_o2cb.c	…
stack_user.c	ocfs2_connection_find() returns pointer to bad structure	14 years ago
stackglue.c	…
stackglue.h	Fix common misspellings	14 years ago
suballoc.c	Fix common misspellings	14 years ago
suballoc.h	…
super.c	more conservative S_NOSEC handling	14 years ago
super.h	treewide: use __printf not __attribute__((format(printf,...)))	13 years ago
symlink.c	ocfs2: Remove EXIT from masklog.	14 years ago
symlink.h	…
sysfile.c	ocfs2: Remove mlog(0) from fs/ocfs2/file.c	14 years ago
sysfile.h	…
uptodate.c	ocfs2: Remove masklog ML_UPTODATE.	14 years ago
uptodate.h	…
ver.c	…
ver.h	…
xattr.c	security: new security_inode_init_security API adds function callback	14 years ago
xattr.h	fs/vfs/security: pass last path component to LSM on inode creation	14 years ago