Messages in this thread | | | Date | Mon, 13 Feb 2012 16:27:52 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the kmap_atomic tree with the staging tree |
| |
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. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |