Subject: linux-next: manual merge of the akpm-current tree with the vfs tree

From: Mark Brown <[email-masked]>
Date: Thu, 3 Dec 2015 00:18:32 +0000

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in fs/adfs/adfs.h 
since it appears that "adfs: constify adfs_dir_ops structures" has been applied
by Al Viro. There was no conflict to resolve but git still flagged it as a conflict
for some reason.