Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757278Ab1FILQ4 (ORCPT ); Thu, 9 Jun 2011 07:16:56 -0400 Received: from mx3.mail.elte.hu ([157.181.1.138]:46297 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754939Ab1FILQz (ORCPT ); Thu, 9 Jun 2011 07:16:55 -0400 Date: Thu, 9 Jun 2011 13:16:42 +0200 From: Ingo Molnar To: Dave Airlie Cc: Dave Airlie , jbarnes@virtuousgeek.org, linux-kernel@vger.kernel.org, steiner@sgi.com Subject: Re: [PATCH] uv/x2apic: update for change in pci bridge handling. Message-ID: <20110609111642.GB31474@elte.hu> References: <1306296049-11797-1-git-send-email-airlied@gmail.com> <20110609070912.GB20544@elte.hu> <1307615573.5963.0.camel@t60prh> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1307615573.5963.0.camel@t60prh> User-Agent: Mutt/1.5.20 (2009-08-17) X-ELTE-SpamScore: -2.0 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-2.0 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.3.1 -2.0 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2071 Lines: 56 * Dave Airlie wrote: > On Thu, 2011-06-09 at 09:09 +0200, Ingo Molnar wrote: > > * Dave Airlie wrote: > > > > > On Wed, May 25, 2011 at 2:00 PM, Dave Airlie wrote: > > > > From: Dave Airlie > > > > > > > > I forgot about the special uv handling code for this, so this > > > > patch fixes it up. > > > > > > ping? > > > > > > This fixes a warning and bug in Linus tree, > > > > > > CC arch/x86/kernel/apic/x2apic_uv_x.o > > > /home/airlied/git/linux-2.6/arch/x86/kernel/apic/x2apic_uv_x.c: In > > > function ‘uv_system_init’: > > > /home/airlied/git/linux-2.6/arch/x86/kernel/apic/x2apic_uv_x.c:882:2: > > > warning: passing argument 1 of ‘pci_register_set_vga_state’ from > > > incompatible pointer type [enabled by default] > > > /home/airlied/git/linux-2.6/include/linux/pci.h:1094:13: note: > > > expected ‘arch_set_vga_state_t’ but argument is of type ‘int > > > (*)(struct pci_dev *, bool, unsigned int, bool)’ > > > > > > > > > Dave. > > > > > > > > > > > Signed-off-by: Dave Airlie > > > > --- > > > > arch/x86/kernel/apic/x2apic_uv_x.c | 8 ++++---- > > > > drivers/pci/pci.c | 4 ++-- > > > > 2 files changed, 6 insertions(+), 6 deletions(-) > > > > Bug introduced via the DRM tree? Then the fix should go via the DRM > > tree or via the PCI tree i suspect. > > So I can take that as an ack for the x86 bit? :-) Sure thing, you always have my implicit ack for obvious bug fixes, especially if you were the one who broke things ;-) [ I might criticise you if you do something ugly, but i generally do that regardless of who maintains what. In any case, as long as you don't do ugly fixes you should always be safe from me! ;-) ] Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/