lkml.org 
[lkml]   [2015]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the akpm-current tree with the vfs tree
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.
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2015-12-03 01:41    [W:0.017 / U:4.248 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site