linux-kernel - Re: [PATCH 2/6] ramoops: Move to fs/pstore/ram.c

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20120516141151.GA939@kroah.com>
Date:	Wed, 16 May 2012 07:11:51 -0700
From:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:	Anton Vorontsov <anton.vorontsov@...aro.org>
Cc:	Kees Cook <keescook@...omium.org>,
	Colin Cross <ccross@...roid.com>, devel@...verdev.osuosl.org,
	linaro-kernel@...ts.linaro.org, Arnd Bergmann <arnd@...db.de>,
	patches@...aro.org, Marco Stornelli <marco.stornelli@...il.com>,
	Stephen Boyd <sboyd@...eaurora.org>,
	linux-kernel@...r.kernel.org, arve@...roid.com,
	Jesper Juhl <jj@...osbits.net>,
	John Stultz <john.stultz@...aro.org>,
	Shuah Khan <shuahkhan@...il.com>,
	Rebecca Schultz Zavin <rebecca@...roid.com>,
	WANG Cong <xiyou.wangcong@...il.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	kernel-team@...roid.com, Thomas Meyer <thomas@...3r.de>
Subject: Re: [PATCH 2/6] ramoops: Move to fs/pstore/ram.c

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/