Messages in this thread | | | Date | Thu, 12 Aug 2010 11:51:21 +0200 | From | Samuel Ortiz <> | Subject | Re: linux-next: manual merge of the mfd tree with Linus' tree |
| |
Hi Stephen,
On Thu, Aug 12, 2010 at 02:41:35PM +1000, Stephen Rothwell wrote: > Hi Samuel, > > Today's linux-next merge of the mfd tree got a conflict in > drivers/gpio/Kconfig between commit > c34f16b70a52e348a62944fe0d5c7c1eb9ad5b72 ("gpio: sx150x: add Semtech I2C > sx150x gpio expander driver") from Linus' tree and commit > 59d11276842199a8ee525f1e88be7eafe8614e4c ("gpio: Add STMPE GPIO driver") > from the mfd tree. > > Just overlapping additions. I fixed it up (see below) and can carry the > fix for a while. That should be fixed now on my for-next branch. Thanks a lot for the report.
Cheers, Samuel.
-- Intel Open Source Technology Centre http://oss.intel.com/
| |