0f48f26009
Jens' back-merge commit 698567f3fa79 ("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
- 9fd097b14918 ("block: unexport DISK_EVENT_MEDIA_CHANGE for
legacy/fringe drivers")
- 7eec77a1816a ("ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd
and ide-cd")
because of conflicts with the "g->flags" updates near-by by commit
d4dc210f69bc ("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>
|
||
|---|---|---|
| .. | ||
| aten.c | ||
| bpck6.c | ||
| bpck.c | ||
| comm.c | ||
| dstr.c | ||
| epat.c | ||
| epia.c | ||
| fit2.c | ||
| fit3.c | ||
| friq.c | ||
| frpw.c | ||
| kbic.c | ||
| Kconfig | ||
| ktti.c | ||
| Makefile | ||
| mkd | ||
| on20.c | ||
| on26.c | ||
| paride.c | ||
| paride.h | ||
| pcd.c | ||
| pd.c | ||
| pf.c | ||
| pg.c | ||
| ppc6lnx.c | ||
| pseudo.h | ||
| pt.c | ||
| Transition-notes | ||