lkml.org 
[lkml]   [2011]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
DateThu, 10 Feb 2011 16:54:24 +0530
FromNitin Gupta <>
SubjectRe: linux-next: manual merge of the staging tree with the staging.current tree
On 02/10/2011 11:05 AM, Stephen Rothwell wrote:
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/zram/zram_drv.c between commit
> 5414e557fca545614ceedc3d3496f747457e2e3b ("staging: zram: fix data
> corruption issue") from the staging.current tree and commit
> 2787f959d6c5fb258d964218ac75346019f49ee9 ("zram: Return zero'd pages on
> new reads") from the staging tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.

The fix looks correct to me. Thanks for fixing this.

Nitin


\
 
 \ /
  Last update: 2011-02-10 12:27    [from the cache]
©2003-2010