lkml.org 
[lkml]   [2013]   [Aug]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the dma-mapping tree with the kvm-ppc tree
Hi all,

Today's linux-next merge of the dma-mapping tree got a conflict in
mm/Kconfig between commit bf550fc93d98 ("Merge remote-tracking branch
'origin/next' into kvm-ppc-next") from the kvm-ppc tree and commit
f7d8f1e9cb44 ("Merge remote-tracking branch
'dma-public/for-v3.12-cma-dma' into for-next") from the dma-mapping tree.

I fixed it up (these two merges resolved the conflict different ways, I
just arbitrarily picked the kvm-ppc tree version) and can carry the fix
as necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-08-30 09:21    [W:0.033 / U:0.140 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site