[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CACRpkdYfG35UUGZZ=N4GQEkEEV_xEK9dhrz3YQ+kS7DaOSOjGA@mail.gmail.com>
Date: Sun, 10 Feb 2013 16:01:54 +0100
From: Linus Walleij <linus.walleij@...aro.org>
To: Olof Johansson <olof@...om.net>
Cc: Linus Walleij <linus.walleij@...ricsson.com>,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
Stephen Warren <swarren@...dia.com>,
Anmar Oueja <anmar.oueja@...aro.org>,
Lee Jones <lee.jones@...aro.org>, arm@...nel.org
Subject: Re: [PATCH 11/14] ARM: ux500: remove irq_base property from platform_data
On Sun, Feb 10, 2013 at 3:42 AM, Olof Johansson <olof@...om.net> wrote:
> This patch on its own doesn't apply cleanly at all to arm-soc, I'm guessing
> because I need the rest of the series. With the presumption that you're not
> going to cause grief from sfr due to excessive conflicts. I.e. please try
> merging with arm-soc for-next to see how bad it is:
OK, there were bad conflicts with two device tree patches.
So I'm going to take that stuff out and funnel through ARM SoC
instead.
I have a number of DT patches from Lee on a queues pull request
anyway, so I'll just stack these on top of that and then hopefully things
will fix themselves up.
> patch 11-14:
> Acked-by: Olof Johansson <olof@...om.net>
Thanks, I took only 11, 12 into the pinctrl tree. It's better off
like this.
Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists