Messages in this thread |  | | | Date | Fri, 10 Feb 2012 16:17:14 +1100 | | From | Stephen Rothwell <> | | Subject | linux-next: manual merge of the kmap_atomic tree with Linus' tree |
| |
Hi Cong,
Today's linux-next merge of the kmap_atomic tree got a conflict in drivers/staging/pohmelfs/inode.c between commit 67435319866f ("staging: pohmelfs: remove drivers/staging/pohmelfs") from Linus' tree and commit 709bc0d6b5c6 ("pohmelfs: remove the second argument of k[un]map_atomic ()") from the kmap_atomic tree.
The former removes the file, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] |  |