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

From	Mark Brown <broonie@kernel.org>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the akpm-current tree with the vfs tree
Date	2015-12-03 01:20 +0100
Message-ID	<qBpMR-5Y5-11@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

[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.

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

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

csiph-web