linux-kernel - Re: linux-next: manual merge of the dwmw2-iommu tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 25 May 2011 16:16:05 -0400
From:	Youquan Song <youquan.song@...ux.intel.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	David Woodhouse <dwmw2@...radead.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	"Song, Youquan" <youquan.song@...el.com>,
	Suresh Siddha <suresh.b.siddha@...el.com>,
	Ingo Molnar <mingo@...e.hu>
Subject: Re: linux-next: manual merge of the dwmw2-iommu tree with Linus'
	tree

On Wed, May 25, 2011 at 01:00:04PM +1000, Stephen Rothwell wrote:
> Hi David,
> 
> Today's linux-next merge of the dwmw2-iommu tree got a conflict in
> arch/x86/kernel/apic/apic.c between commit 31dce14a3269 ("x86, ioapic:
> Use ioapic_saved_data while enabling intr-remapping") from Linus' tree and
> commit 6a87c5ec6463 ("intel-iommu: enable x2apic opt out") from the
> dwmw2-iommu tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

The fix looks good to me.

Thanks
-Youquan

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/