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 the pinctrl tree
Date: Fri, 21 Dec 2012 13:20:14 +1100 [thread overview]
Message-ID: <20121221132014.0bf8772fb3e48c51cec1548a@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the arm-soc tree got conflicts in
drivers/pinctrl/pinctrl-exynos5440.c and
drivers/pinctrl/pinctrl-samsung.c between commit e5b4c9d4ab55 ("pinctrl:
exynos5440: Fix compile error in pinctrl-exynos5440/samsung.c") from the
pinctrl tree and commit d5fd5da290ce ("pinctrl: exynos5440/samsung:
Staticize pcfgs") from the arm-soc tree.
The former is a superset of the latter, so I used that (no action
is required).
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
-------------- 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/20121221/deffb86d/attachment.sig>
next reply other threads:[~2012-12-21 2:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-21 2:20 Stephen Rothwell [this message]
2012-12-21 3:38 ` linux-next: manual merge of the arm-soc tree with the pinctrl tree Kukjin Kim
2012-12-26 0:34 ` Linus Walleij
-- strict thread matches above, loose matches on Subject: below --
2013-04-10 7:10 Stephen Rothwell
2013-01-30 13:36 Stephen Rothwell
2012-11-26 9:34 Stephen Rothwell
2012-11-26 10:11 ` Nicolas Ferre
2012-11-13 4:17 Stephen Rothwell
2012-11-13 8:51 ` Nicolas Ferre
2012-11-09 2:31 Stephen Rothwell
2012-11-09 10:10 ` Linus Walleij
2012-10-26 3:27 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=20121221132014.0bf8772fb3e48c51cec1548a@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