From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Shawn Guo <shawn.guo@linaro.org>,
Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the tip tree with the arm-soc tree
Date: Wed, 2 Apr 2014 11:47:15 +1100 [thread overview]
Message-ID: <20140402114715.471bcdb0962ef38c17120530@canb.auug.org.au> (raw)
In-Reply-To: <20140320143603.a2f82d77be61c09a7852cfe9@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2126 bytes --]
Hi all,
On Thu, 20 Mar 2014 14:36:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/arm/mach-imx/pm-imx6q.c between commit 9cdde7217e92 ("ARM: imx6:
> rename pm-imx6q.c to pm-imx6.c") from the arm-soc tree and commit
> 8435cf757632 ("arm: Replace various irq_desc accesses") from the tip tree.
>
> I fixed it up (by applying the tip tree patch to the renamed file -
> arch/arm/mach-imx/pm-imx6.c - see patch below) and can carry the fix as
> necessary (no action is required).
The below merge fixup is now needed when the arm-soc tree is merged with
Linus' tree (as well as removing arch/arm/mach-imx/pm-imx6q.c).
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 20 Mar 2014 14:33:26 +1100
> Subject: [PATCH] arm: Replace various irq_desc accesses fix for file move
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/arm/mach-imx/pm-imx6.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
> index 16f0d249f6a7..9392a8f4ef24 100644
> --- a/arch/arm/mach-imx/pm-imx6.c
> +++ b/arch/arm/mach-imx/pm-imx6.c
> @@ -241,7 +241,7 @@ static void imx6q_enable_wb(bool enable)
>
> int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode)
> {
> - struct irq_desc *iomuxc_irq_desc;
> + struct irq_data *iomuxc_irq_data = irq_get_irq_data(32);
> u32 val = readl_relaxed(ccm_base + CLPCR);
>
> val &= ~BM_CLPCR_LPM;
> @@ -288,10 +288,9 @@ int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode)
> * 3) Software should mask IRQ #32 right after CCM Low-Power mode
> * is set (set bits 0-1 of CCM_CLPCR).
> */
> - iomuxc_irq_desc = irq_to_desc(32);
> - imx_gpc_irq_unmask(&iomuxc_irq_desc->irq_data);
> + imx_gpc_irq_unmask(iomuxc_irq_data);
> writel_relaxed(val, ccm_base + CLPCR);
> - imx_gpc_irq_mask(&iomuxc_irq_desc->irq_data);
> + imx_gpc_irq_mask(iomuxc_irq_data);
>
> return 0;
> }
> --
> 1.9.0
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2014-04-02 0:47 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-20 3:36 linux-next: manual merge of the tip tree with the arm-soc tree Stephen Rothwell
2014-04-02 0:47 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-16 1:21 Stephen Rothwell
2018-10-08 2:32 Stephen Rothwell
2018-03-19 3:06 Stephen Rothwell
2018-04-02 23:48 ` Stephen Rothwell
2018-03-13 3:11 Stephen Rothwell
2015-07-28 2:20 Stephen Rothwell
2014-09-26 6:25 Stephen Rothwell
2014-09-29 18:12 ` Tony Lindgren
2014-03-28 3:50 Stephen Rothwell
2014-03-28 3:47 Stephen Rothwell
2014-03-28 3:39 Stephen Rothwell
2014-03-17 5:37 Stephen Rothwell
2014-03-17 5:35 Stephen Rothwell
2014-03-17 16:41 ` Sören Brinkmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140402114715.471bcdb0962ef38c17120530@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=hpa@zytor.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=olof@lixom.net \
--cc=peterz@infradead.org \
--cc=shawn.guo@linaro.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).