lkml.org 
[lkml]   [2013]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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]
\
 
 \ /
  Last update: 2013-03-15 05:41    [W:0.140 / U:0.208 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site