You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 36805aaea5 Merge branch 'for-3.11/core' of git://git.kernel.dk/linux-block ... Pull core block IO updates from Jens Axboe: "Here are the core IO block bits for 3.11. It contains: - A tweak to the reserved tag logic from Jan, for weirdo devices with just 3 free tags. But for those it improves things substantially for random writes. - Periodic writeback fix from Jan. Marked for stable as well. - Fix for a race condition in IO scheduler switching from Jianpeng. - The hierarchical blk-cgroup support from Tejun. This is the grunt of the series. - blk-throttle fix from Vivek. Just a note that I'm in the middle of a relocation, whole family is flying out tomorrow. Hence I will be awal the remainder of this week, but back at work again on Monday the 15th. CC'ing Tejun, since any potential "surprises" will most likely be from the blk-cgroup work. But it's been brewing for a while and sitting in my tree and linux-next for a long time, so should be solid." * 'for-3.11/core' of git://git.kernel.dk/linux-block: (36 commits) elevator: Fix a race in elevator switching block: Reserve only one queue tag for sync IO if only 3 tags are available writeback: Fix periodic writeback after fs mount blk-throttle: implement proper hierarchy support blk-throttle: implement throtl_grp->has_rules[] blk-throttle: Account for child group's start time in parent while bio climbs up blk-throttle: add throtl_qnode for dispatch fairness blk-throttle: make throtl_pending_timer_fn() ready for hierarchy blk-throttle: make tg_dispatch_one_bio() ready for hierarchy blk-throttle: make blk_throtl_bio() ready for hierarchy blk-throttle: make blk_throtl_drain() ready for hierarchy blk-throttle: dispatch from throtl_pending_timer_fn() blk-throttle: implement dispatch looping blk-throttle: separate out throtl_service_queue->pending_timer from throtl_data->dispatch_work blk-throttle: set REQ_THROTTLED from throtl_charge_bio() and gate stats update with it blk-throttle: implement sq_to_tg(), sq_to_td() and throtl_log() blk-throttle: add throtl_service_queue->parent_sq blk-throttle: generalize update_disptime optimization in blk_throtl_bio() blk-throttle: dispatch to throtl_data->service_queue.bio_lists[] blk-throttle: move bio_lists[] and friends to throtl_service_queue ...		12 years ago
..
00-INDEX	Documentation: cgroup: add documentation for net_cls cgroups.	12 years ago
blkio-controller.txt	blk-throttle: implement proper hierarchy support	12 years ago
cgroups.txt	Revert "cgroup: remove bind() method from cgroup_subsys."	12 years ago
cpuacct.txt	Documentation: fix echo command in cgroups/cpuacct.txt	14 years ago
cpusets.txt	sched: Rename sched.c as sched/core.c in comments and Documentation	12 years ago
devices.txt	devcg: propagate local changes down the hierarchy	12 years ago
freezer-subsystem.txt	cgroup_freezer: implement proper hierarchy support	12 years ago
hugetlb.txt	hugetlb/cgroup: add HugeTLB controller documentation	13 years ago
memcg_test.txt	cgroups: move cgroup_event_listener.c to tools/cgroup	12 years ago
memory.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	12 years ago
net_cls.txt	Documentation: cgroup: add documentation for net_cls cgroups.	12 years ago
net_prio.txt	netprio_cgroup: allow nesting and inherit config on cgroup creation	12 years ago
resource_counter.txt	res_counter: return amount of charges after res_counter_uncharge()	12 years ago