• Linus Torvalds's avatar
    block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal · 0f48f260
    Linus Torvalds authored
    Jens' back-merge commit 698567f3 ("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
    
     - 9fd097b1 ("block: unexport DISK_EVENT_MEDIA_CHANGE for
       legacy/fringe drivers")
    
     - 7eec77a1 ("ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd
       and ide-cd")
    
    because of conflicts with the "g->flags" updates near-by by commit
    d4dc210f ("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: default avatarSteven Rostedt <rostedt@goodmis.org>
    Cc: Jens Axboe <jaxboe@fusionio.com>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    0f48f260
ide-cd.c 45.9 KB