commit 4cc21505a09354ade787de368bd697a1bba3b213
Merge: caec4e8... 204abf2...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Mon Jun 18 10:38:09 2007 -0700

    Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
    
    * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] ESP: Don't forget to clear ESP_FLAG_RESETTING.
      [SCSI] fusion: fix for BZ 8426 - massive slowdown on SCSI CD/DVD drive

commit caec4e8dc85e0644ec24aeb36285e1ba02da58cc
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date:   Tue Jun 12 08:16:18 2007 +1000

    Fix signalfd interaction with thread-private signals
    
    Don't let signalfd dequeue private signals off other threads (in the
    case of things like SIGILL or SIGSEGV, trying to do so would result
    in undefined behaviour on who actually gets the signal, since they
    are force unblocked).
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Acked-by: Davide Libenzi <davidel@xmailserver.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit bd197234b0a616c8f04f6b682326a5a24b33ca92
Author: Thomas Gleixner <tglx@linutronix.de>
Date:   Sun Jun 17 21:11:10 2007 +0200

    Revert "futex_requeue_pi optimization"
    
    This reverts commit d0aa7a70bf03b9de9e995ab272293be1f7937822.
    
    It not only introduced user space visible changes to the futex syscall,
    it is also non-functional and there is no way to fix it proper before
    the 2.6.22 release.
    
    The breakage report ( http://lkml.org/lkml/2007/5/12/17 ) went
    unanswered, and unfortunately it turned out that the concept is not
    feasible at all.  It violates the rtmutex semantics badly by introducing
    a virtual owner, which hacks around the coupling of the user-space
    pi_futex and the kernel internal rt_mutex representation.
    
    At the moment the only safe option is to remove it fully as it contains
    user-space visible changes to broken kernel code, which we do not want
    to expose in the 2.6.22 release.
    
    The patch reverts the original patch mostly 1:1, but contains a couple
    of trivial manual cleanups which were necessary due to patches, which
    touched the same area of code later.
    
    Verified against the glibc tests and my own PI futex tests.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: Ingo Molnar <mingo@elte.hu>
    Acked-by: Ulrich Drepper <drepper@redhat.com>
    Cc: Pierre Peiffer <pierre.peiffer@bull.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 204abf28679cd55a8e254b18965583bb1c8bc739
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Wed Jun 13 12:58:53 2007 -0700

    [SCSI] ESP: Don't forget to clear ESP_FLAG_RESETTING.
    
    esp_reset_cleanup() does everything necessary except clear
    the flag, so we never exit resetting state.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

commit 29982e9acd3e81a289c73321401427d02eaa8adc
Author: Doug Chapman <doug.chapman@hp.com>
Date:   Mon May 7 15:59:46 2007 -0400

    [SCSI] fusion: fix for BZ 8426 - massive slowdown on SCSI CD/DVD drive
    
    Patch for: http://bugzilla.kernel.org/show_bug.cgi?id=8426
    
    A recent code cleanup that moved code from mptscsih to mptspi
    inadvertently change the order some code was called.  This caused
    a massive slowdown (of 150x to 300x) on the CD/DVD drive on the
    high-end HP Integrity servers.
    
    Signed-off-by: Doug Chapman <doug.chapman@hp.com>
    Acked-by: Eric Moore <eric.moore@lsi.com>
    Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>