Messages in this thread | | | Date | Mon, 28 May 2012 13:26:40 +1000 | From | Stephen Rothwell <> | Subject | linux-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] | |