linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Walleij <linus.walleij@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Jonas Aaberg <jonas.aberg@stericsson.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the pinctrl tree
Date: Fri, 9 Nov 2012 11:10:53 +0100	[thread overview]
Message-ID: <CACRpkdavH0hOWtC=T5iKLQ-BJ6h5CzROcYkZ7=nhHSR4hT6hpQ@mail.gmail.com> (raw)
In-Reply-To: <20121109133111.1070c1062889461152713978@canb.auug.org.au>

On Fri, Nov 9, 2012 at 3:31 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/pinctrl/pinctrl-nomadik.c between commit 241e51ebd3b2
> ("pinctrl/nomadik: make independent of prcmu driver") from the pinctrl
> tree and commit 44e47ccf8ab6 ("Merge branch 'next/multiplatform' into
> for-next") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

This looks like the correct fix, thanks a lot Stephen!

Yours,
Linus Walleij

  reply	other threads:[~2012-11-09 10:10 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-09  2:31 linux-next: manual merge of the arm-soc tree with the pinctrl tree Stephen Rothwell
2012-11-09 10:10 ` Linus Walleij [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-04-10  7:10 Stephen Rothwell
2013-01-30 13:36 Stephen Rothwell
2012-12-21  2:20 Stephen Rothwell
2012-12-21  3:38 ` Kukjin Kim
2012-12-26  0:34   ` Linus Walleij
2012-11-26  9:34 Stephen Rothwell
2012-11-26 10:11 ` Nicolas Ferre
2012-11-13  4:17 Stephen Rothwell
2012-11-13  8:51 ` Nicolas Ferre
2012-10-26  3:27 Stephen Rothwell

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='CACRpkdavH0hOWtC=T5iKLQ-BJ6h5CzROcYkZ7=nhHSR4hT6hpQ@mail.gmail.com' \
    --to=linus.walleij@linaro.org \
    --cc=arnd@arndb.de \
    --cc=jonas.aberg@stericsson.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=sfr@canb.auug.org.au \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).