From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-next@vger.kernel.org, Jesper Juhl <jj@chaosbits.net>,
Becky Bruce <beckyb@kernel.crashing.org>,
Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Subject: linux-next: manual merge of the iommu tree
Date: Tue, 6 Jan 2009 16:57:30 +1100 [thread overview]
Message-ID: <20090106165730.6c8c80f3.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 579 bytes --]
Hi Ingo,
Today's linux-next merge of the iommu tree got a conflict in
lib/swiotlb.c between commit 52942b6b16c6ebb25f4dd4df0208d840ba0cbc5c
("swiotlb: Don't include linux/swiotlb.h twice in lib/swiotlb.c") from
the tip-core tree and commit fb05a37929e0cd99016b4f5e5a5ef077fb10a947
("swiotlb: add support for systems with highmem") from the iommu tree.
Just trivial overlapping add/removal of header includes. I fixed it up
and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2009-01-06 5:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-06 5:57 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-12-29 12:10 linux-next: manual merge of the iommu tree Stephen Rothwell
2008-12-29 12:04 Stephen Rothwell
2008-12-29 12:15 ` Ingo Molnar
2008-12-29 12:20 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090106165730.6c8c80f3.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=beckyb@kernel.crashing.org \
--cc=jeremy.fitzhardinge@citrix.com \
--cc=jj@chaosbits.net \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox