[lkml]   [2012]   [Jan]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the kmap_atomic tree with the staging.current tree
On Tue, 2012-01-31 at 14:27 +1100, Stephen Rothwell wrote:
> 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.

Ok for me. Probably I need to remove that commit from my tree.


 \ /
  Last update: 2012-01-31 04:43    [W:0.022 / U:8.492 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site