On Wed, May 16, 2012 at 05:43:08AM -0700, Anton Vorontsov wrote: > Since ramoops was converted to pstore, it has nothing to do with character > devices nowadays. Instead, today it is just a RAM backend for pstore. > > The patch just moves things around. There are a few changes were needed > because of the move: > > 1. Kconfig and Makefiles fixups, of course. > > 2. In pstore/ram.c we have to play a bit with MODULE_PARAM_PREFIX, this > is needed to keep user experience the same as with ramoops driver > (i.e. so that ramoops.foo kernel command line arguments would still > work). > > Signed-off-by: Anton Vorontsov <anton.vorontsov@xxxxxxxxxx> > Acked-by: Marco Stornelli <marco.stornelli@xxxxxxxxx> > Acked-by: Kees Cook <keescook@xxxxxxxxxxxx> > --- > Documentation/ramoops.txt | 2 +- > drivers/char/Kconfig | 9 -- > drivers/char/Makefile | 1 - > drivers/char/ramoops.c | 362 -------------------------------------------- > fs/pstore/Kconfig | 14 ++ > fs/pstore/Makefile | 3 + > fs/pstore/ram.c | 362 ++++++++++++++++++++++++++++++++++++++++++++ > include/linux/pstore_ram.h | 17 +++ > include/linux/ramoops.h | 17 --- > 9 files changed, 397 insertions(+), 390 deletions(-) > delete mode 100644 drivers/char/ramoops.c > create mode 100644 fs/pstore/ram.c > create mode 100644 include/linux/pstore_ram.h > delete mode 100644 include/linux/ramoops.h This patch fails to apply to my staging-next tree due to problems with drivers/char/Kconfig and drivers/char/ramoops.c. What tree are you making this patch against? > --- a/drivers/char/Kconfig > +++ b/drivers/char/Kconfig > @@ -585,15 +585,6 @@ config DEVPORT > > source "drivers/s390/char/Kconfig" > > -config RAMOOPS > - tristate "Log panic/oops to a RAM buffer" > - depends on HAS_IOMEM > - depends on PSTORE This "depends on PSTORE" line is not in my staging-next tree, where did it come from? I'm guessing that because of this, is why the other conflict happens, right? Any ideas on what I can do to resolve it? As you are moving a file, I want to make sure I move the correct version of it :) thanks, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
