Re: linux-next: manual merge of the staging tree with the staging.current tree

On Thu, Feb 10, 2011 at 04:35:27PM +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
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.

Thanks, I'll handle this when Linus takes my tree and I'll merge to
resolve the conflict.

greg k-h