On 09/23/2013 06:37 AM, tip-bot for Masoud Sharbiani wrote:
>
> diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
> index 563ed91..5f4ad27 100644
> --- a/arch/x86/kernel/reboot.c
> +++ b/arch/x86/kernel/reboot.c
> @@ -358,6 +358,22 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
> DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"),
> },
> },
> + { /* Handle problems with rebooting on the Dell PowerEdge C6100. */
> + .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"),
> + },
Aren't these substring matches anyway? If so, the first entry is redundant.
-hpa
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html