[lkml]   [2012]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the kmap_atomic tree with Linus' tree
On Fri, 2012-02-10 at 16:17 +1100, Stephen Rothwell wrote:
> 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.

Ok, I will drop that commit.


 \ /
  Last update: 2012-02-10 06:29    [W:0.022 / U:7.900 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site