From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sachin Kamat <sachin.kamat@linaro.org>,
Linus Walleij <linus.walleij@linaro.org>,
Tony Prisk <linux@prisktech.co.nz>
Subject: linux-next: manual merge of the arm-soc tree with the gpio-lw tree
Date: Tue, 9 Apr 2013 17:47:47 +1000 [thread overview]
Message-ID: <20130409174747.873a9c9cad1cd6a4dbe4014f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 485 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/gpio/gpio-vt8500.c between commit 808c513ee64b ("gpio/vt8500:
Convert to devm_ioremap_resource()") from the gpio-lw tree and commit
dc1010860b03 ("gpio: vt8500: Remove arch-vt8500 gpio driver") from the
arm-soc tree.
The latter removed the file, so I did that and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-04-09 7:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-09 7:47 Stephen Rothwell [this message]
2013-04-09 9:04 ` linux-next: manual merge of the arm-soc tree with the gpio-lw tree Tony Prisk
-- strict thread matches above, loose matches on Subject: below --
2012-10-26 3:24 Stephen Rothwell
2012-07-09 6:02 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=20130409174747.873a9c9cad1cd6a4dbe4014f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@prisktech.co.nz \
--cc=olof@lixom.net \
--cc=sachin.kamat@linaro.org \
/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).