Merge remote-tracking branches 'spi/topic/blackfin', 'spi/topic/cadence', 'spi/topic...

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/spi.c
index 8657860,c64a3e5,c64a3e5,31d4d9d,7713253..900a91b
--- 1/drivers/spi/spi.c
--- 2/drivers/spi/spi.c
--- 3/drivers/spi/spi.c
--- 4/drivers/spi/spi.c
--- 5/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@@@@@ -850,9 -851,6 -851,6 -851,9 -851,9 +850,9 @@@@@@ out
        if (msg->status == -EINPROGRESS)
                msg->status = ret;
     
-  -    if (msg->status)
++++    if (msg->status && master->handle_err)
 ++             master->handle_err(master, msg);
 ++  
        spi_finalize_current_message(master);
     
        return ret;

diff --cc include/linux/spi/spi.h
index 71e9d88,ed9489d,ed9489d,4eaac3a,5685af8..478c468
--- 1/include/linux/spi/spi.h
--- 2/include/linux/spi/spi.h
--- 3/include/linux/spi/spi.h
--- 4/include/linux/spi/spi.h
--- 5/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@@@@@ -294,8 -294,6 -294,6 -294,8 -294,8 +294,8 @@@@@@ static inline void spi_unregister_drive
      *                    transfer_one_message are mutually exclusive; when both
      *                    are set, the generic subsystem does not call your
      *                    transfer_one callback.
-  -  * @handle_err: the subsystem calls the driver to handle and error that occurs
++++  * @handle_err: the subsystem calls the driver to handle an error that occurs
 ++   *         in the generic implementation of transfer_one_message().
      * @unprepare_message: undo any work done by prepare_message().
      * @cs_gpios: Array of GPIOs to use as chip select lines; one per CS
      * number. Any individual value may be -ENOENT for CS lines that