Linus Torvalds 0f48f26009 block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal ... Jens' back-merge commit 698567f3fa ("Merge commit 'v2.6.39' into for-2.6.40/core") was incorrectly done, and re-introduced the DISK_EVENT_MEDIA_CHANGE lines that had been removed earlier in commits - 9fd097b149 ("block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers") - 7eec77a181 ("ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd and ide-cd") because of conflicts with the "g->flags" updates near-by by commit d4dc210f69 ("block: don't block events on excl write for non-optical devices") As a result, we re-introduced the hanging behavior due to infinite disk media change reports. Tssk, tssk, people! Don't do back-merges at all, and *definitely* don't do them to hide merge conflicts from me - especially as I'm likely better at merging them than you are, since I do so many merges. Reported-by: Steven Rostedt <rostedt@goodmis.org> Cc: Jens Axboe <jaxboe@fusionio.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2011-06-02 05:29:19 +09:00
..
aoe	drivers/block/aoe/Makefile: replace the use of <module>-objs with <module>-y	2011-01-19 08:25:02 -07:00
drbd	Merge branch 'for-2.6.40/drivers' of git://git.kernel.dk/linux-2.6-block	2011-05-25 09:15:35 -07:00
paride	block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal	2011-06-02 05:29:19 +09:00
xen-blkback	xen/blkback: don't fail empty barrier requests	2011-05-18 11:28:16 -04:00
amiflop.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
ataflop.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
brd.c	brd: export module parameters	2011-05-26 21:06:50 +02:00
cciss_cmd.h	cciss: use new doorbell-bit-5 reset method	2011-05-06 08:23:55 -06:00
cciss_scsi.c	cciss: add cciss_tape_cmds module paramter	2011-05-06 08:23:59 -06:00
cciss_scsi.h	cciss: add cciss_tape_cmds module paramter	2011-05-06 08:23:59 -06:00
cciss.c	cciss: fix compile issue	2011-05-06 08:27:00 -06:00
cciss.h	cciss: increase timeouts for post-reset no-ops	2011-05-06 08:23:54 -06:00
cpqarray.c	block: remove per-queue plugging	2011-03-10 08:52:07 +01:00
cpqarray.h
cryptoloop.c	drivers: Remove unnecessary inclusions of asm/semaphore.h	2008-04-18 22:16:32 -04:00
DAC960.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
DAC960.h
floppy.c	Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6	2011-05-29 11:18:09 -07:00
hd.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ida_cmd.h
ida_ioctl.h
Kconfig	xen/blkback: Flesh out the description in the Kconfig.	2011-05-12 17:55:40 -04:00
loop.c	loop: export module parameters	2011-05-27 07:59:25 +02:00
Makefile	xen/blkback: Move it from drivers/xen to drivers/block	2011-04-18 14:30:26 -04:00
mg_disk.c	block: switch s390 tape_block and mg_disk to elevator_change()	2010-08-23 14:02:44 +02:00
nbd.c	nbd: remove module-level ioctl mutex	2011-02-11 16:12:20 -08:00
osdblk.c	block: remove spurious uses of REQ_HARDBARRIER	2010-09-10 12:35:36 +02:00
pktcdvd.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
ps3disk.c	Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block	2010-10-22 17:07:18 -07:00
ps3vram.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
rbd_types.h	rbd: introduce rados block device (rbd), based on libceph	2010-10-20 15:38:13 -07:00
rbd.c	rbd: handle online resize of underlying rbd image	2011-05-24 11:52:08 -07:00
smart1,2.h	fix typos 'comamnd' -> 'command' in comments	2011-02-02 11:31:21 +01:00
sunvdc.c	block: Consolidate phys_segment and hw_segment limits	2010-02-26 13:58:08 +01:00
swim3.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
swim_asm.S	m68k: mac - Add SWIM floppy support	2009-03-26 21:15:27 +01:00
swim.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
sx8.c	block: Consolidate phys_segment and hw_segment limits	2010-02-26 13:58:08 +01:00
ub.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
umem.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
umem.h
viodasd.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
virtio_blk.c	drivers, block: virtio_blk: Replace cryptic number with the macro	2011-05-30 11:14:13 +09:30
xd.c	block: autoconvert trivial BKL users to private mutex	2010-10-05 15:01:10 +02:00
xd.h	[PATCH] switch xd	2008-10-21 07:48:11 -04:00
xen-blkfront.c	xen-blkfront: Introduce BLKIF_OP_FLUSH_DISKCACHE support.	2011-05-12 08:56:03 -04:00
xsysace.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
z2ram.c	drivers/block/z2ram.c: correct printing of sector_t	2010-10-28 06:15:26 -06:00