From: Linus Torvalds Date: Fri, 6 Jul 2012 17:04:39 +0000 (-0700) Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 X-Git-Tag: Ubuntu-5.2.0-15.16~17700 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1b7fa4c27111757789b21bb78543317dad4cfd08;p=mirror_ubuntu-eoan-kernel.git Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 Pull ocfs2 fixes from Joel Becker. * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: aio: make kiocb->private NUll in init_sync_kiocb() ocfs2: Fix bogus error message from ocfs2_global_read_info ocfs2: for SEEK_DATA/SEEK_HOLE, return internal error unchanged if ocfs2_get_clusters_nocache() or ocfs2_inode_lock() call failed. ocfs2: use spinlock irqsave for downconvert lock.patch ocfs2: Misplaced parens in unlikley ocfs2: clear unaligned io flag when dio fails --- 1b7fa4c27111757789b21bb78543317dad4cfd08