Messages in this thread | | | Date | Fri, 15 Mar 2013 15:13:34 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with Linus' tree |
| |
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).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |