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

From: Al Viro
Date: Thu Jan 29 2015 - 00:16:05 EST


On Wed, Jan 28, 2015 at 06:11:02PM +0100, Christoph Hellwig wrote:
> On Tue, Jan 27, 2015 at 04:54:22AM +0000, Al Viro wrote:
> > I don't mind opening a never-rebased branch for generic iov_iter-related stuff;
> > if you prefer to handle it that way - just tell. The first two patches
> > from that series would definitely go there; as for the rest... no preferences
> > here.
>
> It might make sense to just keep the VFS patches in your tree.
> The target ones also are something I'd prefer if it goes through Nic
> with additional review. In addition they aren't really critical,
> so if you merge the prep patches now we can feed the rest through
> the proper trees in the .21 merge window.

Done. The first two are in #iov_iter now (merged into #for-next), the
rest is dropped. And #iov_iter is in never-rebased mode, so feel free
to pull it wherever you need it.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/