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

2019-09-16 Thread Richard Weinberger
On Mon, Sep 16, 2019 at 3:40 PM Mark Brown wrote: > > Hi all, > > Today's linux-next merge of the vfs tree got a conflict in: > > fs/ubifs/super.c > > between commit: > > 9163e0184bd7d5f ("ubifs: Fix memory leak bug in alloc_ubifs_info() error > path") > > from the ubifs tree and commit: > >

linux-next: manual merge of the vfs tree with the ubifs tree

2019-09-16 Thread Mark Brown
Hi all, Today's linux-next merge of the vfs tree got a conflict in: fs/ubifs/super.c between commit: 9163e0184bd7d5f ("ubifs: Fix memory leak bug in alloc_ubifs_info() error path") from the ubifs tree and commit: 50d7aad57710e2b ("vfs: Convert ubifs to use the new mount API") from the

linux-next: manual merge of the vfs tree with the ubifs tree

2019-07-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the vfs tree got a conflict in: fs/ubifs/super.c between commit: eeabb9866e4c ("ubifs: Add support for zstd compression.") from the ubifs tree and commit: 334d581528b9 ("vfs: Convert ubifs to use the new mount API") from the vfs tree. I fixed it up

linux-next: manual merge of the vfs tree with the ubifs tree

2016-10-09 Thread Stephen Rothwell
Hi Al, Today's linux-next merge of the vfs tree got a conflict in: fs/ubifs/dir.c between commits: 9e0a1fff8db5 ("ubifs: Implement RENAME_WHITEOUT") 9ec64962afb1 ("ubifs: Implement RENAME_EXCHANGE") from the ubifs tree and commit: f03b8ad8d386 ("fs: support RENAME_NOREPLACE for local