Hi Paul, Today's linux-next merge of the moduleh tree got a conflict in fs/inode.c between commit 8bf58c2aaafb ("trim includes in inode.c") from the vfs tree and commit 630d9c47274a ("fs: reduce the use of module.h wherever possible") from the moduleh tree. The former makes the latter patch unneeded (it also replaces module.h with export.h). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpjGg4FeHkRw.pgp
Description: PGP signature