On Mon, Jun 19, 2017 at 05:36:05PM -0600, Jens Axboe wrote: > On 06/19/2017 05:34 PM, Al Viro wrote: > > On Mon, Jun 19, 2017 at 05:15:16PM -0600, Jens Axboe wrote: > >> On 06/19/2017 10:33 AM, Goldwyn Rodrigues wrote: > >>> Jens, > >>> > >>> As Christoph suggested, I am sending the patches against the block > >>> tree for merge since the block layer changes had the most conflicts. > >>> My tree is at https://github.com/goldwynr/linux/tree/nowait-block > >> > >> I can merge it for 4.13, but I need Al to be happy with it first. > > > > FWIW, it's really a matter of who gets more conflicts - I'm OK with the > > general shape of that code and it could go through either tree (or both, > > for that matter, if an immutable branch is promised). > > I'm still hopeful that the write hint patchset will make it as well, > which will definitely conflict with this. So if you don't mind, I'd > like to queue it through the block tree. The block for-4.x/ branches > are not rebased. Fine by me; the only problem I see there at the moment is with ext4 and xfs ->read_iter() not buggering off on nowait (xfs one has xfs_ilock(ip, XFS_IOLOCK_SHARED); done before it gets to generic_file_read_iter()).