linux/drivers/block/paride
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
..
Kconfig [PATCH] Remove unused kernel config option PARIDE_PARPORT 2007-02-11 11:18:06 -08:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Transition-notes Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
aten.c [PATCH] paride_register(): shuffle return values 2006-12-07 08:39:33 -08:00
bpck.c [PATCH] paride_register(): shuffle return values 2006-12-07 08:39:33 -08:00
bpck6.c [PATCH] paride: remove parport #ifdef's 2006-12-07 08:39:45 -08:00
comm.c [PATCH] paride_register(): shuffle return values 2006-12-07 08:39:33 -08:00
dstr.c [PATCH] paride_register(): shuffle return values 2006-12-07 08:39:33 -08:00
epat.c [PATCH] paride_register(): shuffle return values 2006-12-07 08:39:33 -08:00
epia.c [PATCH] paride_register(): shuffle return values 2006-12-07 08:39:33 -08:00
fit2.c [PATCH] paride_register(): shuffle return values 2006-12-07 08:39:33 -08:00
fit3.c [PATCH] paride_register(): shuffle return values 2006-12-07 08:39:33 -08:00
friq.c [PATCH] paride_register(): shuffle return values 2006-12-07 08:39:33 -08:00
frpw.c [PATCH] paride_register(): shuffle return values 2006-12-07 08:39:33 -08:00
kbic.c [PATCH] paride_register(): shuffle return values 2006-12-07 08:39:33 -08:00
ktti.c [PATCH] paride_register(): shuffle return values 2006-12-07 08:39:33 -08:00
mkd Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
on20.c [PATCH] paride_register(): shuffle return values 2006-12-07 08:39:33 -08:00
on26.c [PATCH] paride_register(): shuffle return values 2006-12-07 08:39:33 -08:00
paride.c [PATCH] paride: remove parport #ifdef's 2006-12-07 08:39:45 -08:00
paride.h [PATCH] paride: rename pi_register() and pi_unregister() 2006-12-07 08:39:33 -08:00
pcd.c block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal 2011-06-02 05:29:19 +09:00
pd.c block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers 2011-04-21 21:33:05 +02:00
pf.c block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers 2011-04-21 21:33:05 +02:00
pg.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
ppc6lnx.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pseudo.h WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
pt.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00