From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 Apr 2010 20:21:15 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
X-Git-Tag: v3.12-rc1~10620
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=795d580baec0d5386b83a8b557df47c20810e86b;p=kernel%2Fkernel-generic.git

Merge git://git./linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: add check for changed leaves in setup_leaf_for_split
  Btrfs: create snapshot references in same commit as snapshot
  Btrfs: fix small race with delalloc flushing waitqueue's
  Btrfs: use add_to_page_cache_lru, use __page_cache_alloc
  Btrfs: fix chunk allocate size calculation
  Btrfs: kill max_extent mount option
  Btrfs: fail to mount if we have problems reading the block groups
  Btrfs: check btrfs_get_extent return for IS_ERR()
  Btrfs: handle kmalloc() failure in inode lookup ioctl
  Btrfs: dereferencing freed memory
  Btrfs: Simplify num_stripes's calculation logical for __btrfs_alloc_chunk()
  Btrfs: Add error handle for btrfs_search_slot() in btrfs_read_chunk_tree()
  Btrfs: Remove unnecessary finish_wait() in wait_current_trans()
  Btrfs: add NULL check for do_walk_down()
  Btrfs: remove duplicate include in ioctl.c

Fix trivial conflict in fs/btrfs/compression.c due to slab.h include
cleanups.
---

795d580baec0d5386b83a8b557df47c20810e86b
diff --cc fs/btrfs/compression.c
index 629880e,1d54c53..396039b
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@@ -31,8 -31,6 +31,7 @@@
  #include <linux/swap.h>
  #include <linux/writeback.h>
  #include <linux/bit_spinlock.h>
- #include <linux/pagevec.h>
 +#include <linux/slab.h>
  #include "compat.h"
  #include "ctree.h"
  #include "disk-io.h"