Messages in this thread | | | Subject | Re: linux-next: manual merge of the kmap_atomic tree with the staging tree | From | Cong Wang <> | Date | Fri, 02 Mar 2012 13:51:30 +0800 |
| |
On Thu, 2012-03-01 at 17:07 +1100, Stephen Rothwell wrote: > Hi Cong, > > Today's linux-next merge of the kmap_atomic tree got a conflict in > drivers/staging/zcache/zcache-main.c between various commits from the > staging tree and commit 1edbcaee3bbe ("zcache: remove the second argument > of k[un]map_atomic()") from the kmap_atomic tree. > > I fixed it up (see below) and can carry the fix as necessary.
Hi, Stephen,
Sorry for the delay, it looks correct to me.
Thanks!
| |