[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20151203001832.ef38abf329032ddb8eae22ef@kernel.org>
Date: Thu, 3 Dec 2015 00:18:32 +0000
From: Mark Brown <broonie@...nel.org>
To: Andrew Morton <akpm@...ux-foundation.org>,
Julia Lawall <Julia.Lawall@...6.fr>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-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.
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists