From: Tony Lindgren <tony@atomide.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org
Subject: Re: [GIT PULL 1/5] omap non critical fixes for v3.8 merge window
Date: Thu, 15 Nov 2012 09:35:59 -0800 [thread overview]
Message-ID: <20121115173559.GJ6801@atomide.com> (raw)
In-Reply-To: <201211151651.59049.arnd@arndb.de>
* Arnd Bergmann <arnd@arndb.de> [121115 08:54]:
> On Thursday 15 November 2012, Tony Lindgren wrote:
> > The following changes since commit 3d70f8c617a436c7146ecb81df2265b4626dfe89:
> >
> > Linux 3.7-rc4 (2012-11-04 11:07:39 -0800)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/fixes-non-critical-v4-signed
>
> Pulled all five. Please have a look to make sure everything you need is
> there now and still works.
Thanks! Diffs fine against what I have in omap-for-v3.8/tmp-merge
except for the following bit that breaks compile for omap2plus_defconfig,
maybe apply it directly to one of your branches?
Regards,
Tony
From: Tony Lindgren <tony@atomide.com>
Date: Thu, 15 Nov 2012 09:22:34 -0800
Subject: [PATCH] ARM: OMAP2+: Fix build for board-generic after a merge conflict
Commit 187e3e06 (ARM: OMAP2+: board files: use SoC-specific system
restart functions) changed to use SoC specific restart functions to
simplify the PRCM code. The changes done to board-generic.c in commit
7dd9d502 (ARM: OMAP3: Add generic machine descriptor for boards with
OMAP3 GP devices) need to be updated accordingly.
Signed-off-by: Tony Lindgren <tony@atomide.com>
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -122,7 +122,7 @@ DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)")
.init_machine = omap_generic_init,
.timer = &omap3_secure_timer,
.dt_compat = omap3_gp_boards_compat,
- .restart = omap_prcm_restart,
+ .restart = omap3xxx_restart,
MACHINE_END
#endif
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 1/5] omap non critical fixes for v3.8 merge window
Date: Thu, 15 Nov 2012 09:35:59 -0800 [thread overview]
Message-ID: <20121115173559.GJ6801@atomide.com> (raw)
In-Reply-To: <201211151651.59049.arnd@arndb.de>
* Arnd Bergmann <arnd@arndb.de> [121115 08:54]:
> On Thursday 15 November 2012, Tony Lindgren wrote:
> > The following changes since commit 3d70f8c617a436c7146ecb81df2265b4626dfe89:
> >
> > Linux 3.7-rc4 (2012-11-04 11:07:39 -0800)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/fixes-non-critical-v4-signed
>
> Pulled all five. Please have a look to make sure everything you need is
> there now and still works.
Thanks! Diffs fine against what I have in omap-for-v3.8/tmp-merge
except for the following bit that breaks compile for omap2plus_defconfig,
maybe apply it directly to one of your branches?
Regards,
Tony
From: Tony Lindgren <tony@atomide.com>
Date: Thu, 15 Nov 2012 09:22:34 -0800
Subject: [PATCH] ARM: OMAP2+: Fix build for board-generic after a merge conflict
Commit 187e3e06 (ARM: OMAP2+: board files: use SoC-specific system
restart functions) changed to use SoC specific restart functions to
simplify the PRCM code. The changes done to board-generic.c in commit
7dd9d502 (ARM: OMAP3: Add generic machine descriptor for boards with
OMAP3 GP devices) need to be updated accordingly.
Signed-off-by: Tony Lindgren <tony@atomide.com>
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -122,7 +122,7 @@ DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)")
.init_machine = omap_generic_init,
.timer = &omap3_secure_timer,
.dt_compat = omap3_gp_boards_compat,
- .restart = omap_prcm_restart,
+ .restart = omap3xxx_restart,
MACHINE_END
#endif
next prev parent reply other threads:[~2012-11-15 17:36 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-15 2:56 [GIT PULL 1/5] omap non critical fixes for v3.8 merge window Tony Lindgren
2012-11-15 2:56 ` [GIT PULL 2/5] omap cleanup fix and soc detection improvment " Tony Lindgren
2012-11-15 2:56 ` Tony Lindgren
2012-11-15 2:56 ` [GIT PULL 4/5] omap timer changes " Tony Lindgren
2012-11-15 2:56 ` [GIT PULL 3/5] omap common clock " Tony Lindgren
2012-11-15 2:56 ` [GIT PULL 5/5] omap full-chip retention in suspend " Tony Lindgren
2012-11-15 2:56 ` Tony Lindgren
2012-11-15 2:56 ` [GIT PULL 4/5] omap timer changes " Tony Lindgren
2012-11-15 2:56 ` [GIT PULL 3/5] omap common clock " Tony Lindgren
2012-11-15 16:51 ` [GIT PULL 1/5] omap non critical fixes " Arnd Bergmann
2012-11-15 16:51 ` Arnd Bergmann
2012-11-15 17:35 ` Tony Lindgren [this message]
2012-11-15 17:35 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2012-11-15 2:56 Tony Lindgren
2012-11-15 2:56 Tony Lindgren
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=20121115173559.GJ6801@atomide.com \
--to=tony@atomide.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=olof@lixom.net \
/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.