Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1282621 > unrolled thread

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

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the akpm-current tree with the vfs tree Mark Brown <broonie@kernel.org> - 2015-12-03 01:20 +0100

#1282621 — linux-next: manual merge of the akpm-current tree with the vfs tree

[Multipart message — attachments visible in raw view] — view raw

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.

[toc] | [standalone]

Back to top | Article view | linux.kernel

csiph-web