On Mon, Sep 28, 2009 at 10:11:29AM -0700, Scott Branden wrote: > Hi Linus, > > You changes cause the bcmring platform to fail to compile. > > Can you go through all the ARM platforms and make the > necessary adjustments with the change in header files > for mmc? Since Linus's change has been merged, and it's a conflict caused by simultaneous development, you _both_ need to work towards sorting it out. Please put some time into looking at the changes and doing whatever's necessary to sort bcmring out. It's quite a simple change at the end of the day - a move of a header file and a rename of a structure. -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html