From: Sebastian Reichel <sre@kernel.org>
To: Guenter Roeck <linux@roeck-us.net>
Cc: linux-pm@vger.kernel.org, David Woodhouse <dwmw2@infradead.org>,
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/6] power/reset: arm-versatile: Register with kernel restart handler
Date: Sun, 25 Jan 2015 21:06:26 +0100 [thread overview]
Message-ID: <20150125200626.GA6536@earth.universe> (raw)
In-Reply-To: <54C53EE4.4070109@roeck-us.net>
[-- Attachment #1: Type: text/plain, Size: 2200 bytes --]
Hi Guenter,
On Sun, Jan 25, 2015 at 11:07:16AM -0800, Guenter Roeck wrote:
> On 01/25/2015 10:40 AM, Sebastian Reichel wrote:
> >On Sun, Jan 25, 2015 at 10:13:37AM -0800, Guenter Roeck wrote:
> >>Register with kernel restart handler instead of setting arm_pm_restart
> >>directly. Select high priority since the restart handler is instantiated
> >>through devicetree, indicating that it should be used if configured.
> >
> >This does not apply clean for me. Please rebase on top of
> >
> >http://git.infradead.org/battery-2.6.git/
>
> Sure, will do. I assume you mean battery/next-next since it applies cleanly
> to battery/master.
uhm no, I was talking about battery/master.
It does not apply cleanly for me:
Applying: power/reset: arm-versatile: Register with kernel restart handler
error: patch failed: drivers/power/reset/arm-versatile-reboot.c:13
error: drivers/power/reset/arm-versatile-reboot.c: patch does not apply
The error looks correct:
$ grep -A8 "+++ b/drivers/power/reset/arm-versatile-reboot.c" guenter_roeck.patch
+++ b/drivers/power/reset/arm-versatile-reboot.c
@@ -13,7 +13,6 @@
#include <linux/reboot.h>
#include <linux/regmap.h>
#include <linux/of.h>
-#include <asm/system_misc.h>
#define REALVIEW_SYS_LOCK_OFFSET 0x20
#define REALVIEW_SYS_LOCK_VAL 0xA05F
$ git blame -L13,20 drivers/power/reset/arm-versatile-reboot.c
0e545f57 (Linus Walleij 2014-05-22 10:20:38 +0200 13) #include <linux/reboot.h>
0e545f57 (Linus Walleij 2014-05-22 10:20:38 +0200 14) #include <linux/regmap.h>
0e545f57 (Linus Walleij 2014-05-22 10:20:38 +0200 15) #include <linux/of.h>
0e545f57 (Linus Walleij 2014-05-22 10:20:38 +0200 16) #include <asm/system_misc.h>
0e545f57 (Linus Walleij 2014-05-22 10:20:38 +0200 17)
0160817d (Linus Walleij 2014-12-19 16:56:27 +0100 18) #define INTEGRATOR_HDR_CTRL_OFFSET 0x0C
0160817d (Linus Walleij 2014-12-19 16:56:27 +0100 19) #define INTEGRATOR_HDR_LOCK_OFFSET 0x14
0160817d (Linus Walleij 2014-12-19 16:56:27 +0100 20) #define INTEGRATOR_CM_CTRL_RESET (1 << 3)
$ git show -s --format=%ci 0160817d
2015-01-20 13:58:27 +0100
Maybe update the battery/master branch?
-- Sebastian
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2015-01-25 20:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-25 18:13 [PATCH 1/6] power/reset: arm-versatile: Register with kernel restart handler Guenter Roeck
2015-01-25 18:13 ` [PATCH 2/6] power/reset: at91: " Guenter Roeck
2015-01-25 18:13 ` [PATCH 3/6] power/reset: Remove sun6i reboot driver Guenter Roeck
2015-01-25 18:23 ` Maxime Ripard
2015-01-25 18:13 ` [PATCH 4/6] power/reset: st-poweroff: Register with kernel restart handler Guenter Roeck
2015-01-25 18:13 ` [PATCH 5/6] power/reset: st-poweroff: Fix misleading Kconfig description Guenter Roeck
2015-01-25 18:13 ` [PATCH 6/6] power/reset: restart-poweroff: Remove arm dependencies Guenter Roeck
2015-01-25 18:40 ` [PATCH 1/6] power/reset: arm-versatile: Register with kernel restart handler Sebastian Reichel
2015-01-25 19:07 ` Guenter Roeck
2015-01-25 20:06 ` Sebastian Reichel [this message]
2015-01-25 20:15 ` Guenter Roeck
2015-01-25 20:31 ` Guenter Roeck
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=20150125200626.GA6536@earth.universe \
--to=sre@kernel.org \
--cc=dbaryshkov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@roeck-us.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 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).