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, Linus <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the arm-soc tree with the tree
Date: Mon, 7 Apr 2014 10:21:02 +1000 [thread overview]
Message-ID: <20140407102102.97ad7dcaab69324efa8d897a@canb.auug.org.au> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 484 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got conflicts in
arch/arm/boot/dts/qcom-msm8960.dtsi, arch/arm/boot/dts/qcom-msm8974.dtsi,
arch/arm/mach-omap2/pdata-quirks.c, arch/arm/mach-zynq/Kconfig,
drivers/watchdog/Kconfig and sound/soc/kirkwood/Kconfig between various
merge commits from Linus' tree and various merge commits from the arm-soc
tree.
I used the versions from Linus' tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #1.2: Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2014-04-07 0:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-07 0:21 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-05-27 0:45 linux-next: manual merge of the arm-soc tree with the tree Stephen Rothwell
2014-05-27 17:49 ` Tony Lindgren
2013-10-29 7:57 Stephen Rothwell
2013-06-21 6:45 Stephen Rothwell
2012-11-27 4:48 Stephen Rothwell
2012-09-25 6:37 Stephen Rothwell
2012-09-25 7:14 ` Tony Prisk
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=20140407102102.97ad7dcaab69324efa8d897a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=torvalds@linux-foundation.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).