Re: linux-next: manual merge of the kmap_atomic tree with Linus'tree

[Cong Wang]

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.

Thanks.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/