Re: bfsort whitelist patch apparently applied twice

[Tony Camuso]

Yes, that fixes it.

Thanks, Jesse.

Regards,
Tony

Jesse Barnes wrote:
> 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@xxxxxxxxxx>
> Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
> ---
>  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"),
>  		},
>  	},
>  	{}

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