| Message ID | 20111014074747.GD13898@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
On Friday 14 October 2011, Sascha Hauer wrote: > Hi Arnd, > > Please pull the following feature branch for i.MX. > > Only trivial merge conflicts to your for-next branch, you won't need > a merge hint for this, I created a branch for you anyway just to > see if that's what you want for the next non trivial merge conflicts: > > git://git.pengutronix.de/git/imx/linux-2.6.git hint Ok, sounds good. > The following changes since commit 976d167615b64e14bc1491ca51d424e2ba9a5e84: > > Linux 3.1-rc9 (2011-10-04 18:11:50 -0700) > > are available in the git repository at: > git://git.pengutronix.de/git/imx/linux-2.6.git imx-features-for-arnd I've pulled it all into the imx/devel branch now, but I've also pulled the two parts of it into separate branches. I already have a next/board branch that contains support for new boards and now has the DENX MX28 commit added to it as well. I've put the AHCI changes into the next/driver branch that was suggested before. I still need to decide whether I submit that separately before the next/devel branch or if I drop it again (most likely if I don't get much stuff for it). Thanks, Arnd
On Thu, Oct 20, 2011 at 03:22:56PM +0200, Arnd Bergmann wrote: > On Friday 14 October 2011, Sascha Hauer wrote: > > Hi Arnd, > > > > Please pull the following feature branch for i.MX. > > > > Only trivial merge conflicts to your for-next branch, you won't need > > a merge hint for this, I created a branch for you anyway just to > > see if that's what you want for the next non trivial merge conflicts: > > > > git://git.pengutronix.de/git/imx/linux-2.6.git hint > > Ok, sounds good. > > > The following changes since commit 976d167615b64e14bc1491ca51d424e2ba9a5e84: > > > > Linux 3.1-rc9 (2011-10-04 18:11:50 -0700) > > > > are available in the git repository at: > > git://git.pengutronix.de/git/imx/linux-2.6.git imx-features-for-arnd > > I've pulled it all into the imx/devel branch now, but I've also pulled > the two parts of it into separate branches. I already have a next/board > branch that contains support for new boards and now has the DENX MX28 > commit added to it as well. I've put the AHCI changes into the next/driver > branch that was suggested before. I still need to decide whether I > submit that separately before the next/devel branch or if I drop it > again (most likely if I don't get much stuff for it). Looks like we need git-pull and git-request-pull for multiple branches at once ;) Thanks Sascha
Hi Arnd, Please pull the following feature branch for i.MX. Only trivial merge conflicts to your for-next branch, you won't need a merge hint for this, I created a branch for you anyway just to see if that's what you want for the next non trivial merge conflicts: git://git.pengutronix.de/git/imx/linux-2.6.git hint Sascha The following changes since commit 976d167615b64e14bc1491ca51d424e2ba9a5e84: Linux 3.1-rc9 (2011-10-04 18:11:50 -0700) are available in the git repository at: git://git.pengutronix.de/git/imx/linux-2.6.git imx-features-for-arnd Richard Zhu (4): AHCI Add the AHCI SATA feature on the MX53 platforms MX53 Enable the AHCI SATA on MX53 ARD board MX53 Enable the AHCI SATA on MX53 LOCO board MX53 Enable the AHCI SATA on MX53 SMD board Sascha Hauer (2): Merge branch 'features/ahci' into for-arnd-features Merge branch 'features/denx-mx28' into for-arnd-features Stefano Babic (1): ARM: mxs: Add initial support for DENX MX28 arch/arm/configs/mxs_defconfig | 1 + arch/arm/mach-mx5/board-mx53_ard.c | 1 + arch/arm/mach-mx5/board-mx53_loco.c | 1 + arch/arm/mach-mx5/board-mx53_smd.c | 16 + arch/arm/mach-mx5/clock-mx51-mx53.c | 19 ++ arch/arm/mach-mx5/devices-imx53.h | 2 + arch/arm/mach-mxs/Kconfig | 17 + arch/arm/mach-mxs/Makefile | 1 + arch/arm/mach-mxs/clock-mx28.c | 16 +- arch/arm/mach-mxs/include/mach/mxs.h | 1 + arch/arm/mach-mxs/include/mach/uncompress.h | 1 + arch/arm/mach-mxs/mach-m28evk.c | 366 +++++++++++++++++++++++ arch/arm/plat-mxc/devices/Kconfig | 4 + arch/arm/plat-mxc/devices/Makefile | 1 + arch/arm/plat-mxc/devices/platform-ahci-imx.c | 156 ++++++++++ arch/arm/plat-mxc/include/mach/devices-common.h | 10 + 16 files changed, 608 insertions(+), 5 deletions(-) create mode 100644 arch/arm/mach-mxs/mach-m28evk.c create mode 100644 arch/arm/plat-mxc/devices/platform-ahci-imx.c