On Sun, Apr 1, 2012 at 10:10 AM, Chris Ball <cjb@xxxxxxxxxx> wrote: > Hi, > > On Fri, Mar 16 2012, Venkatraman S wrote: >> Chris, >> Here are a group of fixes posted by Felipe and Balaji for the >> OMAP hsmmc driver in the past few days. >> I've rebased them to the lastest mmc-next and posted them >> here again. These have also been tested on OMAP4 development platform. >> >> Please feel to apply directly or pull if that's convenient. >> >> Changes since yesterday (v1):- >> Fixed formatting issues as suggested by Felipe >> Marked some patches for stable. >> >> The following changes since commit 5f0390f10c0e9c9c504cdbf4af802252628a2490: >> >> mmc: omap_hsmmc: Avoid a regulator voltage change with dt (2012-03-14 11:33:20 -0400) >> >> are available in the git repository at: >> >> git://github.com/svenkatr/linux.git omap-mmc-pending-for-3.4 >> >> for you to fetch changes up to 8d54766b608915035b47616ea564e4e9b4dda29c: >> >> mmc: omap4: hsmmc: fix module re-insertion (2012-03-16 11:38:41 +0530) > > I've just rebased mmc-next on top of 3.4-rc1, and now there are many > conflicts against your tree -- please could you resend patches 3-8 > against that base? I'll take them for 3.4, and will take patches 1-2 > for 3.5. > I've rebased patches 3-8 into a new branch (See below). I'll send you 1-2 on top of 3.4-rc2 once it's out. Is it Ok ? ============== The following changes since commit a4dfa827bb5b9a984d4000ffb80134b9495e4d8a: mmc: sdio: Use empty system suspend/resume callbacks at the bus level (2012-04-01 00:35:06 -0400) are available in the git repository at: git://github.com/svenkatr/linux.git omap-mmc-fixes-3.4 for you to fetch changes up to 80f833a2f77b8d6464209c0bb00a39ad835356a0: mmc: omap4: hsmmc: fix module re-insertion (2012-04-02 12:26:47 +0530) ---------------------------------------------------------------- Balaji T K (3): mmc: omap: use runtime put sync in probe error patch mmc: omap: context save after enabling runtime pm mmc: omap4: hsmmc: fix module re-insertion Felipe Balbi (3): mmc: host: omap_hsmmc: trivial cleanups mmc: host: omap_hsmmc: make it behave well as a module mmc: host: omap_hsmmc: convert to module_platform_driver drivers/mmc/host/omap_hsmmc.c | 181 +++++++++++++++++++++-------------------------- 1 file changed, 79 insertions(+), 102 deletions(-) Regards, Venkat. -- 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