Patchwork [GIT,PULL] more i.MX fixes

login
register
mail settings
Submitter Sascha Hauer
Date July 15, 2011, 9:23 a.m.
Message ID <20110715092307.GN6069@pengutronix.de>
Download mbox
Permalink /patch/104776/
State New
Headers show

Pull-request

git://git.pengutronix.de/git/imx/linux-2.6.git fixes-for-arnd

Comments

Sascha Hauer - July 15, 2011, 9:23 a.m.
Hi Arnd,

Please pull the following fixes for i.MX. These are orthogonal to
the branches you already pulled and this are directly based on Linus
tree.

Sascha

The following changes since commit 5dcd07b9f39ca3e9be5bcc387d193fc0674e1c81:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes (2011-07-14 10:20:42 -0700)

are available in the git repository at:

  git://git.pengutronix.de/git/imx/linux-2.6.git fixes-for-arnd

Dong Aisheng (1):
      ARM: mxs-dma: include <linux/dmaengine.h>

Fabio Estevam (1):
      ARM: mx25: Fix typo on CAN1_RX pad setting

Lothar WaƟmann (1):
      iomux-mx53: add missing 'IOMUX_CONFIG_SION' for some I2C pad definitions

Troy Kisky (3):
      ARM: i.MX53: UARTn_TXD pin should not change RXD input select
      ARM: i.MX53: UARTn_CTS pin should not change RTS input select
      ARM: i.MX53: consistently use MX53_UART_PAD_CTRL for uart txd/rxd/rts/cts

 arch/arm/mach-mxs/include/mach/dma.h        |    2 +
 arch/arm/plat-mxc/include/mach/iomux-mx25.h |    2 +-
 arch/arm/plat-mxc/include/mach/iomux-mx53.h |  114 +++++++++++++-------------
 3 files changed, 60 insertions(+), 58 deletions(-)
Arnd Bergmann - July 15, 2011, 2:05 p.m.
On Friday 15 July 2011, Sascha Hauer wrote:
> Please pull the following fixes for i.MX. These are orthogonal to
> the branches you already pulled and this are directly based on Linus
> tree.
> 
> Sascha
> 
> The following changes since commit 5dcd07b9f39ca3e9be5bcc387d193fc0674e1c81:
> 
>   Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes (2011-07-14 10:20:42 -0700)
> 
> are available in the git repository at:
> 
>   git://git.pengutronix.de/git/imx/linux-2.6.git fixes-for-arnd
> 

Hi Sascha,

The fixes all look good, but please rebase them on top of an -rc
release if possible. Pulling this into my tree would make the
master branch base on an arbitrary commit (today's HEAD), which
some people find annoying.

	Arnd
Arnd Bergmann - July 15, 2011, 7:55 p.m.
On Friday 15 July 2011 16:05:31 Arnd Bergmann wrote:
> On Friday 15 July 2011, Sascha Hauer wrote:
> > Please pull the following fixes for i.MX. These are orthogonal to
> > the branches you already pulled and this are directly based on Linus
> > tree.
> > 
> > Sascha
> > 
> > The following changes since commit 5dcd07b9f39ca3e9be5bcc387d193fc0674e1c81:
> > 
> >   Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes (2011-07-14 10:20:42 -0700)
> > 
> > are available in the git repository at:
> > 
> >   git://git.pengutronix.de/git/imx/linux-2.6.git fixes-for-arnd
> 
> The fixes all look good, but please rebase them on top of an -rc
> release if possible. Pulling this into my tree would make the
> master branch base on an arbitrary commit (today's HEAD), which
> some people find annoying.

Hi Sascha,

It's not my day today. First I complained to Colin about the tegra pull request,
then to you. In fact, this one is good as well and you did everything right.

I was just confused by the lead-in text mentioning the gfs2-2.6-fixes pull
that was today's head, when you had in fact based it off of -rc7.

I'll pull it right away. Sorry for my confusion.

	Arnd