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

2014-11-29 Thread Jeremiah Mahler
Hi, On Sat, Nov 29, 2014 at 11:08:33AM +0100, Sabrina Dubroca wrote: > Hello, > > [adding Jeremiah Mahler to CC] > > 2014-11-27, 14:53:47 +1100, Stephen Rothwell wrote: > > Hi Jens, > > > > Today's linux-next merge of the block tree got a conflict in > > fs/fs-writeback.c between commit ef7fdf5

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

2014-11-29 Thread Theodore Ts'o
Note the relevant changes from the ext4 tree were dropped from the dev branch, so this shouldn't be an issue moving forward. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel

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

2014-11-29 Thread Sabrina Dubroca
Hello, [adding Jeremiah Mahler to CC] 2014-11-27, 14:53:47 +1100, Stephen Rothwell wrote: > Hi Jens, > > Today's linux-next merge of the block tree got a conflict in > fs/fs-writeback.c between commit ef7fdf5e8c87 ("vfs: add support for a > lazytime mount option") from the ext4 tree and commit 9

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

2014-11-26 Thread Christoph Hellwig
On Thu, Nov 27, 2014 at 02:53:47PM +1100, Stephen Rothwell wrote: > Hi Jens, > > Today's linux-next merge of the block tree got a conflict in > fs/fs-writeback.c between commit ef7fdf5e8c87 ("vfs: add support for a > lazytime mount option") Mergign that into a branch for linux-next must surely ha