On Wed, May 16, 2012 at 06:57:49AM -0700, Anton Vorontsov wrote: > On Wed, May 16, 2012 at 06:17:51AM -0700, Greg Kroah-Hartman wrote: > [...] > > > --- 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? > > The thing is that ramoops switched to pstore just recently, and the > patch is in -mm tree. > > (Just for the record, I use linux-next-20120504, HEAD at commit > 44449d2b34aca3b1) > > > I'm guessing that because of this, is why the other conflict happens, > > right? > > Yep. > > > 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 :) > > There's a cross-tree dependency with -mm tree, as it appears. > > So, I'm not sure which is better: > > 1. Push the whole pile of patches via -mm; or > > 2. You apply the two patches from -mm tree before my series: > "ramoops: use pstore interface" > linux-next commit 60aad9fc1f04ca19e800c5984ad84f405d133a11 > and > "ramoops: fix printk format warnings" > linux-next commit f2a28afdb529c43a7eb21fd0c991cab5676ef011 > > http://userweb.kernel.org/~akpm/mmotm/ seem to not respond at the > moment, so I guess the easiest way to grab the patches would > be to cherry-pick the two commits above from the linux-next > repository. That way Andrew would automatically drop them > from his tree. Ok, I'll pick from linux-next, that seems to be the easiest way. I'll do that later this morning and let you know how it goes... greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
