2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 23:23:55 +08:00
linux-next/drivers/s390/block
Linus Torvalds b4fdcb02f1 Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block
* 'for-3.2/core' of git://git.kernel.dk/linux-block: (29 commits)
  block: don't call blk_drain_queue() if elevator is not up
  blk-throttle: use queue_is_locked() instead of lockdep_is_held()
  blk-throttle: Take blkcg->lock while traversing blkcg->policy_list
  blk-throttle: Free up policy node associated with deleted rule
  block: warn if tag is greater than real_max_depth.
  block: make gendisk hold a reference to its queue
  blk-flush: move the queue kick into
  blk-flush: fix invalid BUG_ON in blk_insert_flush
  block: Remove the control of complete cpu from bio.
  block: fix a typo in the blk-cgroup.h file
  block: initialize the bounce pool if high memory may be added later
  block: fix request_queue lifetime handling by making blk_queue_cleanup() properly shutdown
  block: drop @tsk from attempt_plug_merge() and explain sync rules
  block: make get_request[_wait]() fail if queue is dead
  block: reorganize throtl_get_tg() and blk_throtl_bio()
  block: reorganize queue draining
  block: drop unnecessary blk_get/put_queue() in scsi_cmd_ioctl() and blk_get_tg()
  block: pass around REQ_* flags instead of broken down booleans during request alloc/free
  block: move blk_throtl prototypes to block/blk.h
  block: fix genhd refcounting in blkio_policy_parse_and_set()
  ...

Fix up trivial conflicts due to "mddev_t" -> "struct mddev" conversion
and making the request functions be of type "void" instead of "int" in
 - drivers/md/{faulty.c,linear.c,md.c,md.h,multipath.c,raid0.c,raid1.c,raid10.c,raid5.c}
 - drivers/staging/zram/zram_drv.c
2011-11-04 17:06:58 -07:00
..
dasd_3990_erp.c Fix common misspellings 2011-03-31 11:26:23 -03:00
dasd_alias.c [S390] get rid of unused variables 2011-05-23 10:24:28 +02:00
dasd_devmap.c [S390] dasd: fix race between open and offline 2011-04-20 10:15:43 +02:00
dasd_diag.c [S390] irq: merge irq.c and s390_ext.c 2011-05-26 09:48:24 +02:00
dasd_diag.h [S390] cleanup lowcore access from external interrupts 2010-10-25 16:10:19 +02:00
dasd_eckd.c [S390] sparse: fix sparse NULL pointer warnings 2011-10-30 15:16:46 +01:00
dasd_eckd.h [S390] dasd: Add support for raw ECKD access. 2011-01-05 12:47:30 +01:00
dasd_eer.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
dasd_erp.c [S390] dasd: do path verification for paths added at runtime 2011-01-05 12:47:30 +01:00
dasd_fba.c [S390] fix mismatch in summation of I/O IRQ statistics 2011-10-30 15:16:15 +01:00
dasd_fba.h [S390] dasd whitespace and other cosmetics. 2006-06-29 14:58:12 +02:00
dasd_genhd.c [S390] dasd: fix race between open and offline 2011-04-20 10:15:43 +02:00
dasd_int.h [S390] dasd: prevent path verification before resume 2011-10-30 15:16:45 +01:00
dasd_ioctl.c [S390] drivers/s390/block/dasd_ioctl.c: add missing kfree 2011-08-24 17:15:23 +02:00
dasd_proc.c [S390] dasd: use vmalloc for statistics input buffer 2011-08-03 16:44:19 +02:00
dasd.c [S390] dasd: prevent path verification before resume 2011-10-30 15:16:45 +01:00
dcssblk.c block: remove support for bio remapping from ->make_request 2011-09-12 12:12:01 +02:00
Kconfig [S390] cleanup s390 Kconfig 2011-01-05 12:47:23 +01:00
Makefile [S390] dasd: add hyper PAV support to DASD device driver, part 1 2008-01-26 14:11:28 +01:00
xpram.c block: remove support for bio remapping from ->make_request 2011-09-12 12:12:01 +02:00