[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Thu, 4 Apr 2013 15:43:29 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Al Viro <viro@...iv.linux.org.uk>
Subject: linux-next: manual merge of the staging tree with the vfs tree
Hi Greg,
Today's linux-next merge of the staging tree got conflicts in
drivers/staging/ccg/f_fs.c and drivers/staging/ccg/rndis.c between
commits 465bced2e3ed ("ccg: don't bother with fops->owner") and
4dfac87dca02 ("procfs: new helper - PDE_DATA(inode)") from the vfs tree
and commit 515e6dd20b3f ("Staging: ccg: delete it from the tree") from
the staging tree.
The latter just deletes the files, so I did that and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists