2017-08-31 01:08:03

by Stephen Rothwell

Subject: linux-next: manual merge of the pm tree with the dmi tree

Hi all,

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
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--
Cheers,
Stephen Rothwell

2017-09-01 13:20:24

by Jean Delvare

Subject: Re: linux-next: manual merge of the pm tree with the dmi tree

Hi Stephen,

On jeu., 2017-08-31 at 11:07 +1000, Stephen Rothwell wrote:
> Hi all,
>
> 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?

> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

--
Jean Delvare
SUSE L3 Support

2017-09-04 06:37:36

by Stephen Rothwell

Subject: Re: 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 <[email protected]> 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

2017-09-04 23:17:37

by Kani, Toshimitsu

Subject: RE: 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 <[email protected]> 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:

The merge change below looks good to me.
Thanks,
-Toshi


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