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