lkml.org 
[lkml]   [2017]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the pm tree with the dmi tree
Hi Jean,

On Fri, 01 Sep 2017 15:20:21 +0200 Jean Delvare <jdelvare@suse.de> wrote:
>
> On jeu., 2017-08-31 at 11:07 +1000, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the pm tree got a conflict in:
> >
> > drivers/acpi/blacklist.c
> >
> > between commit:
> >
> > f996c4155d0d ("dmi: Mark all struct dmi_system_id instances const")
> >
> > from the dmi tree and commit:
> >
> > 5aa5911a0ed9 ("ACPI / blacklist: add acpi_match_platform_list()")
> >
> > from the pm tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
>
> Below, where?

Oops sorry, I think this is it:

d75dc5255183bfae1181f5e1e8b260f18794d79d
diff --cc drivers/acpi/blacklist.c
index f58bbc368f88,037fd537bbf6..995c4d8922b1
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@@ -30,24 -30,7 +30,7 @@@

#include "internal.h"

- enum acpi_blacklist_predicates {
- all_versions,
- less_than_or_equal,
- equal,
- greater_than_or_equal,
- };
- struct acpi_blacklist_item {
- char oem_id[7];
- char oem_table_id[9];
- u32 oem_revision;
- char *table;
- enum acpi_blacklist_predicates oem_revision_predicate;
- char *reason;
- u32 is_critical_error;
- };
-static struct dmi_system_id acpi_rev_dmi_table[] __initdata;
+static const struct dmi_system_id acpi_rev_dmi_table[] __initconst;

/*
* POLICY: If *anything* doesn't work, put it on the blacklist.


--
Cheers,
Stephen Rothwell

\
 
 \ /
  Last update: 2017-09-04 08:38    [W:0.054 / U:4.140 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site