From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Nov 2011 00:22:14 +0000 (-0700)
Subject: Merge branch 'for-3.2/drivers' of git://git.kernel.dk/linux-block
X-Git-Tag: v3.2-rc1~48
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d0a8d10cfb4cc3d1877c29a866ee7d8a46aa2fa;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for-3.2/drivers' of git://git.kernel.dk/linux-block

* 'for-3.2/drivers' of git://git.kernel.dk/linux-block: (30 commits)
  virtio-blk: use ida to allocate disk index
  hpsa: add small delay when using PCI Power Management to reset for kump
  cciss: add small delay when using PCI Power Management to reset for kump
  xen/blkback: Fix two races in the handling of barrier requests.
  xen/blkback: Check for proper operation.
  xen/blkback: Fix the inhibition to map pages when discarding sector ranges.
  xen/blkback: Report VBD_WSECT (wr_sect) properly.
  xen/blkback: Support 'feature-barrier' aka old-style BARRIER requests.
  xen-blkfront: plug device number leak in xlblk_init() error path
  xen-blkfront: If no barrier or flush is supported, use invalid operation.
  xen-blkback: use kzalloc() in favor of kmalloc()+memset()
  xen-blkback: fixed indentation and comments
  xen-blkfront: fix a deadlock while handling discard response
  xen-blkfront: Handle discard requests.
  xen-blkback: Implement discard requests ('feature-discard')
  xen-blkfront: add BLKIF_OP_DISCARD and discard request struct
  drivers/block/loop.c: remove unnecessary bdev argument from loop_clr_fd()
  drivers/block/loop.c: emit uevent on auto release
  drivers/block/cpqarray.c: use pci_dev->revision
  loop: always allow userspace partitions and optionally support automatic scanning
  ...

Fic up trivial header file includsion conflict in drivers/block/loop.c
---

3d0a8d10cfb4cc3d1877c29a866ee7d8a46aa2fa
diff --cc drivers/block/loop.c
index c77983e,9b2f5d3..3d80682
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@@ -75,11 -75,12 +75,13 @@@
  #include <linux/kthread.h>
  #include <linux/splice.h>
  #include <linux/sysfs.h>
 +#include <linux/miscdevice.h>
+ #include <linux/falloc.h>
+ 
  #include <asm/uaccess.h>
  
 -static LIST_HEAD(loop_devices);
 -static DEFINE_MUTEX(loop_devices_mutex);
 +static DEFINE_IDR(loop_index_idr);
 +static DEFINE_MUTEX(loop_index_mutex);
  
  static int max_part;
  static int part_shift;
diff --cc include/linux/loop.h
index a068806,4367fc5..11a41a8
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@@ -73,7 -74,9 +73,8 @@@ struct loop_device 
   */
  enum {
  	LO_FLAGS_READ_ONLY	= 1,
 -	LO_FLAGS_USE_AOPS	= 2,
  	LO_FLAGS_AUTOCLEAR	= 4,
+ 	LO_FLAGS_PARTSCAN	= 8,
  };
  
  #include <asm/posix_types.h>	/* for __kernel_old_dev_t */