[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Thu, 17 Jan 2013 16:42:50 -0800
From: Greg KH <greg@...ah.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Nitin Gupta <ngupta@...are.org>,
Davidlohr Bueso <davidlohr.bueso@...com>
Subject: Re: linux-next: manual merge of the staging tree with Linus' tree
On Thu, Jan 17, 2013 at 01:35:33PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/zram/zram_drv.c between commit 397c60668aa5 ("staging:
> zram: fix invalid memory references during disk write") from Linus' tree
> and commit d178a07c4bd3 ("staging: zram: drop zram_stat_dec/inc
> functions") from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.
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/
Powered by blists - more mailing lists