On Mon, Feb 04, 2013 at 12:42:08PM +0900, Minchan Kim wrote:
> Hi Greg,
> 
> On Sun, Feb 03, 2013 at 05:53:33PM -0800, Greg Kroah-Hartman wrote:
> > On Wed, Jan 30, 2013 at 11:41:42AM +0900, Minchan Kim wrote:
> > > Lockdep complains about recursive deadlock of zram->init_lock.
> > > [1] made it false positive because we can't request IO to zram
> > > before setting disksize. Anyway, we should shut lockdep up to
> > > avoid many reporting from user.
> > > 
> > > [1] : zram: force disksize setting before using zram
> > > 
> > > Acked-by: Jerome Marchand <jmarch...@redhat.com>
> > > Acked-by: Nitin Gupta <ngu...@vflare.org>
> > > Signed-off-by: Minchan Kim <minc...@kernel.org>
> > > ---
> > >  drivers/staging/zram/zram_drv.c   |  189 
> > > +++++++++++++++++++------------------
> > >  drivers/staging/zram/zram_drv.h   |   12 ++-
> > >  drivers/staging/zram/zram_sysfs.c |   11 ++-
> > >  3 files changed, 116 insertions(+), 96 deletions(-)
> > 
> > This patch fails to apply to my staging-next branch, but the three
> > others did, so I took them.  Please refresh this one and resend if you
> > want it applied.
> 
> We must have missed each other.

Yes, I was on a flight with no email :)

> A few hours ago, I sent to you v7 based on next-20130202.
> https://lkml.org/lkml/2013/2/3/319
> 
> v7 includes acks of Jerome and resolve conflict with latest staging.
> I believe it is okay to apply your tree.
> 
> Please reapply v7 instead of v6.

Please just send the one patch I need to apply here, I added Jerome's
acks to the previous patches already.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to