[lkml]   [2013]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: 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

 \ /
  Last update: 2013-01-18 02:21    [W:0.028 / U:3.756 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site