| Message ID | 20120103085137.GH5446@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
Hi Sascha, On Tue, Jan 3, 2012 at 12:51 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > Hi Arnd, Olof, > > Please pull the following eukrea board specific patches. They > currently conflict with the patches merging mach-mx5 to mach-imx. > Let me know if I have to rebase them. > > Sascha > > The following changes since commit 384703b8e6cd4c8ef08512e596024e028c91c339: > > Linux 3.2-rc6 (2011-12-16 18:36:26 -0800) > > are available in the git repository at: > git://git.pengutronix.de/git/imx/linux-2.6.git imx-features-eukrea > > Eric Bénard (9): > mxc_udc: add workaround for ENGcm09152 for i.MX25 > eukrea_cpuimx25: enable workaround ENGcm09152 > mbimxsd25: add spi controler and spidev support > cpuimx25: add watchdog support > mbimxsd35: add spi controler and spidev support > eukrea-cpuimx51: remove board > cpuimx51sd: add watchdog support > mbimx51sd: add audio codec support > eukrea-cpuimx51sd: support rev2 PCB Can you please change the patch subjects of these and future patches. They should generally be on the form: ARM: <platform>: <subplatform or topic>: <...> So, in your case: ARM: imx: ... Thanks! -Olof
Hi Olof, Hi Sascha, Le Tue, 3 Jan 2012 09:37:52 -0800, Olof Johansson <olof@lixom.net> a écrit : > On Tue, Jan 3, 2012 at 12:51 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > > Hi Arnd, Olof, > > > > Please pull the following eukrea board specific patches. They > > currently conflict with the patches merging mach-mx5 to mach-imx. > > Let me know if I have to rebase them. > > > > Sascha > > > > The following changes since commit 384703b8e6cd4c8ef08512e596024e028c91c339: > > > > Linux 3.2-rc6 (2011-12-16 18:36:26 -0800) > > > > are available in the git repository at: > > git://git.pengutronix.de/git/imx/linux-2.6.git imx-features-eukrea > > > > Eric Bénard (9): > > mxc_udc: add workaround for ENGcm09152 for i.MX25 > > eukrea_cpuimx25: enable workaround ENGcm09152 > > mbimxsd25: add spi controler and spidev support > > cpuimx25: add watchdog support > > mbimxsd35: add spi controler and spidev support > > eukrea-cpuimx51: remove board > > cpuimx51sd: add watchdog support > > mbimx51sd: add audio codec support > > eukrea-cpuimx51sd: support rev2 PCB > > Can you please change the patch subjects of these and future patches. > They should generally be on the form: > > ARM: <platform>: <subplatform or topic>: <...> > > So, in your case: > > ARM: imx: ... > will send a v2 tomorrow Eric
Hi Arnd, Olof, Please pull the following eukrea board specific patches. They currently conflict with the patches merging mach-mx5 to mach-imx. Let me know if I have to rebase them. Sascha The following changes since commit 384703b8e6cd4c8ef08512e596024e028c91c339: Linux 3.2-rc6 (2011-12-16 18:36:26 -0800) are available in the git repository at: git://git.pengutronix.de/git/imx/linux-2.6.git imx-features-eukrea Eric Bénard (9): mxc_udc: add workaround for ENGcm09152 for i.MX25 eukrea_cpuimx25: enable workaround ENGcm09152 mbimxsd25: add spi controler and spidev support cpuimx25: add watchdog support mbimxsd35: add spi controler and spidev support eukrea-cpuimx51: remove board cpuimx51sd: add watchdog support mbimx51sd: add audio codec support eukrea-cpuimx51sd: support rev2 PCB arch/arm/configs/mx5_defconfig | 1 - arch/arm/mach-imx/Kconfig | 3 + arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 39 +++ arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 39 +++ arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 2 + arch/arm/mach-mx5/Kconfig | 32 +--- arch/arm/mach-mx5/Makefile | 2 - arch/arm/mach-mx5/board-cpuimx51.c | 300 ------------------------ arch/arm/mach-mx5/board-cpuimx51sd.c | 49 ++++- arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 206 ---------------- arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 28 +++ drivers/usb/gadget/fsl_mxc_udc.c | 22 +- 12 files changed, 167 insertions(+), 556 deletions(-) delete mode 100644 arch/arm/mach-mx5/board-cpuimx51.c delete mode 100644 arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c