summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-4.3/blkcg' of git://git.kernel.dk/linux-blockLinus Torvalds2015-09-1017-1078/+1422
|\
| * blkcg: use CGROUP_WEIGHT_* scale for io.weight on the unified hierarchyTejun Heo2015-08-184-16/+64
| * blkcg: s/CFQ_WEIGHT_*/CFQ_WEIGHT_LEGACY_*/Tejun Heo2015-08-181-11/+11
| * blkcg: implement interface for the unified hierarchyTejun Heo2015-08-185-9/+279
| * blkcg: misc preparations for unified hierarchy interfaceTejun Heo2015-08-183-5/+7
| * blkcg: separate out tg_conf_updated() from tg_set_conf()Tejun Heo2015-08-181-28/+32
| * blkcg: move body parsing from blkg_conf_prep() to its callersTejun Heo2015-08-184-22/+39
| * blkcg: mark existing cftypes as legacyTejun Heo2015-08-184-11/+11
| * blkcg: rename subsystem name from blkio to ioTejun Heo2015-08-186-10/+11
| * blkcg: refine error codes returned during blkcg configurationTejun Heo2015-08-182-7/+7
| * blkcg: remove unnecessary NULL checks from __cfqg_set_weight_device()Tejun Heo2015-08-181-4/+1
| * blkcg: reduce stack usage of blkg_rwstat_recursive_sum()Tejun Heo2015-08-181-6/+4
| * blkcg: remove cfqg_stats->sectorsTejun Heo2015-08-181-19/+36
| * blkcg: move io_service_bytes and io_serviced stats into blkcg_gqTejun Heo2015-08-185-108/+133
| * blkcg: make blkg_[rw]stat_recursive_sum() to be able to index into blkcg_gqTejun Heo2015-08-183-34/+50
| * blkcg: make blkcg_[rw]stat per-cpuTejun Heo2015-08-184-136/+153
| * blkcg: add blkg_[rw]stat->aux_cnt and replace cfq_group->dead_stats with itTejun Heo2015-08-183-66/+57
| * blkcg: consolidate blkg creation in blkcg_bio_issue_check()Tejun Heo2015-08-186-99/+57
| * blk-throttle: improve queue bypass handlingTejun Heo2015-08-181-3/+4
| * blkcg: move root blkg lookup optimization from throtl_lookup_tg() to __blkg_l...Tejun Heo2015-08-182-7/+3
| * blkcg: inline [__]blkg_lookup()Tejun Heo2015-08-182-40/+47
| * blkcg: replace blkcg_policy->cpd_size with ->cpd_alloc/free_fn() methodsTejun Heo2015-08-183-23/+52
| * blkcg: minor updates around blkcg_policy_dataTejun Heo2015-08-183-21/+28
| * blkcg: make blkcg_policy methods take a pointer to blkcg_policy_dataTejun Heo2015-08-184-27/+26
| * blk-throttle: clean up blkg_policy_data alloc/init/exit/free methodsTejun Heo2015-08-184-54/+31
| * blk-throttle: remove asynchrnous percpu stats allocation mechanismTejun Heo2015-08-181-87/+25
| * blkcg: replace blkcg_policy->pd_size with ->pd_alloc/free_fn() methodsTejun Heo2015-08-184-21/+44
| * blkcg: make blkcg_activate_policy() allow NULL ->pd_init_fnTejun Heo2015-08-181-1/+2
| * blkcg: restructure blkg_policy_data allocation in blkcg_activate_policy()Tejun Heo2015-08-182-37/+21
| * blkcg: remove unnecessary blkcg_root handling from css_alloc/free pathsTejun Heo2015-08-181-15/+10
| * blkcg: use blkg_free() in blkcg_init_queue() failure pathTejun Heo2015-08-181-2/+3
| * blkcg: remove unnecessary request_list->blkg NULL test in blk_put_rl()Tejun Heo2015-08-181-2/+1
| * cfq-iosched: charge async IOs to the appropriate blkcg's instead of the rootTejun Heo2015-08-181-43/+42
| * cfq-iosched: fold cfq_find_alloc_queue() into cfq_get_queue()Tejun Heo2015-08-181-34/+15
| * cfq-iosched: move cfq_group determination from cfq_find_alloc_queue() to cfq_...Tejun Heo2015-08-181-16/+12
| * cfq-iosched: remove @gfp_mask from cfq_find_alloc_queue()Tejun Heo2015-08-181-35/+10
| * blkcg, cfq-iosched: use GFP_NOWAIT instead of GFP_ATOMIC for non-critical all...Tejun Heo2015-08-182-5/+5
| * cfq-iosched: minor cleanupsTejun Heo2015-08-181-15/+11
| * cfq-iosched: fix oom cfq_queue ref leak in cfq_set_request()Tejun Heo2015-08-181-0/+2
| * cfq-iosched: fix async oom queue handlingTejun Heo2015-08-181-1/+1
| * cfq-iosched: simplify control flow in cfq_get_queue()Tejun Heo2015-08-181-6/+7
| * writeback: update writeback tracepoints to report cgroupTejun Heo2015-08-183-49/+151
| * kernfs: implement kernfs_path_len()Tejun Heo2015-08-182-0/+27
| * writeback: explain why @inode is allowed to be NULL for inode_congested()Tejun Heo2015-08-181-1/+4
| * writeback: remove wb_writeback_work->single_wait/doneTejun Heo2015-08-181-86/+30
| * writeback: bdi_for_each_wb() iteration is memcg ID based not blkcgTejun Heo2015-08-182-15/+15
| * Merge branch 'for-4.3-unified-base' of git://git.kernel.org/pub/scm/linux/ker...Jens Axboe2015-08-184-24/+111
| |\
* | \ Merge branch 'akpm' (patches from Andrew)Linus Torvalds2015-09-10165-4353/+4768
|\ \ \
| * | | dma-mapping: consolidate dma_set_maskChristoph Hellwig2015-09-1024-169/+28
| * | | dma-mapping: consolidate dma_supportedChristoph Hellwig2015-09-1018-98/+25