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 03e4970c10 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 ... * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (39 commits) Treat writes as new when holes span across page boundaries fs,ocfs2: Move o2net_get_func_run_time under CONFIG_OCFS2_FS_STATS. ocfs2/dlm: Move kmalloc() outside the spinlock ocfs2: Make the left masklogs compat. ocfs2: Remove masklog ML_AIO. ocfs2: Remove masklog ML_UPTODATE. ocfs2: Remove masklog ML_BH_IO. ocfs2: Remove masklog ML_JOURNAL. ocfs2: Remove masklog ML_EXPORT. ocfs2: Remove masklog ML_DCACHE. ocfs2: Remove masklog ML_NAMEI. ocfs2: Remove mlog(0) from fs/ocfs2/dir.c ocfs2: remove NAMEI from symlink.c ocfs2: Remove masklog ML_QUOTA. ocfs2: Remove mlog(0) from quota_local.c. ocfs2: Remove masklog ML_RESERVATIONS. ocfs2: Remove masklog ML_XATTR. ocfs2: Remove masklog ML_SUPER. ocfs2: Remove mlog(0) from fs/ocfs2/heartbeat.c ocfs2: Remove mlog(0) from fs/ocfs2/slot_map.c ... Fix up trivial conflict in fs/ocfs2/super.c		14 years ago
..
Makefile	fs: change to new flag variable	14 years ago
dlmapi.h	ocfs2/trivial: Remove trailing whitespaces	15 years ago
dlmast.c	ocfs2/dlm: Cleanup mlogs in dlmthread.c, dlmast.c and dlmdomain.c	14 years ago
dlmcommon.h	ocfs2/dlm: Hard code the values for enums	14 years ago
dlmconvert.c	ocfs2: Remove ENTRY from masklog.	14 years ago
dlmconvert.h	…
dlmdebug.c	ocfs2/dlm: Minor cleanup	14 years ago
dlmdebug.h	ocfs2/dlm: Cleanup dlmdebug.c	14 years ago
dlmdomain.c	Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs2-merge-window-fix	14 years ago
dlmdomain.h	…
dlmlock.c	ocfs2: Remove ENTRY from masklog.	14 years ago
dlmmaster.c	ocfs2: Remove ENTRY from masklog.	14 years ago
dlmrecovery.c	ocfs2: Remove EXIT from masklog.	14 years ago
dlmthread.c	ocfs2/dlm: Cleanup mlogs in dlmthread.c, dlmast.c and dlmdomain.c	14 years ago
dlmunlock.c	ocfs2: Remove ENTRY from masklog.	14 years ago
dlmver.c	ocfs2: bump version number	17 years ago
dlmver.h	…