lkml.org 
[lkml]   [2012]   [May]   [27]   [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 tree
Hi all,

Today's linux-next merge of the dma-mapping tree got conflicts in
arch/arm/Kconfig and arch/x86/include/asm/dma-mapping.h between various
commits from Linus' tree and various commits from the dma-mapping tree.

Again, these commits were rebased from what was merged into Linus' tree
via other trees. Please do not do this.

I just used the version of these files from Linus' tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-05-28 06:01    [W:0.021 / U:0.492 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site