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 superblock creation/configuration context") 1d9c8fafbf6f ("vfs: syscall: Add fsopen() to prepare for superblock creation") from the vfs tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc fs/Makefile index 23fcd8c164a3,e3ea8093b178..000000000000 --- a/fs/Makefile +++ b/fs/Makefile @@@ -13,7 -13,7 +13,8 @@@ obj-y := open.o read_write.o file_table seq_file.o xattr.o libfs.o fs-writeback.o \ pnode.o splice.o sync.o utimes.o d_path.o \ stack.o fs_struct.o statfs.o fs_pin.o nsfs.o \ - fs_context.o fs_parser.o fsopen.o ++ fs_context.o fs_parser.o fsopen.o \ + fs_types.o ifeq ($(CONFIG_BLOCK),y) obj-y += buffer.o block_dev.o direct-io.o mpage.o
Attachment:
pgpcn6KsnTSEh.pgp
Description: OpenPGP digital signature