Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1205508 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-08-12 01:50 +0200 |
| Last post | 2015-08-12 02:00 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the arm-soc tree with the arm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-12 01:50 +0200
Re: linux-next: manual merge of the arm-soc tree with the arm tree Nicolas Pitre <nicolas.pitre@linaro.org> - 2015-08-12 02:00 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-08-12 01:50 +0200 |
| Subject | linux-next: manual merge of the arm-soc tree with the arm tree |
| Message-ID | <pWrsS-3u0-9@gated-at.bofh.it> |
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
arch/arm/kernel/psci.c
between commit:
be120397e770 ("ARM: migrate to common PSCI client code")
from the arm tree and commit:
19c233b79d1a ("ARM: appropriate __init annotation for const data")
from the arm-soc tree.
I fixed it up (the former removed the file, so I did that, then added
the following patch) and can carry the fix as necessary (no action
is required).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Aug 2015 09:39:15 +1000
Subject: [PATCH] ARM: fix for PSCI code movement
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/firmware/psci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index a6956007dd38..42700f09a8c5 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -337,7 +337,7 @@ out_put_node:
return err;
}
-static const struct of_device_id psci_of_match[] __initconst = {
+static const struct of_device_id const psci_of_match[] __initconst = {
{ .compatible = "arm,psci", .data = psci_0_1_init},
{ .compatible = "arm,psci-0.2", .data = psci_0_2_init},
{},
--
2.5.0
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Nicolas Pitre <nicolas.pitre@linaro.org> |
|---|---|
| Date | 2015-08-12 02:00 +0200 |
| Message-ID | <pWrCx-3Fa-1@gated-at.bofh.it> |
| In reply to | #1205508 |
On Wed, 12 Aug 2015, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in:
>
> arch/arm/kernel/psci.c
>
> between commit:
>
> be120397e770 ("ARM: migrate to common PSCI client code")
>
> from the arm tree and commit:
>
> 19c233b79d1a ("ARM: appropriate __init annotation for const data")
>
> from the arm-soc tree.
>
> I fixed it up (the former removed the file, so I did that, then added
> the following patch) and can carry the fix as necessary (no action
> is required).
The fix is correct, thanks.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 12 Aug 2015 09:39:15 +1000
> Subject: [PATCH] ARM: fix for PSCI code movement
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/firmware/psci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
> index a6956007dd38..42700f09a8c5 100644
> --- a/drivers/firmware/psci.c
> +++ b/drivers/firmware/psci.c
> @@ -337,7 +337,7 @@ out_put_node:
> return err;
> }
>
> -static const struct of_device_id psci_of_match[] __initconst = {
> +static const struct of_device_id const psci_of_match[] __initconst = {
> { .compatible = "arm,psci", .data = psci_0_1_init},
> { .compatible = "arm,psci-0.2", .data = psci_0_2_init},
> {},
> --
> 2.5.0
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web