From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Woodhouse <dwmw2@infradead•org>
Cc: linux-next@vger•kernel.org, Weidong Han <weidong.han@intel•com>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Subject: linux-next: manual merge of the dwmw2-iommu tree with the x86 tree
Date: Mon, 11 May 2009 14:46:08 +1000 [thread overview]
Message-ID: <20090511144608.f6ed71d2.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 620 bytes --]
Hi David,
Today's linux-next merge of the dwmw2-iommu tree got a conflict in
drivers/pci/intr_remapping.c between commit
937582382c71b75b29fbb92615629494e1a05ac0 ("x86, intr-remap: enable
interrupt remapping early") from the x86 tree and commit
c416daa98a584596df21ee2c26fac6579ee58f57 ("intel-iommu: Tidy up
iommu->gcmd handling") from the dwmw2-iommu tree.
The former removes the code that the latter is modifying, so I just
removed the code ("if (mode == 0) { ... }" in iommu_set_intr_remapping).
--
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-05-11 4:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-11 4:46 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-04-30 3:12 linux-next: manual merge of the dwmw2-iommu tree with the x86 tree 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=20090511144608.f6ed71d2.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dwmw2@infradead$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=tglx@linutronix$(echo .)de \
--cc=weidong.han@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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