| Message ID | 1372238855-26112-1-git-send-email-u.kleine-koenig@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
Hi Russell, On Wed, Jun 26, 2013 at 11:27:35AM +0200, Uwe Kleine-König wrote: > The name changed in response to review comments for the nvic irqchip > driver when the original name was already accepted into Russell King's > tree. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > Hello, > > this patch was part of the irqchip patch v4, but I split it out for > being easier to merge in v5. It applies on top of Russell's devel-stable > branch. > > Russell: I put it on top of my for-next branch ( > > git://git.pengutronix.de/git/ukl/linux.git for-next > > ) that you merged into your devel-stable some time ago. So assuming > you're fine with the patch, you can just repull or I can put it into > your patch tracker if you prefer it. In the latter case please tell me. The mismatch hit Linus' tree now. How should this patch get to him? Best regards Uwe
Hi Russell, On Mon, Jul 08, 2013 at 05:29:17PM +0200, Uwe Kleine-König wrote: > On Wed, Jun 26, 2013 at 11:27:35AM +0200, Uwe Kleine-König wrote: > > The name changed in response to review comments for the nvic irqchip > > driver when the original name was already accepted into Russell King's > > tree. > > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > --- > > Hello, > > > > this patch was part of the irqchip patch v4, but I split it out for > > being easier to merge in v5. It applies on top of Russell's devel-stable > > branch. > > > > Russell: I put it on top of my for-next branch ( > > > > git://git.pengutronix.de/git/ukl/linux.git for-next > > > > ) that you merged into your devel-stable some time ago. So assuming > > you're fine with the patch, you can just repull or I can put it into > > your patch tracker if you prefer it. In the latter case please tell me. > The mismatch hit Linus' tree now. How should this patch get to him? Although it's not critical (as there are no in-tree users) I still think this should go in before 3.11. Best regards Uwe
On Tue, Jul 30, 2013 at 10:15:07AM +0200, Uwe Kleine-König wrote: > Hi Russell, > > On Mon, Jul 08, 2013 at 05:29:17PM +0200, Uwe Kleine-König wrote: > > On Wed, Jun 26, 2013 at 11:27:35AM +0200, Uwe Kleine-König wrote: > > > The name changed in response to review comments for the nvic irqchip > > > driver when the original name was already accepted into Russell King's > > > tree. > > > > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > > --- > > > Hello, > > > > > > this patch was part of the irqchip patch v4, but I split it out for > > > being easier to merge in v5. It applies on top of Russell's devel-stable > > > branch. > > > > > > Russell: I put it on top of my for-next branch ( > > > > > > git://git.pengutronix.de/git/ukl/linux.git for-next > > > > > > ) that you merged into your devel-stable some time ago. So assuming > > > you're fine with the patch, you can just repull or I can put it into > > > your patch tracker if you prefer it. In the latter case please tell me. > > The mismatch hit Linus' tree now. How should this patch get to him? > Although it's not critical (as there are no in-tree users) I still think > this should go in before 3.11. Can you put it in the patch system please?
diff --git a/arch/arm/kernel/entry-v7m.S b/arch/arm/kernel/entry-v7m.S index e00621f..52b2643 100644 --- a/arch/arm/kernel/entry-v7m.S +++ b/arch/arm/kernel/entry-v7m.S @@ -49,7 +49,7 @@ __irq_entry: mov r1, sp stmdb sp!, {lr} @ routine called with r0 = irq number, r1 = struct pt_regs * - bl nvic_do_IRQ + bl nvic_handle_irq pop {lr} @
The name changed in response to review comments for the nvic irqchip driver when the original name was already accepted into Russell King's tree. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- Hello, this patch was part of the irqchip patch v4, but I split it out for being easier to merge in v5. It applies on top of Russell's devel-stable branch. Russell: I put it on top of my for-next branch ( git://git.pengutronix.de/git/ukl/linux.git for-next ) that you merged into your devel-stable some time ago. So assuming you're fine with the patch, you can just repull or I can put it into your patch tracker if you prefer it. In the latter case please tell me. Best regards Uwe arch/arm/kernel/entry-v7m.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)