Benoit Cousson <b-cousson@xxxxxx> writes: > The original OMAP4 hwmod data files is fully generated from HW > database. But since the file is introduced incrementaly along > with driver that uses the data, it has to be splitted by the driver > owner and then re-merged by the maintainer. > Because of the similarity of the data, git is completely lost > during such merge and thus the data does not look like the original one > at the end. > > Re-order properly the structures to stay in sync with original data set. > > Add a comment that does contain all the IPs that can have a hwmod, but > do not have it in the file for the moment. It gives a good indication > of the progress. > > Signed-off-by: Benoit Cousson <b-cousson@xxxxxx> > Cc: Paul Walmsley <paul@xxxxxxxxx> > Cc: Rajendra Nayak <rnayak@xxxxxx> > Cc: Govindraj.R <govindraj.raja@xxxxxx> > Cc: Charulatha V <charu@xxxxxx> > Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> My (mostly) blind git merges caused this problem in the first place. Sorry. Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html