Hi all,
Today's linux-next merge of the omap tree got a conflict in
arch/arm/plat-omap/Kconfig between commit
6d803ba736abb5e122dede70a4720e4843dd6df4 ("ARM: 6483/1: arm & sh:
factorised duplicated clkdev.c") from the arm tree and commit
dc69d1af9e8d9cbbabff88bb35a6782187a9 ("omap2: Make OMAP2
* Stephen Rothwell [100708 04:31]:
> Hi all,
>
> Today's linux-next merge of the omap tree got conflicts in
> arch/arm/mach-omap2/board-3430sdp.c,
> arch/arm/mach-omap2/board-3630sdp.c,
> arch/arm/mach-omap2/board-am3517evm.c,
> arch/arm/mach-omap2/board-cm-t35.c,
> arch/arm/mach-omap2/board-devk
Hi all,
Today's linux-next merge of the omap tree got conflicts in
arch/arm/mach-omap2/board-3430sdp.c,
arch/arm/mach-omap2/board-3630sdp.c,
arch/arm/mach-omap2/board-am3517evm.c,
arch/arm/mach-omap2/board-cm-t35.c,
arch/arm/mach-omap2/board-devkit8000.c,
arch/arm/mach-omap2/board-igep0020.c,
arch
* Stephen Rothwell [100705 10:08]:
> Hi Nicolas,
>
> On Sun, 04 Jul 2010 21:46:27 -0400 (EDT) Nicolas Pitre
> wrote:
> >
> > Yes, the fix is fine. If you can carry it until either of those is
> > merged upstream that would be great.
>
> Thanks for the confirmation. I can carry the merge fix
Hi Nicolas,
On Sun, 04 Jul 2010 21:46:27 -0400 (EDT) Nicolas Pitre wrote:
>
> Yes, the fix is fine. If you can carry it until either of those is
> merged upstream that would be great.
Thanks for the confirmation. I can carry the merge fix as long as
necessary.
--
Cheers,
Stephen Rothwell
On Mon, 5 Jul 2010, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the omap tree got a conflict in
> arch/arm/kernel/entry-armv.S between commit
> df0698be14c6683606d5df2d83e3ae40f85ed0d9 ("ARM: stack protector: change
> the canary value per task") from the arm tree and commit
Hi all,
Today's linux-next merge of the omap tree got a conflict in
arch/arm/kernel/entry-armv.S between commit
df0698be14c6683606d5df2d83e3ae40f85ed0d9 ("ARM: stack protector: change
the canary value per task") from the arm tree and commit
4481d0c7d25c9de9a3986c8b4c52389ca8bbf929 ("arm: Replace
C
* Russell King [100215 07:00]:
> On Thu, Feb 04, 2010 at 08:04:44PM -0800, Tony Lindgren wrote:
> > Russell, can you please let me know if you have some static
> > commit ID containing the patch above that I could use that as
> > base for my patches?
>
> Right, when it eventually gets through lin
On Thu, Feb 04, 2010 at 08:04:44PM -0800, Tony Lindgren wrote:
> Russell, can you please let me know if you have some static
> commit ID containing the patch above that I could use that as
> base for my patches?
Right, when it eventually gets through linux-next, 4e6d488
--
Russell King
Linux ke
* Stephen Rothwell [100204 16:13]:
> Hi Tony,
>
> On Thu, 4 Feb 2010 15:30:19 -0800 Tony Lindgren wrote:
> >
> > Thanks, I'll sort it out in omap for-next tree so they merge
> > cleanly.
Tried figuring out a clean mergeable solution, but it looks like
I need to manually merge or rebase the omap
Hi Tony,
On Thu, 4 Feb 2010 15:30:19 -0800 Tony Lindgren wrote:
>
> Thanks, I'll sort it out in omap for-next tree so they merge
> cleanly.
Thanks
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpV7BlwoG9sN.pgp
Description: PGP signatur
* Stephen Rothwell [100204 15:17]:
> Hi all,
>
> Today's linux-next merge of the omap tree got a conflict in
> arch/arm/mach-omap1/include/mach/debug-macro.S
> arch/arm/mach-omap2/include/mach/debug-macro.S between commit
> 7f62dc4756eaf761570b96250630d48f80397d64 ("ARM: 5910/1: ARM: Add tmp
> re
Hi all,
Today's linux-next merge of the omap tree got a conflict in
arch/arm/mach-omap1/include/mach/debug-macro.S
arch/arm/mach-omap2/include/mach/debug-macro.S between commit
7f62dc4756eaf761570b96250630d48f80397d64 ("ARM: 5910/1: ARM: Add tmp
register for addruart and loadsp") from the arm tree
Hi Tony,
On Mon, 24 Aug 2009 16:07:18 +0300 Tony Lindgren wrote:
>
> The merge conflict should be gone now, Kevin realized we don't need the
> platform_data any longer. Will remove that for board-4430sdp.c and serial.h
> as a fix once the other pending changes have been merged.
OK, thanks.
--
* Tony Lindgren [090820 14:20]:
> * Stephen Rothwell [090819 08:04]:
> > Hi all,
> >
> > Today's linux-next merge of the omap tree got a conflict in
> > arch/arm/mach-omap2/board-4430sdp.c between commit
> > 085b54d99b8ee999e7905b8f16e201e0da8ba369 ("ARM: OMAP4: Add UART4
> > support") from the
6:33 PM
> > To: Tony Lindgren; Stephen Rothwell
> > Cc: linux-omap@vger.kernel.org; linux-n...@vger.kernel.org; linux-
> > ker...@vger.kernel.org; Syed, Rafiuddin; Russell King; Kalle Valo
> > Subject: RE: linux-next: manual merge of the omap tree with the arm tree
> >
>
.kernel.org; linux-n...@vger.kernel.org; linux-
> ker...@vger.kernel.org; Syed, Rafiuddin; Russell King; Kalle Valo
> Subject: RE: linux-next: manual merge of the omap tree with the arm tree
>
> > > Today's linux-next merge of the omap tree got a conflict in
> > >
> > Today's linux-next merge of the omap tree got a conflict in
> > arch/arm/mach-omap2/board-4430sdp.c between commit
> > 085b54d99b8ee999e7905b8f16e201e0da8ba369 ("ARM: OMAP4: Add UART4
> > support") from the arm tree and commit
> > 4c29fa3e47342666e12e46f35f40dd90b12cd1a4 ("OMAP: remove OMAP_TAG
* Stephen Rothwell [090819 08:04]:
> Hi all,
>
> Today's linux-next merge of the omap tree got a conflict in
> arch/arm/mach-omap2/board-4430sdp.c between commit
> 085b54d99b8ee999e7905b8f16e201e0da8ba369 ("ARM: OMAP4: Add UART4
> support") from the arm tree and commit
> 4c29fa3e47342666e12e46f35
Hi all,
Today's linux-next merge of the omap tree got a conflict in
arch/arm/mach-omap2/board-4430sdp.c between commit
085b54d99b8ee999e7905b8f16e201e0da8ba369 ("ARM: OMAP4: Add UART4
support") from the arm tree and commit
4c29fa3e47342666e12e46f35f40dd90b12cd1a4 ("OMAP: remove OMAP_TAG_UART")
fro
t; Subject: Re: linux-next: manual merge of the omap tree with
> the arm tree
>
> Hi,
>
> On Thu, 28 May 2009 11:55:09 +0530 "Shilimkar, Santosh"
> wrote:
> >
> > > +machine-$(CONFIG_ARCH_OMAP2):= omap2
> > > +machine-$(C
Hi,
On Thu, 28 May 2009 11:55:09 +0530 "Shilimkar, Santosh"
wrote:
>
> > +machine-$(CONFIG_ARCH_OMAP2) := omap2
> > +machine-$(CONFIG_ARCH_OMAP3) := omap2
> > ++machine-$(CONFIG_ARCH_OMAP4) := omap2
>
> ++ Is this really ok ?
Yeah, this is a diff of a g
; Subject: linux-next: manual merge of the omap tree with the arm tree
>
> Hi all,
>
> Today's linux-next merge of the omap tree got a conflict in
> arch/arm/Makefile between commit
> b4175b89921fefb2f352472fa6dccb0fc4fb37d9
> ("[ARM] sort machine- and plat-
Hi all,
Today's linux-next merge of the omap tree got a conflict in
arch/arm/Makefile between commit b4175b89921fefb2f352472fa6dccb0fc4fb37d9
("[ARM] sort machine- and plat- by CONFIG* name") from the arm tree and
commit 68394eae0fc4e801fc2ae33055b24a9754669a7b ("ARM: OMAP4: Add support
for 4430 S
24 matches
Mail list logo
