* linux-next: manual merge of the renesas tree with the gen-gpio tree
@ 2013-04-17 6:02 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-04-17 6:02 UTC (permalink / raw)
To: Simon Horman
Cc: linux-next, linux-kernel, Alexandre Courbot, Laurent Pinchart
[-- Attachment #1: Type: text/plain, Size: 471 bytes --]
Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in
drivers/pinctrl/sh-pfc/Kconfig between commit 76ec9d18b897 ("Convert
selectors of GENERIC_GPIO to GPIOLIB") from the gen-gpio tree and commit
809e5fce84f4 ("sh-pfc: Remove dependency on GPIOLIB") from the renesas
tree.
I fixed it up (using the latter) 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 --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-04-17 6:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-17 6:02 linux-next: manual merge of the renesas tree with the gen-gpio tree Stephen Rothwell
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).