Messages in this thread |  | | Date | Thu, 17 Jan 2013 16:42:50 -0800 | From | Greg KH <> | 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
|  |