[lkml]   [2012]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-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.
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2012-02-10 06:19    [W:0.022 / U:7.544 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site