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,
Tony Prisk <linux@prisktech.co.nz>, Greg KH <greg@kroah.com>
Subject: linux-next: manual merge of the arm-soc tree with the tree
Date: Tue, 25 Sep 2012 16:37:24 +1000 [thread overview]
Message-ID: <20120925163724.703a41b9438fbaef84b7480e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 537 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
Documentation/devicetree/bindings/usb/platform-uhci.txt between commit
100d45970327 ("ARM: vt8500: Add support for UHCI companion controller")
from the usb tree and commit 95e9fd10f06c ("arm: vt8500: doc: Add device
tree bindings for arch-vt8500 devices") from the arm-soc tree.
I used the version from the arm-soc tree 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:[~2012-09-25 6:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 6:37 Stephen Rothwell [this message]
2012-09-25 7:14 ` linux-next: manual merge of the arm-soc tree with the tree Tony Prisk
-- strict thread matches above, loose matches on Subject: below --
2014-05-27 0:45 Stephen Rothwell
2014-05-27 17:49 ` Tony Lindgren
2014-04-07 0:21 Stephen Rothwell
2013-10-29 7:57 Stephen Rothwell
2013-06-21 6:45 Stephen Rothwell
2012-11-27 4:48 Stephen Rothwell
2012-09-17 8:02 Stephen Rothwell
2012-03-08 6:03 Stephen Rothwell
2012-03-08 6:17 ` 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=20120925163724.703a41b9438fbaef84b7480e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--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 \
/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).