linux-next: manual merge of the block tree with the xfs tree

Hi all, Today's linux-next merge of the block tree got a conflict in: fs/xfs/xfs_aops.c between commit: a24737359667 ("xfs: simplify xfs_chain_bio") from the xfs tree and commit: 79d08f89bb1b ("block: fix .bi_size overflow") from the block tree. I fixed it up (see below) and can

Re: linux-next: manual merge of the block tree with the xfs tree

Hi Roger, On Wed, 02 Sep 2015 14:34:51 +0100 Roger Willcocks wrote: > > Huh, now I've had my coffee, that extra check doesn't add anything. > (There's no harm done in assigning zero to io_error if it's already > zero.) Apologies for the noise. That's OK, my excuse is being to far at the other

Re: linux-next: manual merge of the block tree with the xfs tree

On Wed, 2015-09-02 at 23:03 +1000, Stephen Rothwell wrote: > Hi Roger, > > On Wed, 2 Sep 2015 10:45:29 +0100 Roger Willcocks > wrote: > > > > On 2 Sep 2015, at 03:16, Stephen Rothwell wrote: > > > > > ++if (!ioend->io_error) > > > ++ioend->io_error = bio->bi_error;

Re: linux-next: manual merge of the block tree with the xfs tree

Hi Roger, On Wed, 2 Sep 2015 10:45:29 +0100 Roger Willcocks wrote: > > On 2 Sep 2015, at 03:16, Stephen Rothwell wrote: > > > Today's linux-next merge of the block tree got a conflict in: > > > > fs/xfs/xfs_aops.c > > > > between commit: > > > > c9eb256eda44 ("xfs: return errors from

Re: linux-next: manual merge of the block tree with the xfs tree

On 2 Sep 2015, at 03:16, Stephen Rothwell wrote: > Hi Jens, > > Today's linux-next merge of the block tree got a conflict in: > > fs/xfs/xfs_aops.c > > between commit: > > c9eb256eda44 ("xfs: return errors from partial I/O failures to files") > > from the xfs tree and commit: > >

Re: linux-next: manual merge of the block tree with the xfs tree

On Wed, 2015-09-02 at 23:03 +1000, Stephen Rothwell wrote: > Hi Roger, > > On Wed, 2 Sep 2015 10:45:29 +0100 Roger Willcocks > wrote: > > > > On 2 Sep 2015, at 03:16, Stephen Rothwell wrote: > > > > > ++if (!ioend->io_error) > > > ++

Re: linux-next: manual merge of the block tree with the xfs tree

Hi Roger, On Wed, 02 Sep 2015 14:34:51 +0100 Roger Willcocks wrote: > > Huh, now I've had my coffee, that extra check doesn't add anything. > (There's no harm done in assigning zero to io_error if it's already > zero.) Apologies for the noise. That's OK, my excuse is

Re: linux-next: manual merge of the block tree with the xfs tree

On 2 Sep 2015, at 03:16, Stephen Rothwell wrote: > Hi Jens, > > Today's linux-next merge of the block tree got a conflict in: > > fs/xfs/xfs_aops.c > > between commit: > > c9eb256eda44 ("xfs: return errors from partial I/O failures to files") > > from the xfs tree

Re: linux-next: manual merge of the block tree with the xfs tree

Hi Roger, On Wed, 2 Sep 2015 10:45:29 +0100 Roger Willcocks wrote: > > On 2 Sep 2015, at 03:16, Stephen Rothwell wrote: > > > Today's linux-next merge of the block tree got a conflict in: > > > > fs/xfs/xfs_aops.c > > > > between commit: > >

linux-next: manual merge of the block tree with the xfs tree

Hi Jens, Today's linux-next merge of the block tree got a conflict in: fs/xfs/xfs_aops.c between commit: c9eb256eda44 ("xfs: return errors from partial I/O failures to files") from the xfs tree and commit: 4246a0b63bd8 ("block: add a bi_error field to struct bio") from the block tree.

linux-next: manual merge of the block tree with the xfs tree

Hi Jens, Today's linux-next merge of the block tree got a conflict in: fs/xfs/xfs_aops.c between commit: c9eb256eda44 ("xfs: return errors from partial I/O failures to files") from the xfs tree and commit: 4246a0b63bd8 ("block: add a bi_error field to struct bio") from the block tree.