Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932139AbZDQNxg (ORCPT ); Fri, 17 Apr 2009 09:53:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760983AbZDQNxO (ORCPT ); Fri, 17 Apr 2009 09:53:14 -0400 Received: from mx3.mail.elte.hu ([157.181.1.138]:33370 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760954AbZDQNxO (ORCPT ); Fri, 17 Apr 2009 09:53:14 -0400 Date: Fri, 17 Apr 2009 15:51:56 +0200 From: Ingo Molnar To: Weidong Han , Randy Dunlap Cc: dwmw2@infradead.org, allen.m.kay@intel.com, fenghua.yu@intel.com, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, Suresh Siddha , Andrew Morton Subject: Re: [PATCH 1/5] docs: add nox2apic back to kernel-parameters.txt Message-ID: <20090417135156.GC23493@elte.hu> References: <1239957736-6161-1-git-send-email-weidong.han@intel.com> <1239957736-6161-2-git-send-email-weidong.han@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1239957736-6161-2-git-send-email-weidong.han@intel.com> User-Agent: Mutt/1.5.18 (2008-05-17) X-ELTE-VirusStatus: clean X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.3 -1.5 BAYES_00 BODY: Bayesian 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: 715 Lines: 21 * Weidong Han wrote: > "nox2apic" was removed from kernel-parameters.txt when Randy moved > entries to be in alpha order (commit 0cb55ad2). But this early > parameter is still there, add it back to kernel-parameters.txt. Randy, this must have been some conflict resolution / patch confict merge related loss, right? Mind double-checking 0cb55ad2 again to make sure no other boot parameters were lost during that reordering? 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/