On Tue, 2012-01-31 at 14:27 +1100, Stephen Rothwell wrote:

Hi Cong,

Today's linux-next merge of the kmap_atomic tree got a conflict in
drivers/staging/gma500/mmu.c between commit 344bc24c2947 ("staging:
delete gma500 driver") from the staging.current tree and commit
cb422c115787 ("gma500: remove the second argument of k[un]map_atomic()")
from the kmap_atomic tree.

The former removes this file (as the driver has migrated out of staging),
so I did that.

Ok for me. Probably I need to remove that commit from my tree.

Thanks!