linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org, Lokesh Vutla <lokeshvutla@ti.com>,
	Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
Date: Mon, 26 Nov 2012 07:53:58 -0800	[thread overview]
Message-ID: <20121126155358.GH5279@atomide.com> (raw)
In-Reply-To: <20121126215600.236b2e44ffea1abbea26898b@canb.auug.org.au>

* Stephen Rothwell <sfr@canb.auug.org.au> [121126 02:58]:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/plat-omap/common.c between commit b022e17b1c7e ("OMAP: common.c:
> remove init call to vram") from the omap_dss2 tree and commit
> f583f0f2c720 ("ARM: OMAP2+: Move omap_reserve() locally to mach-omap2")
> from the arm-soc tree.
> 
> I fixed it up (by deleting the file and adding the following patch) and
> can carry the fix as necessary (no action is required).

Thanks this is the correct fix.

Tony
 
> From 523f2987a07f97c946c63e0be4558b8332b46e8f Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 26 Nov 2012 21:51:20 +1100
> Subject: [PATCH] OMAP: common.c: remove init call to vram fixup
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/arm/mach-omap2/common.c |    3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
> index 5c2fd48..2dabb9e 100644
> --- a/arch/arm/mach-omap2/common.c
> +++ b/arch/arm/mach-omap2/common.c
> @@ -16,8 +16,6 @@
>  #include <linux/init.h>
>  #include <linux/platform_data/dsp-omap.h>
>  
> -#include <plat/vram.h>
> -
>  #include "common.h"
>  #include "omap-secure.h"
>  
> @@ -32,7 +30,6 @@ int __weak omap_secure_ram_reserve_memblock(void)
>  
>  void __init omap_reserve(void)
>  {
> -	omap_vram_reserve_sdram_memblock();
>  	omap_dsp_reserve_sdram_memblock();
>  	omap_secure_ram_reserve_memblock();
>  	omap_barrier_reserve_memblock();
> -- 
> 1.7.10.280.gaa39
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

  reply	other threads:[~2012-11-26 15:54 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-26 10:56 linux-next: manual merge of the arm-soc tree with the omap_dss2 tree Stephen Rothwell
2012-11-26 15:53 ` Tony Lindgren [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-04-09  7:40 Stephen Rothwell
2013-04-09  9:32 ` Arnd Bergmann
2012-12-03  5:52 Stephen Rothwell
2012-11-30  5:18 Stephen Rothwell
2012-09-24  9:53 Stephen Rothwell
2012-09-24 12:43 ` Arnd Bergmann
2012-09-24 13:11   ` Tomi Valkeinen
2012-09-24 16:19     ` Tony Lindgren
2012-09-17  9:23 Stephen Rothwell
2012-05-14  8:51 Stephen Rothwell
2012-03-13  8:21 Stephen Rothwell
2012-03-09  7:09 Stephen Rothwell
2012-03-08  6:00 Stephen Rothwell
2012-03-08 16:16 ` Arnd Bergmann
2012-03-09  9:35   ` Tomi Valkeinen
2012-03-09 11:50     ` Arnd Bergmann
2012-03-09 12:14       ` Tomi Valkeinen
2012-03-09 12:26         ` Arnd Bergmann
2012-03-09 12:31           ` Tomi Valkeinen
2012-03-08  5:58 Stephen Rothwell
2012-03-08  5:55 Stephen Rothwell
2012-03-08  5:51 Stephen Rothwell
2012-03-10  9:55 ` Janusz Krzysztofik

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=20121126155358.GH5279@atomide.com \
    --to=tony@atomide.com \
    --cc=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=lokeshvutla@ti.com \
    --cc=olof@lixom.net \
    --cc=sfr@canb.auug.org.au \
    --cc=tomi.valkeinen@ti.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).