On 08/27/2013 05:01 PM, Kevin Hilman wrote: >>> What do we do now? >> >> Cannot you just merge the stable arm-soc/dt branch into your branch >> before applying your patches? > > Unfortunately, the next/dt branch of arm-soc is not necessarily stable > so should *not* be merged. In fact none of the arm-soc branches should > be considered stable. > > As was already mentioned, this should be split up into driver changes > and DTS changes through arm-soc. They'll both merge for v3.12. But splitting will break the driver until .dts & code is in sync again. > BTW, how did this patch get merged without a signoff/ack from the OMAP > DT maintainer in the first place? Hmm, looks like Benoit was not copied > nor was linux-omap or linux-arm-kernel copied in the original mails. Hmm. I had Benoit's okay [0] to do the change "as long as Felipe is fine with it". I indeed forgot to Cc Benoit on the dts changes. For the phy-rename Felipe pinged you and we did the topic-branch, here I forgot. > > Kevin [0] http://www.spinics.net/lists/linux-usb/msg88423.html Sebastian -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
