Files
kernel_arpi/include/linux
Linus Torvalds 0d167518e0 Merge branch 'for-3.5/core' of git://git.kernel.dk/linux-block
Merge block/IO core bits from Jens Axboe:
 "This is a bit bigger on the core side than usual, but that is purely
  because we decided to hold off on parts of Tejun's submission on 3.4
  to give it a bit more time to simmer.  As a consequence, it's seen a
  long cycle in for-next.

  It contains:

   - Bug fix from Dan, wrong locking type.
   - Relax splice gifting restriction from Eric.
   - A ton of updates from Tejun, primarily for blkcg.  This improves
     the code a lot, making the API nicer and cleaner, and also includes
     fixes for how we handle and tie policies and re-activate on
     switches.  The changes also include generic bug fixes.
   - A simple fix from Vivek, along with a fix for doing proper delayed
     allocation of the blkcg stats."

Fix up annoying conflict just due to different merge resolution in
Documentation/feature-removal-schedule.txt

* 'for-3.5/core' of git://git.kernel.dk/linux-block: (92 commits)
  blkcg: tg_stats_alloc_lock is an irq lock
  vmsplice: relax alignement requirements for SPLICE_F_GIFT
  blkcg: use radix tree to index blkgs from blkcg
  blkcg: fix blkcg->css ref leak in __blkg_lookup_create()
  block: fix elvpriv allocation failure handling
  block: collapse blk_alloc_request() into get_request()
  blkcg: collapse blkcg_policy_ops into blkcg_policy
  blkcg: embed struct blkg_policy_data in policy specific data
  blkcg: mass rename of blkcg API
  blkcg: style cleanups for blk-cgroup.h
  blkcg: remove blkio_group->path[]
  blkcg: blkg_rwstat_read() was missing inline
  blkcg: shoot down blkgs if all policies are deactivated
  blkcg: drop stuff unused after per-queue policy activation update
  blkcg: implement per-queue policy activation
  blkcg: add request_queue->root_blkg
  blkcg: make request_queue bypassing on allocation
  blkcg: make sure blkg_lookup() returns %NULL if @q is bypassing
  blkcg: make blkg_conf_prep() take @pol and return with queue lock held
  blkcg: remove static policy ID enums
  ...
2012-05-30 08:52:42 -07:00
..
2011-03-31 11:26:23 -03:00
2012-04-23 14:23:32 +03:00
2012-05-15 17:30:30 -04:00
2008-02-06 10:41:02 -08:00
2009-09-08 17:42:50 -07:00
2009-04-01 08:59:23 -07:00
2011-03-22 17:43:59 -07:00
2008-10-20 08:52:42 -07:00
2011-08-03 11:30:42 -04:00
2005-04-16 15:20:36 -07:00
2011-07-26 16:49:47 -07:00
2011-03-31 11:26:23 -03:00
2012-05-08 14:13:25 -07:00
2010-10-25 08:02:40 -07:00
2012-02-28 16:02:54 +01:00
2005-04-16 15:20:36 -07:00
2012-04-14 15:24:26 -04:00
2010-08-04 11:00:45 +02:00
2012-05-02 14:15:27 -05:00
2012-05-25 12:46:23 +05:30
2007-02-09 17:39:36 -05:00
2009-11-04 09:50:58 -08:00
2011-05-24 10:21:29 +02:00
2009-01-30 23:46:40 +05:30
2012-04-30 15:30:18 -07:00
2008-01-28 23:21:18 +01:00
2012-05-17 15:36:35 -04:00
2011-03-31 11:26:23 -03:00
2011-01-12 20:16:43 -05:00
2005-04-16 15:20:36 -07:00
2011-01-10 08:51:44 -08:00
2005-04-16 15:20:36 -07:00
2011-01-07 17:50:27 +11:00
2012-05-29 16:22:23 -07:00
2012-04-12 12:57:08 +02:00
2009-06-18 13:04:05 -07:00
2012-04-27 10:46:45 +08:00
2012-05-22 11:32:31 +02:00
2011-06-27 16:06:19 -07:00
2012-03-26 21:47:19 +02:00
2012-05-12 14:28:14 +02:00
2012-05-12 14:28:16 +02:00
2012-04-21 16:26:33 -04:00
2005-04-16 15:20:36 -07:00
2012-04-19 13:56:55 +02:00
2012-03-20 12:47:48 +01:00
2005-04-16 15:20:36 -07:00
2012-05-07 10:58:57 -06:00
2012-01-03 22:55:17 -05:00
2009-04-21 13:41:48 -07:00
2012-05-21 21:09:38 +02:00
2012-04-09 11:16:55 -07:00
2012-05-29 16:22:21 -07:00
2012-05-11 10:56:56 +01:00
2012-01-17 15:40:51 -08:00
2011-09-16 19:20:20 -04:00
2007-07-17 10:23:03 -07:00
2012-05-09 13:58:06 -07:00
2012-05-22 15:20:28 -04:00
2012-05-29 16:22:19 -07:00
2012-05-29 16:22:24 -07:00
2005-04-16 15:20:36 -07:00
2006-11-30 04:40:22 +01:00
2008-06-06 11:29:12 -07:00
2012-05-19 02:51:00 -04:00
2012-05-08 20:25:42 +02:00
2012-04-12 15:10:33 -04:00
2012-05-26 14:17:30 -04:00
2012-05-16 15:17:08 -04:00
2012-05-21 14:31:48 +01:00
2005-04-16 15:20:36 -07:00
2011-01-16 13:47:07 -05:00
2012-05-14 14:15:32 -07:00
2005-04-16 15:20:36 -07:00
2011-05-26 17:12:37 -07:00
2012-05-12 15:53:42 -04:00
2011-01-13 08:03:21 -08:00
2011-03-31 11:26:23 -03:00
2012-05-17 08:51:59 -07:00
2010-02-10 17:47:17 -08:00
2008-02-07 08:42:34 -08:00
2012-04-18 15:57:31 -07:00
2012-05-21 23:52:30 -04:00
2012-05-19 18:34:57 -04:00
2012-05-08 12:35:06 +02:00
2012-04-15 12:44:40 -04:00
2005-04-16 15:20:36 -07:00
2010-08-09 16:48:44 -04:00
2012-05-14 18:53:19 -04:00
2011-10-31 17:30:47 -07:00
2012-05-29 16:22:28 -07:00
2005-04-16 15:20:36 -07:00
2008-10-13 09:51:40 -07:00
2012-05-21 16:16:58 -07:00
2010-11-29 08:55:25 +11:00
2012-05-04 16:58:47 -07:00
2012-04-10 22:39:17 -06:00
2005-04-16 15:20:36 -07:00
2012-05-22 12:16:16 +09:30
2012-03-31 08:09:50 +05:30
2011-07-26 16:49:47 -07:00
2012-03-28 18:30:03 +01:00