Merge branch 'master' into for-next

Conflicts:
	fs/exofs/inode.c

diff --cc block/blk-core.c
Simple merge

diff --cc drivers/usb/gadget/f_hid.c
Simple merge

diff --cc drivers/usb/gadget/langwell_udc.c
Simple merge

diff --cc drivers/usb/host/ehci-hcd.c
Simple merge

diff --cc drivers/usb/host/imx21-hcd.c
Simple merge

diff --cc drivers/usb/host/ohci-hcd.c
Simple merge

diff --cc drivers/usb/host/oxu210hp-hcd.c
Simple merge

diff --cc drivers/usb/misc/ftdi-elan.c
Simple merge

diff --cc drivers/usb/serial/ftdi_sio.c
Simple merge

diff --cc drivers/usb/serial/io_ti.c
Simple merge

diff --cc drivers/usb/serial/iuu_phoenix.c
Simple merge

diff --cc fs/exofs/inode.c
index 5862ae87ed298b7c8a49172f197001a534596008,088cb476b68a8c24c72bd2abf0503d9917667725..185ef1281e0cf8d1c0db0df27e4299c20aca96bb
--- 1/fs/exofs/inode.c
--- 2/fs/exofs/inode.c
+++ b/fs/exofs/inode.c
@@@ -709,8 -716,8 +716,8 @@@ int exofs_write_begin(struct file *file
                ret = simple_write_begin(file, mapping, pos, len, flags, pagep,
                                         fsdata);
                if (ret) {
 -                      EXOFS_DBGMSG("simple_write_begin faild\n");
 +                      EXOFS_DBGMSG("simple_write_begin failed\n");
-                       return ret;
+                       goto out;
                }
  
                page = *pagep;
@@@ -722,9 -729,12 +729,12 @@@
                if (ret) {
                        /*SetPageError was done by _readpage. Is it ok?*/
                        unlock_page(page);
 -                      EXOFS_DBGMSG("__readpage_filler faild\n");
 +                      EXOFS_DBGMSG("__readpage_filler failed\n");
                }
        }
+ out:
+       if (unlikely(ret))
+               _write_failed(mapping->host, pos + len);
  
        return ret;
  }

diff --cc fs/exofs/ios.c
Simple merge