* Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> [121218 17:07]: > Ugh, guys. Please check this out. > > On Tue, Dec 18, 2012 at 3:41 PM, Wolfram Sang <w.sang@xxxxxxxxxxxxxx> wrote: > > > > please pull the i2c-embedded changes for 3.8 which include: > > > > * CBUS driver (an I2C variant) > > * continued rework of the omap driver > > * s3c2410 gets lots of fixes and gains pinctrl support > > * at91 gains DMA support > > * the GPIO muxer gains devicetree probing > > * typical fixes and additions all over > > > > All patches have been in linux-next before. Please pull. > > I get a conflict because both sides have this: > > Revert "ARM: OMAP: convert I2C driver to PM QoS for MPU latency constraints" > > which re-introduced the omap-specific ->set_mpu_wkup_lat() thing. > > But in mainline the only *user* of that has gone away. And the call > location where it originally existed has moved. > > It originally existed in > > arch/arm/plat-omap/i2c.c > > but looking at the history, the omap i2c code first got split into > omap1 and omap2, and at that point the call-site got moved to > > arch/arm/mach-omap2/i2c.c > > but then the code that the revert re-introduced got lost. > > Now, in the merge I just did, I *reinstated* that > ->set_mpu_wkup_lat() code that had gotten lost in mainline. But quite > frankly, the thing is ugly as heck, and I hope it could just be > deleted. Clearly nobody had noticed yet that it got lost in some merge > (possibly an earlier one of mine, but considering that I usually > notice things like this, I suspect it's one of the internal ARM ones). Your merge looks good and has zero diff to what I resolved earlier, and what Arnd and Olof resolved earlier, and what Stephen resolved earlier. It seems that the right thing to do here would have been to pull that revert into arm-soc to avoid this. > I'm adding Arnd, Tony and Olof to the participants list, since they > are the main suspects. > > And guys, if you decide to remove the ->set_mpu_wkup_lat() from > arch/arm/mach-omap2/i2c.c again, please make sure that you remove the > whole infrastructure too: > > include/linux/i2c-omap.h > drivers/i2c/busses/i2c-omap.c Looks like that's still needed until runtime PM can deal with latencies, that's why the revert was needed :( > Hmm? Somebody *really* needs to double-check my merge, it's possibly > quite broken, since I have in no way tested it, and I did this by > looking at some *very* messy history with code being moved across > different files etc etc. Yes thanks again. We've now pretty much cut all the remaining nasty dependencies between arch/arm/*omap*/ code and drivers and can enable multiplatform support for omap2+ for v3.9. So things should be a lot easier with merge conflicts as far as omap is concerned. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
