Staging tree merge for 3.11-rc1
Here's the large staging tree merge for 3.11-rc1
Huge thing here is the Lustre client code. Unfortunatly, due to it not
building properly on a wide variety of different architectures (this was
production code???), it is currently disabled from the build so as to
not annoy people.
Other than Lustre, there are loads of comedi patches, working to clean
up that subsystem, iio updates and new drivers, and a load of cleanups
from the OPW applicants in their quest to get a summer internship.
All of these have been in the linux-next releases for a while (hence the
Lustre code being disabled.)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Revert "Revert "Revert "staging/lustre: drop CONFIG_BROKEN dependency"""
This reverts commit ee04fd11f11fb67ff0ae482a6710f97f499c19e2.
How many times can we do this...
Not all the world is x86-64, breaking other arch builds, especially for
weeks at a time, isn't acceptable at all.
So, it's nice to get this code into the tree, just don't build it as
it's obviously not ready for "real world" systems :(
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 file changed
