All of lore.kernel.org
 help / color / mirror / Atom feed
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,
	Marc Zyngier <marc.zyngier@arm.com>,
	Jason Cooper <jason@lakedaemon.net>, Felipe Balbi <balbi@ti.com>,
	Tony Lindgren <tony@atomide.com>
Subject: linux-next: manual merge of the tip tree with the arm-soc tree
Date: Fri, 26 Sep 2014 16:25:12 +1000	[thread overview]
Message-ID: <20140926162512.07ef4957@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 963 bytes --]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/arm/mach-omap2/irq.c between commit 8598066cddd1 ("arm: omap: irq:
move irq.c to drivers/irqchip/") from the arm-soc tree and commit
f978999f6096 ("Use the new handle_domain_irq method to handle
interrupts") from the tip tree.

I fixed it up (I applied the latter patch to the moved file - see
below) and can carry the fix as necessary (no action is required).

diff --git a/drivers/irqchip/irq-omap-intc.c b/drivers/irqchip/irq-omap-intc.c
index f3814e79192d..28718d3e8281 100644
--- a/drivers/irqchip/irq-omap-intc.c
+++ b/drivers/irqchip/irq-omap-intc.c
@@ -334,8 +334,7 @@ out:
 		irqnr &= ACTIVEIRQ_MASK;
 
 		if (irqnr) {
-			irqnr = irq_find_mapping(domain, irqnr);
-			handle_IRQ(irqnr, regs);
+			handle_domain_irq(domain, irqnr, regs);
 			handled_irq = 1;
 		}
 	} while (irqnr);

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

WARNING: multiple messages have this Message-ID (diff)
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,
	Marc Zyngier <marc.zyngier@arm.com>,
	Jason Cooper <jason@lakedaemon.net>, Felipe Balbi <balbi@ti.com>,
	Tony Lindgren <tony@atomide.com>
Subject: linux-next: manual merge of the tip tree with the arm-soc tree
Date: Fri, 26 Sep 2014 16:25:12 +1000	[thread overview]
Message-ID: <20140926162512.07ef4957@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 963 bytes --]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/arm/mach-omap2/irq.c between commit 8598066cddd1 ("arm: omap: irq:
move irq.c to drivers/irqchip/") from the arm-soc tree and commit
f978999f6096 ("Use the new handle_domain_irq method to handle
interrupts") from the tip tree.

I fixed it up (I applied the latter patch to the moved file - see
below) and can carry the fix as necessary (no action is required).

diff --git a/drivers/irqchip/irq-omap-intc.c b/drivers/irqchip/irq-omap-intc.c
index f3814e79192d..28718d3e8281 100644
--- a/drivers/irqchip/irq-omap-intc.c
+++ b/drivers/irqchip/irq-omap-intc.c
@@ -334,8 +334,7 @@ out:
 		irqnr &= ACTIVEIRQ_MASK;
 
 		if (irqnr) {
-			irqnr = irq_find_mapping(domain, irqnr);
-			handle_IRQ(irqnr, regs);
+			handle_domain_irq(domain, irqnr, regs);
 			handled_irq = 1;
 		}
 	} while (irqnr);

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the tip tree with the arm-soc tree
Date: Fri, 26 Sep 2014 16:25:12 +1000	[thread overview]
Message-ID: <20140926162512.07ef4957@canb.auug.org.au> (raw)

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/arm/mach-omap2/irq.c between commit 8598066cddd1 ("arm: omap: irq:
move irq.c to drivers/irqchip/") from the arm-soc tree and commit
f978999f6096 ("Use the new handle_domain_irq method to handle
interrupts") from the tip tree.

I fixed it up (I applied the latter patch to the moved file - see
below) and can carry the fix as necessary (no action is required).

diff --git a/drivers/irqchip/irq-omap-intc.c b/drivers/irqchip/irq-omap-intc.c
index f3814e79192d..28718d3e8281 100644
--- a/drivers/irqchip/irq-omap-intc.c
+++ b/drivers/irqchip/irq-omap-intc.c
@@ -334,8 +334,7 @@ out:
 		irqnr &= ACTIVEIRQ_MASK;
 
 		if (irqnr) {
-			irqnr = irq_find_mapping(domain, irqnr);
-			handle_IRQ(irqnr, regs);
+			handle_domain_irq(domain, irqnr, regs);
 			handled_irq = 1;
 		}
 	} while (irqnr);

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140926/b76d145a/attachment.sig>

             reply	other threads:[~2014-09-26  6:25 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-26  6:25 Stephen Rothwell [this message]
2014-09-26  6:25 ` linux-next: manual merge of the tip tree with the arm-soc tree Stephen Rothwell
2014-09-26  6:25 ` Stephen Rothwell
2014-09-29 18:12 ` Tony Lindgren
2014-09-29 18:12   ` Tony Lindgren
  -- strict thread matches above, loose matches on Subject: below --
2023-01-16  1:21 Stephen Rothwell
2023-01-16  1:21 ` Stephen Rothwell
2018-10-08  2:32 Stephen Rothwell
2018-10-08  2:32 ` Stephen Rothwell
2018-03-19  3:06 Stephen Rothwell
2018-03-19  3:06 ` Stephen Rothwell
2018-04-02 23:48 ` Stephen Rothwell
2018-04-02 23:48   ` Stephen Rothwell
2018-03-13  3:11 Stephen Rothwell
2018-03-13  3:11 ` Stephen Rothwell
2015-07-28  2:20 Stephen Rothwell
2015-07-28  2:20 ` Stephen Rothwell
2015-07-28  2:20 ` Stephen Rothwell
2014-03-28  3:50 Stephen Rothwell
2014-03-28  3:50 ` Stephen Rothwell
2014-03-28  3:50 ` Stephen Rothwell
2014-03-28  3:47 Stephen Rothwell
2014-03-28  3:47 ` Stephen Rothwell
2014-03-28  3:47 ` Stephen Rothwell
2014-03-28  3:39 Stephen Rothwell
2014-03-28  3:39 ` Stephen Rothwell
2014-03-28  3:39 ` Stephen Rothwell
2014-03-20  3:36 Stephen Rothwell
2014-03-20  3:36 ` Stephen Rothwell
2014-03-20  3:36 ` Stephen Rothwell
2014-04-02  0:47 ` Stephen Rothwell
2014-04-02  0:47   ` Stephen Rothwell
2014-04-02  0:47   ` Stephen Rothwell
2014-03-17  5:37 Stephen Rothwell
2014-03-17  5:37 ` Stephen Rothwell
2014-03-17  5:37 ` Stephen Rothwell
2014-03-17  5:35 Stephen Rothwell
2014-03-17  5:35 ` Stephen Rothwell
2014-03-17  5:35 ` Stephen Rothwell
2014-03-17 16:41 ` Sören Brinkmann
2014-03-17 16:41   ` Sören Brinkmann
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=20140926162512.07ef4957@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=balbi@ti.com \
    --cc=hpa@zytor.com \
    --cc=jason@lakedaemon.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=mingo@elte.hu \
    --cc=olof@lixom.net \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=tony@atomide.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.