Linus, please pull from the for-linus branch at

    git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git 
for-linus

to receive two IEEE 1394 subsystem fixes for 2.6.20-rc2.
One addresses a grossly incorrect patch of mine after 2.6.19.
(Andreas Schwab 2006-12-29, "2.6.20-rc2: kernel BUG at
include/asm/dma-mapping.h:110!")

The other fixes an old minor bug which was discovered recently.
(Jeff Garzik 2006-12-05, "Re: [PATCH 3/3] Import fw-sbp2 driver.")


 drivers/ieee1394/sbp2.c |   83 +++++++++++++++++++++++------------------------
 1 files changed, 40 insertions(+), 43 deletions(-)


commit 97d552e35d9404df3254e1157df3340e4e2eaedc
Author: Stefan Richter <[EMAIL PROTECTED]>
Date:   Fri Dec 29 23:47:04 2006 +0100

    ieee1394: sbp2: fix bogus dma mapping
    
    Need to use a PCI device, not a FireWire host device.  Problem found by
    Andreas Schwab, mistake pointed out by Benjamin Herrenschmidt.
    http://ozlabs.org/pipermail/linuxppc-dev/2006-December/029595.html
    
    Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
    Tested-by: Andreas Schwab <[EMAIL PROTECTED]>

commit b2bb550c4a10c44e99fe469cfaee81e2e3109994
Author: Stefan Richter <[EMAIL PROTECTED]>
Date:   Thu Dec 28 19:57:49 2006 +0100

    ieee1394: sbp2: pass REQUEST_SENSE through to the target
    
    Delete some incorrect code, left over from the initial driver submission
    in March 2001.
    
    SBP-2 targets should provide sense data via the SBP-2 status block
    (autosense).  We have to pass the REQUEST_SENSE command through to
    targets which don't implement autosense, if there are any, and to
    accomodate application clients which use this command.
    
    Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>

-- 
Stefan Richter
-=====-=-==- ==-- ====-
http://arcgraph.de/sr/

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to