Messages in this thread | | | Subject | Re: linux-next: manual merge of the kmap_atomic tree with the staging tree | From | Cong Wang <> | Date | Mon, 13 Feb 2012 17:00:07 +0800 |
| |
On Mon, 2012-02-13 at 16:27 +1100, Stephen Rothwell wrote: > Hi Cong, > > Today's linux-next merge of the kmap_atomic tree got a conflict in > drivers/staging/zram/xvmalloc.c between commit b154ff05e1b0 ("staging: > zram: remove xvmalloc") from the staging tree and commit ea81cfe7d7fb > ("zram: remove the second argument of k[un]map_atomic()") from the > kmap_atomic tree. > > The former removed the file, so I did that.
Ok, thanks!
| |