* linux-next: manual merge of the dma-mapping tree with the kvm-ppc tree
@ 2013-08-30 7:00 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-08-30 7:00 UTC (permalink / raw)
To: Marek Szyprowski, Kyungmin Park; +Cc: linux-next, linux-kernel, Alexander Graf
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
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
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-08-30 7:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-30 7:00 linux-next: manual merge of the dma-mapping tree with the kvm-ppc 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).