Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/Makefile
between commit:
d44170a7ba48 ("fs: common implementation of file type")
from the ext3 tree and commits:
fe43eec04841 ("vfs: Introduce fs_context, switch vfs_kern_mount() to it.")
82685adaccb3 ("vfs: Add con
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/Makefile
between commit:
d44170a7ba48 ("fs: common implementation of file type")
from the ext3 tree and commits:
229e55402816 ("vfs: Add configuration parser helpers")
37744f3d21f8 ("vfs: Implement a filesystem supe
Hi all,
On Fri, 1 Jun 2018 11:56:19 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the vfs tree got a conflict in:
>
> include/linux/fs.h
>
> between commit:
>
> 29aca8b3f7cd ("fsnotify: introduce prototype struct fsnotify_obj")
>
> from the ext3 tree and commit:
>
> d9
Hi,
On Fri 01-06-18 11:56:19, Stephen Rothwell wrote:
> Today's linux-next merge of the vfs tree got a conflict in:
>
> include/linux/fs.h
>
> between commit:
>
> 29aca8b3f7cd ("fsnotify: introduce prototype struct fsnotify_obj")
>
> from the ext3 tree and commit:
>
> d9a08a9e616b ("fs:
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
include/linux/fs.h
between commit:
29aca8b3f7cd ("fsnotify: introduce prototype struct fsnotify_obj")
from the ext3 tree and commit:
d9a08a9e616b ("fs: Add aio iopriority support")
from the vfs tree.
I fixed it up (se
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/ext2/super.c
between commits:
088519572ca8 ("ext2: Parse mount options into a dedicated structure")
8af634ff9e5c ("ext2: Fix possible sleep in atomic during mount option
parsing")
from the ext3 tree and commit:
c2c
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/udf/file.c between commit 13f0c2b0f67d ("udf: remove redundant
buffer_head.h includes") from the ext3 tree and commit 52858684778b
("fs: move struct kiocb to fs.h") from the vfs tree.
I fixed it up (see below) and can carry the
7 matches
Mail list logo
