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 ...		2013-07-11 13:03:24 -07:00
..
ABI	Nothing interesting. Except the most embarrassing bugfix ever. But let's	2013-07-10 14:51:41 -07:00
accounting	Documentation/accounting/getdelays.c: avoid strncpy in accounting tool	2013-07-03 16:08:06 -07:00
acpi	Power management and ACPI updates for 3.11-rc1	2013-07-03 14:35:40 -07:00
aoe
arm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-07-04 11:40:58 -07:00
arm64	arm64: KVM: document kernel object mappings in HYP	2013-06-12 16:42:20 +01:00
auxdisplay
backlight	backlight: lp855x: remove duplicate platform data	2013-04-29 18:28:19 -07:00
blackfin
block	doc: fix misspellings with 'codespell' tool	2013-05-28 12:02:12 +02:00
blockdev
bus-devices
cdrom
cgroups	Merge branch 'for-3.11/core' of git://git.kernel.dk/linux-block	2013-07-11 13:03:24 -07:00
connector
console	TTY:console: update document console.txt	2013-05-21 10:21:57 -07:00
cpu-freq	cpufreq: rename index as driver_data in cpufreq_frequency_table	2013-06-04 14:25:59 +02:00
cpuidle	cpuidle: make a single register function for all	2013-04-23 13:45:22 +02:00
cris
crypto	drivers/dma: remove unused support for MEMSET operations	2013-07-03 16:07:42 -07:00
development-process
device-mapper	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-07-04 11:40:58 -07:00
devicetree	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2013-07-11 12:26:08 -07:00
DocBook	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-07-09 18:24:39 -07:00
driver-model
dvb
early-userspace	Documentation/early-userspace/README fix a typo	2013-06-05 16:24:58 +02:00
EDID
extcon
fault-injection
fb	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2013-07-09 16:04:31 -07:00
filesystems	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-07-04 11:40:58 -07:00
firmware_class
fmc	FMC: add a char-device mezzanine driver	2013-06-18 15:42:15 -07:00
frv
hid
hwmon	New driver to support GMT G762/G763 pwm fan controllers	2013-07-03 19:56:35 -07:00
i2c	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-07-04 14:02:09 -07:00
i2o
ia64
ide
infiniband
input	Input: MT - Specify that ABS_MT_SLOT must have a minimum of 0	2013-06-13 21:32:00 +02:00
ioctl	s390/sclp: Add SCLP character device driver	2013-06-26 21:10:13 +02:00
isdn
ja_JP
kbuild	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2013-07-10 16:06:46 -07:00
kdump	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-07-04 11:40:58 -07:00
ko_KR
laptops	doc: fix misspellings with 'codespell' tool	2013-05-28 12:02:12 +02:00
leds
m68k	block: remove refs to XD disks from documentation	2013-05-17 15:17:12 +02:00
make
memory-devices
metag	doc: fix misspellings with 'codespell' tool	2013-05-28 12:02:12 +02:00
mips
misc-devices	doc: fix misspellings with 'codespell' tool	2013-05-28 12:02:12 +02:00
mmc
mn10300
mtd
namespaces
netlabel
networking	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-07-09 18:24:39 -07:00
nfc
parisc	parisc: document the shadow registers	2013-07-09 22:09:19 +02:00
PCI
pcmcia
power	Merge branch 'pm-assorted'	2013-06-28 13:01:40 +02:00
powerpc	powerpc/perf: Core EBB support for 64-bit book3s	2013-07-01 11:50:10 +10:00
pps
prctl
pti
ptp
rapidio	rapidio: documentation update	2013-07-03 16:08:05 -07:00
RCU	Merge branches 'cbnum.2013.06.10a', 'doc.2013.06.10a', 'fixes.2013.06.10a', 'srcu.2013.06.10a' and 'tiny.2013.06.10a' into HEAD	2013-06-10 13:46:44 -07:00
s390	s390/cio: add condev keyword to cio_ignore	2013-05-02 15:50:20 +02:00
scheduler	sched: Rename sched.c as sched/core.c in comments and Documentation	2013-06-19 12:58:42 +02:00
scsi	[SCSI] megaraid_sas: Changelog and driver version update	2013-06-24 17:52:10 -07:00
security
serial	stallion: final cleanup	2013-06-03 14:31:39 -07:00
sh
sound	ALSA: hda - Update HD-Audio-Models.txt	2013-06-17 11:16:33 +02:00
spi
sysctl	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-07-09 18:24:39 -07:00
target
thermal	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2013-07-11 12:26:08 -07:00
timers	nohz_full: Document additional restrictions	2013-06-10 13:42:38 -07:00
trace	The majority of the changes here are cleanups for the large changes that	2013-07-11 09:02:09 -07:00
usb	Driver core patches for 3.11-rc1	2013-07-02 11:44:19 -07:00
vDSO
video4linux	Documentation/video4linux/si476x.txt fix a typo	2013-06-05 16:24:58 +02:00
virtual	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-07-04 11:40:58 -07:00
vm	zswap: add documentation	2013-07-10 18:11:34 -07:00
w1	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-07-04 11:40:58 -07:00
watchdog
wimax
x86	arm: add support for LZ4-compressed kernel	2013-07-09 10:33:30 -07:00
xtensa	xtensa: document MMUv3 setup sequence	2013-05-09 01:07:09 -07:00
zh_CN	gpio: update gpio Chinese documentation	2013-04-16 18:47:22 +09:00
.gitignore
00-INDEX	FMC: add documentation for the core	2013-06-18 15:41:03 -07:00
applying-patches.txt
atomic_ops.txt
bad_memory.txt
basic_profiling.txt
bcache.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-07-04 11:40:58 -07:00
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
btmrvl.txt
BUG-HUNTING
bus-virt-phys-mapping.txt
cachetlb.txt
Changes
circular-buffers.txt
clk.txt	doc: clk: Fix incorrect wording	2013-06-10 23:54:14 +02:00
coccinelle.txt	Coccinelle: Update information about the minimal version required	2013-07-03 22:58:20 +02:00
CodingStyle	Documentation/CodingStyle: allow multiple return statements per function	2013-07-03 16:08:01 -07:00
cpu-hotplug.txt	Power management and ACPI updates for 3.11-rc1	2013-07-03 14:35:40 -07:00
cpu-load.txt
cputopology.txt
crc32.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt
devices.txt	/dev/oldmem: Remove the interface	2013-07-03 16:08:03 -07:00
digsig.txt
DMA-API-HOWTO.txt
DMA-API.txt
DMA-attributes.txt
dma-buf-sharing.txt	dma-buf: replace dma_buf_export() with dma_buf_export_named()	2013-05-01 16:35:36 +05:30
DMA-ISA-LPC.txt
dmaengine.txt
dmatest.txt	dmatest: do not allow to interrupt ongoing tests	2013-06-08 02:13:44 +05:30
dontdiff
dynamic-debug-howto.txt	doc: fix misspellings with 'codespell' tool	2013-05-28 12:02:12 +02:00
edac.txt
eisa.txt
email-clients.txt
flexible-arrays.txt
futex-requeue-pi.txt
gcov.txt
gpio.txt	Remove GENERIC_GPIO config option	2013-04-16 18:47:19 +09:00
highuid.txt
HOWTO	Documentation: Updated broken link in HOWTO	2013-06-03 14:22:57 -07:00
hw_random.txt
hwspinlock.txt
init.txt
initrd.txt
intel_txt.txt
Intel-IOMMU.txt
io_ordering.txt
io-mapping.txt
iostats.txt	iostats.txt: add easy-to-find description for field 6	2013-04-29 15:18:50 +02:00
IPMI.txt
IRQ-affinity.txt
IRQ-domain.txt
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt	kernel-doc: Update references to SGML to refs to XML instead.	2013-05-28 12:02:11 +02:00
kernel-docs.txt
kernel-parameters.txt	The majority of the changes here are cleanups for the large changes that	2013-07-11 09:02:09 -07:00
kernel-per-CPU-kthreads.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-07-04 11:40:58 -07:00
kmemcheck.txt
kmemleak.txt
kobject.txt
kprobes.txt
kref.txt
ldm.txt
local_ops.txt
lockdep-design.txt
lockstat.txt
lockup-watchdogs.txt
logo.gif
logo.txt
magic-number.txt
Makefile
ManagementStyle
md.txt	md: remove doubled description for sync_max, merging it within sync_min/sync_max	2013-07-03 09:43:28 +10:00
media-framework.txt	doc: fix misspellings with 'codespell' tool	2013-05-28 12:02:12 +02:00
memory-barriers.txt
memory-hotplug.txt
mono.txt
mutex-design.txt
nommu-mmap.txt
numastat.txt
oops-tracing.txt
padata.txt
parport-lowlevel.txt
parport.txt
percpu-rw-semaphore.txt
pi-futex.txt
pinctrl.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-07-04 11:40:58 -07:00
pnp.txt
preempt-locking.txt
printk-formats.txt	lib: vsprintf: add IPv4/v6 generic %p[Ii]S[pfs] format specifier	2013-07-01 23:22:13 -07:00
pwm.txt	pwm: Add sysfs interface	2013-06-21 11:32:51 +02:00
ramoops.txt
rbtree.txt
remoteproc.txt
rfkill.txt
robust-futex-ABI.txt
robust-futexes.txt
rpmsg.txt
rt-mutex-design.txt	sched: Rename sched.c as sched/core.c in comments and Documentation	2013-06-19 12:58:42 +02:00
rt-mutex.txt
rtc.txt	rtc: add ability to push out an existing wakealarm using sysfs	2013-07-03 16:07:54 -07:00
SAK.txt
SecurityBugs
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
SM501.txt
smsc_ece1099.txt
sparse.txt
spinlocks.txt	sched: Rename sched.c as sched/core.c in comments and Documentation	2013-06-19 12:58:42 +02:00
stable_api_nonsense.txt
stable_kernel_rules.txt
static-keys.txt
SubmitChecklist	Finally eradicate CONFIG_HOTPLUG	2013-06-03 14:20:18 -07:00
SubmittingDrivers
SubmittingPatches	checkpatch: add Suggested-by as a standard signature	2013-04-29 18:28:20 -07:00
svga.txt
sysfs-rules.txt
sysrq.txt	Documentation/sysrq: fix inconstistent help message of sysrq key	2013-04-30 17:04:10 -07:00
this_cpu_ops.txt
unaligned-memory-access.txt
unicode.txt
unshare.txt
vfio.txt	vfio Updates for v3.11	2013-07-10 14:50:08 -07:00
VGA-softcursor.txt
vgaarbiter.txt
video-output.txt
vme_api.txt
volatile-considered-harmful.txt
workqueue.txt
ww-mutex-design.txt	mutex: Add support for wound/wait style locks	2013-06-26 12:10:56 +02:00
xz.txt
zorro.txt