[PATCHv2 05/16] gpio: mvebu: add suspend/resume support

Jason Cooper jason at lakedaemon.net
Sun Nov 30 08:49:11 PST 2014

Linus, Stephen,

On Fri, Nov 28, 2014 at 04:42:14PM +0100, Linus Walleij wrote:
> On Thu, Nov 27, 2014 at 7:44 PM, Thomas Petazzoni
> <thomas.petazzoni at free-electrons.com> wrote:
> > Dear Linus Walleij,
> >> Acked-by: Linus Walleij <linus.walleij at linaro.org>
> >>
> >> Do you want me to merge the patch or is it dependent on other patches?
> >
> > This patch has already been merged by you, and is already in
> > linux-next. See
> > https://git.kernel.org/cgit/linux/kernel/git/linusw/linux-gpio.git/commit/?h=for-next&id=b5b7b487431b01619f2947d91dadd7c7a233692e.
> Argh, haha yeah it was the resending that confused me... too many
> patches floating around. Well then, it lands upstream.

Odd.  I've had the same patch in mvebu/for-next since the 22nd of
November...  You'd think it would have caused a merge conflict.

At any rate, I've dropped it from the mvebu/soc-suspend branch and
updated mvebu/for-next.



More information about the linux-arm-kernel mailing list