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: Mon, 18 Mar 2013 14:49:48 +1100 [thread overview]
Message-ID: <20130318144948.1d2c83fb633404d206f3ea0a@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/snowball.dts between commit d52701d39e37 ("mfd: ab8500:
Kill "reg" property from binding") from Linus' tree and commit
924e82dacab9 ("ARM: ux500: allow Snowball access to the AB8500 GPIO
pins") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
diff --cc arch/arm/boot/dts/snowball.dts
index d3ec32f,b095e85..0000000
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@@ -298,7 -298,11 +298,11 @@@
};
};
- ab8500 at 5 {
+ ab8500 {
+ ab8500-gpio {
+ compatible = "stericsson,ab8500-gpio";
+ };
+
ab8500-regulators {
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
regulator-name = "V-DISPLAY";
-------------- 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/20130318/33b843f4/attachment.sig>
next reply other threads:[~2013-03-18 3:49 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-18 3:49 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-27 0:39 linux-next: manual merge of the arm-soc tree with Linus' tree Stephen Rothwell
2022-05-27 15:38 ` Hawkins, Nick
2022-05-28 0:29 ` Stephen Rothwell
2019-06-23 22:54 Stephen Rothwell
2018-10-28 23:14 Stephen Rothwell
2018-10-29 15:02 ` Tony Lindgren
2018-10-28 23:08 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
2016-01-20 22:40 Stephen Rothwell
2015-08-23 23:55 Stephen Rothwell
2015-06-01 0:25 Stephen Rothwell
2015-06-01 7:12 ` Michal Simek
2014-01-30 0:19 Stephen Rothwell
2014-01-30 5:33 ` Kevin Hilman
2014-01-30 21:47 ` Mike Turquette
2014-01-23 0:23 Stephen Rothwell
2013-08-27 8:29 Stephen Rothwell
2013-08-27 16:17 ` Stephen Warren
2013-08-28 0:06 ` Stephen Rothwell
2013-08-27 8:26 Stephen Rothwell
2013-07-08 4:03 Stephen Rothwell
2012-10-04 4:33 Stephen Rothwell
2012-07-30 2:53 Stephen Rothwell
2012-03-15 6:50 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-03-08 6:07 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=20130318144948.1d2c83fb633404d206f3ea0a@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).