Hi, On Fri, Nov 09 2012, wwang wrote: > I have noticed that the file rtsx_pci_sdmmc.c in your mmc-next branch > is still v6 patch. In v7 patch, this MMC part has also been modified > to comply with my MFD portion. So please update to this version. > > And one more question. Samuel have merged all of my patch set in his > for-next branch, including the MMC part. I don't know whether this > will conflict with your tree in the next merge. > > Hi Samuel: > > Since the whole patch set has been merged in your for-next branch, > does it mean that you will help to merge all of the three parts to > linus's tree? I've removed the patch from my tree to avoid conflicting with Samuel. I'm happy to either have the MMC patch go through the MFD tree with: Acked-by: Chris Ball <cjb@xxxxxxxxxx> or to merge the MMC side of v7 myself, whichever Samuel prefers. Thanks, - Chris. -- Chris Ball <cjb@xxxxxxxxxx> <http://printf.net/> One Laptop Per Child _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
