Re: [tip:x86/reboot] x86/reboot: Remove the duplicate C6100 entryin the reboot quirks list

[Davidlohr Bueso]

On Thu, 2013-09-26 at 11:58 -0700, tip-bot for Masoud Sharbiani wrote:
> Commit-ID:  b5eafc6f07c95e9f3dd047e72737449cb03c9956
> Gitweb:     http://git.kernel.org/tip/b5eafc6f07c95e9f3dd047e72737449cb03c9956
> Author:     Masoud Sharbiani <msharbiani@xxxxxxxxxxx>
> AuthorDate: Thu, 26 Sep 2013 10:30:43 -0700
> Committer:  Ingo Molnar <mingo@xxxxxxxxxx>
> CommitDate: Thu, 26 Sep 2013 20:52:37 +0200
> 
> x86/reboot: Remove the duplicate C6100 entry in the reboot quirks list
> 
> Two entries for the same system type were added, with two different vendor
> names: 'Dell' and 'Dell, Inc.'.
> 
> Since a prefix match is being used by the DMI parsing code, we can eliminate
> the latter as redundant.
> 
> Reported-by: "H. Peter Anvin" <hpa@xxxxxxxxx>
> Signed-off-by: Masoud Sharbiani <msharbiani@xxxxxxxxxxx>
> Cc: holt@xxxxxxx
> Link: http://lkml.kernel.org/r/1380216643-4683-1-git-send-email-masoud.sharbiani@xxxxxxxxx
> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
> ---
>  arch/x86/kernel/reboot.c | 8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
> index f0783a6..d9333a4 100644
> --- a/arch/x86/kernel/reboot.c
> +++ b/arch/x86/kernel/reboot.c
> @@ -362,14 +362,6 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
>  		.callback = set_pci_reboot,
>  		.ident = "Dell PowerEdge C6100",
>  		.matches = {
> -			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> -			DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
> -		},
> -	},
> -	{	/* Some C6100 machines were shipped with vendor being 'Dell'. */
> -		.callback = set_pci_reboot,
> -		.ident = "Dell PowerEdge C6100",
> -		.matches = {
>  			DMI_MATCH(DMI_SYS_VENDOR, "Dell"),
>  			DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
>  		},

Hmm, I think we should be keeping the 'Dell Inc.' part instead of just
'Dell' - at least the rest of the entries use the same string:

arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),


--
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/