linux-next: bad merge in driver-core.current tree

From: Stephen Rothwell
Date: Thu Jan 03 2013 - 18:05:38 EST

Hi Greg,

Happy New year! ;-)

Today you added a merge of v3.8-rc2 to the driver-core.current tree. It
added the file drivers/i2c/Module.symvers which is a generated file :-(

Please consider rebuilding your tree to get rid of it. Also, you might
consider removing all the patches that remove the __dev* stuff as they
are really not urgent, cause many conflicts (and will continue to do so)
and most (if not all) are not acked by the maintainers of the subsystems
that they should be applied to (did you send your revised versions of
Bill's patches to those maintainers?). You might consider sending
separate patches to fix the coding style problems after Bill's patches
rather than modifying Bill's patches as some of Bill's patches are
turning up in other subsystems (as happened with i2c).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature