From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Krzysztof Hałasa" <khc@pm.waw.pl>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Olof Johansson" <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: manual merge of the ixp4xx tree with the arm-soc tree
Date: Thu, 20 Sep 2012 15:31:49 +0000 [thread overview]
Message-ID: <201209201531.50167.arnd@arndb.de> (raw)
In-Reply-To: <20120920163227.c6d8f1559b9cde971a376abf@canb.auug.org.au>
On Thursday 20 September 2012, Stephen Rothwell wrote:
> Today's linux-next merge of the ixp4xx tree got conflicts in
> arch/arm/mach-ixp4xx/common.c and
> arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h between commit
> 13ec32f47cb4 ("ARM: ixp4xx: use __iomem pointers for MMIO") from the
> arm-soc tree and commits 43690ab7543a ("IXP4xx: Always ioremap() Queue
> Manager MMIO region at boot") and f62736b567ff ("IXP4xx: map CPU config
> registers within VMALLOC region") from the ixp4xx tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Ok, thanks!
This conflict will go away once Krzysztof's patches make it into arm-soc.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the ixp4xx tree with the arm-soc tree
Date: Thu, 20 Sep 2012 15:31:49 +0000 [thread overview]
Message-ID: <201209201531.50167.arnd@arndb.de> (raw)
In-Reply-To: <20120920163227.c6d8f1559b9cde971a376abf@canb.auug.org.au>
On Thursday 20 September 2012, Stephen Rothwell wrote:
> Today's linux-next merge of the ixp4xx tree got conflicts in
> arch/arm/mach-ixp4xx/common.c and
> arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h between commit
> 13ec32f47cb4 ("ARM: ixp4xx: use __iomem pointers for MMIO") from the
> arm-soc tree and commits 43690ab7543a ("IXP4xx: Always ioremap() Queue
> Manager MMIO region at boot") and f62736b567ff ("IXP4xx: map CPU config
> registers within VMALLOC region") from the ixp4xx tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Ok, thanks!
This conflict will go away once Krzysztof's patches make it into arm-soc.
Arnd
next prev parent reply other threads:[~2012-09-20 15:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-20 6:32 linux-next: manual merge of the ixp4xx tree with the arm-soc tree Stephen Rothwell
2012-09-20 6:32 ` Stephen Rothwell
2012-09-20 6:32 ` Stephen Rothwell
2012-09-20 15:31 ` Arnd Bergmann [this message]
2012-09-20 15:31 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201209201531.50167.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=khc@pm.waw.pl \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.