* linux-next: manual merge of the regmap tree with the mfd tree
@ 2011-09-20 5:42 Stephen Rothwell
2011-09-20 10:05 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-09-20 5:42 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-next, linux-kernel, Samuel Ortiz
Hi Mark,
Today's linux-next merge of the regmap tree got a conflict in
drivers/mfd/wm831x-spi.c between commit 7ba771ee9c6f ("mfd: Support
software initiated shutdown of WM831x PMICs") from the mfd tree and
commit 5570c2f709bd ("mfd: Use device ID matching for WM831x SPI driver")
from the regmap tree.
I am not sure of the resolution here, so I just used the regmap tree
version (which drops the shutdown member of wm8311_spi_driver added in
the mfd version).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-20 10:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-20 5:42 linux-next: manual merge of the regmap tree with the mfd tree Stephen Rothwell
2011-09-20 10:05 ` Mark Brown
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).