From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with Linus' tree
Date: Thu, 8 Mar 2012 17:07:51 +1100 [thread overview]
Message-ID: <20120308170751.8197b85ec3ab0a95e99ce945@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-vexpress/Kconfig between commit 43a6955fa8c3 ("ARM: 7346/1:
errata: fix PL310 erratum #753970 workaround selection") from Linus' tree
and commit 8deed1786a64 ("ARM: vexpress: Add Device Tree support") from
the arm-soc tree.
The latter took the former into account, so I dropped the former for this
file.
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120308/420c7380/attachment.sig>
next reply other threads:[~2012-03-08 6:07 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 6:07 Stephen Rothwell [this message]
2012-03-15 6:50 linux-next: manual merge of the arm-soc tree with Linus' tree Stephen Rothwell
2012-03-15 9:51 ` Laurent Pinchart
2012-03-15 20:01 ` Arnd Bergmann
2012-03-15 21:36 ` Rafael J. Wysocki
2012-07-30 2:53 Stephen Rothwell
2012-10-04 4:33 Stephen Rothwell
2013-03-18 3:49 Stephen Rothwell
2013-07-08 4:03 Stephen Rothwell
2013-08-27 8:26 Stephen Rothwell
2013-08-27 8:29 Stephen Rothwell
2013-08-27 16:17 ` Stephen Warren
2013-08-28 0:06 ` Stephen Rothwell
2014-01-23 0:23 Stephen Rothwell
2014-01-30 0:19 Stephen Rothwell
2014-01-30 5:33 ` Kevin Hilman
2014-01-30 21:47 ` Mike Turquette
2015-06-01 0:25 Stephen Rothwell
2015-06-01 7:12 ` Michal Simek
2015-08-23 23:55 Stephen Rothwell
2016-01-20 22:40 Stephen Rothwell
2016-09-05 0:58 Stephen Rothwell
2016-09-05 18:26 ` Russell King - ARM Linux
2016-09-06 10:17 ` Arnd Bergmann
2016-09-06 10:42 ` Russell King - ARM Linux
2016-09-25 16:07 ` Robert Jarzmik
2018-10-28 23:08 Stephen Rothwell
2018-10-28 23:14 Stephen Rothwell
2018-10-29 15:02 ` Tony Lindgren
2019-06-23 22:54 Stephen Rothwell
2022-05-27 0:39 Stephen Rothwell
2022-05-27 15:38 ` Hawkins, Nick
2022-05-28 0:29 ` 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=20120308170751.8197b85ec3ab0a95e99ce945@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-arm-kernel@lists.infradead.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).