login
Login
/
Register
Search
Forums
News
Blogs
Features
Site
Home
»
Mailing list archives
»
linux-kernel
»
2008
»
July
»
7
Re: bfsort whitelist patch apparently applied twice
view
thread
!MAILaRCHIVE_VOTE_RePLACE
Previous message: [
thread
] [
date
] [
author
]
Next message: [
thread
] [
date
] [author]
[view in full thread]
From:
Tony Camuso <tcamuso@...>
To: Jesse Barnes <jbarnes@...>
Cc: <linux-kernel@...>, <linux-pci@...>, Schoeller, Patrick (Linux - Houston, TX) <Patrick.Schoeller@...>, Ingo Molnar <mingo@...>, Thomas Gleixner <tglx@...>
Subject:
Re: bfsort whitelist patch apparently applied twice
Date: Monday, July 7, 2008 - 2:09 pm
Yes, that fixes it. Thanks, Jesse. Regards, Tony Jesse Barnes wrote:
quoted text
> On Monday, July 07, 2008 7:35 am Tony Camuso wrote: >> In the most recent pull from Linus' tree, I see that the patch >> I submitted on 14-May-2008 was merged twice in the git log. >> >> commits: a16b4bcd31a73a81b6d2b8ffa6b5f6ed01cf6d64 >> and: a1676072558854b95336c8f7db76b0504e909a0a >> >> The result is that now the DL360 and DL380 are whitelisted twice >> and the DL385 G2 and DL585 G2 are not whitelisted at all! >> >> Can one of these redundant commits be backed out? > > Hm, seems like this should have created a conflict since there was some actual > context (#ifdef __i386__) in the patch? Ah I see, it looks like the one that > came in through Ingo & Thomas, a1676072558854b95336c8f7db76b0504e909a0a, > modified the end of the list, while the one that I sent upstream, > 8d64c781f0c5fbfdf8016bd1634506ff2ad1376a, modified the entry above #ifdef > __i386__. That's unfortunate. > > Here's what I've got, look ok? > > Thanks, > Jesse > > From a86744c1d60b2bc2a575de48672f6f6c15c0411f Mon Sep 17 00:00:00 2001 > From: Jesse Barnes <jbarnes@hobbes.(none)> > Date: Mon, 7 Jul 2008 09:55:26 -0700 > Subject: [PATCH] Revert "PCI: Correct last two HP entries in the bfsort whitelist" > > This reverts commit a1676072558854b95336c8f7db76b0504e909a0a. It duplicates > the change from 8d64c781f0c5fbfdf8016bd1634506ff2ad1376a and only one should be > applied, otherwise some of the Dell quirks are lost. > > Thanks to Tony Camuso for catching this. > > Acked-by: Tony Camuso <tcamuso@redhat.com> > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > --- > arch/x86/pci/common.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c > index 940185e..6e64aaf 100644 > --- a/arch/x86/pci/common.c > +++ b/arch/x86/pci/common.c > @@ -328,18 +328,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = { > #endif > { > .callback = set_bf_sort, > - .ident = "HP ProLiant DL360", > + .ident = "HP ProLiant DL385 G2", > .matches = { > DMI_MATCH(DMI_SYS_VENDOR, "HP"), > - DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL360"), > + DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"), > }, > }, > { > .callback = set_bf_sort, > - .ident = "HP ProLiant DL380", > + .ident = "HP ProLiant DL585 G2", > .matches = { > DMI_MATCH(DMI_SYS_VENDOR, "HP"), > - DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL380"), > + DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), > }, > }, > {}
--
unsubscribe notice
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/
Previous message: [
thread
] [
date
] [
author
]
Next message: [
thread
] [
date
] [author]
Messages in current thread:
bfsort whitelist patch apparently applied twice
, Tony Camuso
, (Mon Jul 7, 10:35 am)
Re: bfsort whitelist patch apparently applied twice
, Jesse Barnes
, (Mon Jul 7, 12:59 pm)
Re: bfsort whitelist patch apparently applied twice
, Tony Camuso
, (Mon Jul 7, 2:09 pm)
Re: bfsort whitelist patch apparently applied twice
, Jesse Barnes
, (Mon Jul 7, 6:36 pm)
Navigation
Create content
Mailing list archives
Recent posts
Popular discussions
linux-kernel
:
Greg Kroah-Hartman
[PATCH 001/196] Chinese: Add the known_regression URI to the HOWTO
Linus Torvalds
Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3
David Newall
Re: Slow DOWN, please!!!
Ian Campbell
Re: [PATCH] x86: Construct 32 bit boot time page tables in native format.
netbsd-tech-kern
:
Matthias Scheler
Re: HEADS UP: timecounters (branch simonb-timecounters) merged into -current
Greg Troxel
Re: Interface to change NFS exports
Thor Lancelot Simon
metadata cache and memory fragmentation
YAMAMOTO Takashi
amap memory allocation
git
:
linux-netdev
:
Jarek Poplawski
[PATCH] pkt_sched: Destroy gen estimators under rtnl_lock().
Gerrit Renker
[PATCH 0/37] dccp: Feature negotiation - last call for comments
David Miller
[GIT]: Networking
Dushan Tcholich
Re: ksoftirqd high cpu load on kernels 2.6.24 to 2.6.27-rc1-mm1
Colocation donated by:
Who's online
There are currently
1 user
and
796 guests
online.
Online users
strcmp
Syndicate