Re: linux-next: manual merge of the tip tree with the nfs tree

* Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got conflicts in > fs/nfs/blocklayout/blocklayoutdev.c and > fs/nfs/blocklayout/blocklayoutdm.c between commit 871760ce97a9 > ("pnfs/blocklayout: move all rpc_pipefs related code into a single > file") from the nfs

Re: linux-next: manual merge of the tip tree with the nfs tree

Thanks Stephen, the fixup looks obviously correct to me. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lk