Hi Lars and Linus, On 08/29/2014 09:34 AM, Lars-Peter Clausen wrote: > On 08/29/2014 09:20 AM, Linus Walleij wrote: >> On Thu, Aug 21, 2014 at 3:30 PM, Lars-Peter Clausen <lars@xxxxxxxxxx> wrote: >>> On 08/21/2014 02:40 PM, Linus Walleij wrote: >>>> >>>> On Mon, Aug 18, 2014 at 4:54 AM, Lars-Peter Clausen <lars@xxxxxxxxxx> >>>> wrote: >>>> >>>>> When looking up the IRQ the bank offset needs to be taken into account. >>>>> Otherwise interrupts for banks other than bank 0 get incorrectly reported >>>>> as >>>>> interrupts for bank 0. >>>>> >>>>> Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx> >>>>> --- >>>>> Changes since v1: >>>>> * Use lookup table instead of switch-case. >>>> >>>> >>>> I tried to apply this, but it doesn't apply on top of the other patch >>>> "gpio: zynq: Fix IRQ handlers" that I have queued for fixes. >>> >>> >>> Works fine for me. Did you try to apply both patch 1 and 2 of this series or >>> just patch 2? >> >> Yes, and on my fixes branch, as well as on Torvald's master (which now >> has patch 1/2) this happens: >> >> ]$ git am --signoff zynq2.patch >> Applying: gpio: zynq: Take bank offset into account when reporting a IRQ >> error: patch failed: drivers/gpio/gpio-zynq.c:461 >> error: drivers/gpio/gpio-zynq.c: patch does not apply >> Patch failed at 0001 gpio: zynq: Take bank offset into account when >> reporting a IRQ >> >> Can you please test applying this patch only on upstream this and figure >> out what is wrong? > > I think there is some confusion here, maybe two different series got mixed up. Patch 1 of this series is "gpio: zynq: Reduce level of indention in zynq_gpio_irqhandler()", which you just applied, but which is not in Linus' tree or the public gpio tree yet. I have no problem to apply that patches on the top of Linus tree. Here is the branch with that two patches. http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=shortlog;h=refs/heads/xnext/zynq-gpio Feel free to cherry pick them from this branch. Thanks, Michal
Attachment:
signature.asc
Description: OpenPGP digital signature
