From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ingo Molnar Subject: Re: linux-next: manual merge of the dwmw2-iommu tree with Linus' tree Date: Wed, 25 May 2011 11:16:36 +0200 Message-ID: <20110525091636.GC28500@elte.hu> References: <20110525130004.150c054f.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mx2.mail.elte.hu ([157.181.151.9]:52993 "EHLO mx2.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752517Ab1EYJQw (ORCPT ); Wed, 25 May 2011 05:16:52 -0400 Content-Disposition: inline In-Reply-To: <20110525130004.150c054f.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: David Woodhouse , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Song, Youquan" , Suresh Siddha * 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. David, please do not modify arch/x86/kernel/apic/apic.c but send such patches to the x86 maintainers! That particular change was still under discussion and i'm not at all sure we want to do it like that. So please repost the latest version. Thanks, Ingo