* linux-next: manual merge of the dma-mapping tree with the tree
@ 2012-05-28 3:26 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2012-05-28 3:26 UTC (permalink / raw)
To: Marek Szyprowski, Kyungmin Park; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 474 bytes --]
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
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-05-28 3:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-28 3:26 linux-next: manual merge of the dma-mapping tree with the tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).