From: Linus Walleij <linus.walleij@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Linus Walleij <linus.walleij@stericsson.com>,
Sherman Yin <syin@broadcom.com>
Subject: Re: linux-next: manual merge of the pinctrl tree with Linus' tree
Date: Thu, 29 Aug 2013 09:34:45 +0200 [thread overview]
Message-ID: <CACRpkdaPsV8OePLn0gOC8wc5Ew94KL1CUmngdrdF4M++xk9Ekg@mail.gmail.com> (raw)
In-Reply-To: <20130829171704.7a7630dd19d19ccdb9aaf384@canb.auug.org.au>
On Thu, Aug 29, 2013 at 9:17 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Linus,
>
> Today's linux-next merge of the pinctrl tree got a conflict in
> drivers/pinctrl/pinctrl-sunxi.c between commit 1bee963db9dd ("pinctrl:
> sunxi: Add spinlocks") from Linus' tree and commit 03b054e9696c
> ("pinctrl: Pass all configs to driver on pin_config_set()") from the
> pinctrl tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Hm yeah I think I should just merge in the latest -rc to smoothen
this over, as both conflicting patches come from my tree...
Yours,
Linus Walleij
next prev parent reply other threads:[~2013-08-29 7:34 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-29 7:17 linux-next: manual merge of the pinctrl tree with Linus' tree Stephen Rothwell
2013-08-29 7:34 ` Linus Walleij [this message]
2013-08-29 7:45 ` Linus Walleij
2013-08-29 15:24 ` Sherman Yin
2013-08-29 17:20 ` Linus Walleij
2013-08-29 17:21 ` Linus Walleij
-- strict thread matches above, loose matches on Subject: below --
2013-12-13 4:02 linux-next: manual merge of the pinctrl tree with Linus'tree Stephen Rothwell
2013-12-13 4:01 linux-next: manual merge of the pinctrl tree with Linus' tree Stephen Rothwell
2013-06-17 6:11 Stephen Rothwell
2013-06-17 7:09 ` Sebastian Andrzej Siewior
2012-10-12 3:30 Stephen Rothwell
2012-10-12 3:08 Stephen Rothwell
2012-10-12 3:01 Stephen Rothwell
2012-10-12 2:56 Stephen Rothwell
2012-05-28 3:08 Stephen Rothwell
2012-05-28 15:24 ` Linus Walleij
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=CACRpkdaPsV8OePLn0gOC8wc5Ew94KL1CUmngdrdF4M++xk9Ekg@mail.gmail.com \
--to=linus.walleij@linaro.org \
--cc=linus.walleij@stericsson.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=sfr@canb.auug.org.au \
--cc=syin@broadcom.com \
/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).