On Fri, Mar 15, 2013 at 03:13:34PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/ccg/f_fs.c between commit 7f78e0351394 ("fs: Limit
> sys_mount to only request filesystem modules") from Linus' tree and
> commit 515e6dd20b3f ("Staging: ccg: delete it from the tree") from the
> staging tree.
>
> The latter deleted the file, so I did that and can carry the fix as
> necessary (no action is required).
Thanks, that's the correct fix :)
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
