diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-18 10:09:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-18 10:09:25 -0700 |
| commit | bea9a6d239cb2aa2ced4dcb0a05e1827ce61fa3d (patch) | |
| tree | 39f23bd918c4dcda4359ebd9b8f188b9cb5e25b1 /kernel | |
| parent | drm/i915: add 'reclaimable' to i915 self-reclaimable page allocations (diff) | |
| parent | ocfs2: Silence gcc warning in ocfs2_write_zero_page(). (diff) | |
| download | linux-dev-bea9a6d239cb2aa2ced4dcb0a05e1827ce61fa3d.tar.xz linux-dev-bea9a6d239cb2aa2ced4dcb0a05e1827ce61fa3d.zip | |
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:
ocfs2: Silence gcc warning in ocfs2_write_zero_page().
jbd2/ocfs2: Fix block checksumming when a buffer is used in several transactions
ocfs2/dlm: Remove BUG_ON from migration in the rare case of a down node
ocfs2: Don't duplicate pages past i_size during CoW.
ocfs2: tighten up strlen() checking
ocfs2: Make xattr reflink work with new local alloc reservation.
ocfs2: make xattr extension work with new local alloc reservation.
ocfs2: Remove the redundant cpu_to_le64.
ocfs2/dlm: don't access beyond bitmap size
ocfs2: No need to zero pages past i_size.
ocfs2: Zero the tail cluster when extending past i_size.
ocfs2: When zero extending, do it by page.
ocfs2: Limit default local alloc size within bitmap range.
ocfs2: Move orphan scan work to ocfs2_wq.
fs/ocfs2/dlm: Add missing spin_unlock
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions