Messages in this thread Patch in this message | | | Date | Sun, 25 Jan 2015 21:06:26 +0100 | From | Sebastian Reichel <> | Subject | Re: [PATCH 1/6] power/reset: arm-versatile: Register with kernel restart handler |
| |
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 [unhandled content-type:application/pgp-signature] | |