Guenter Roeck <linux@xxxxxxxxxxxx> writes: > On 04/27/2015 04:12 PM, Eric Anholt wrote: >> Guenter Roeck <linux@xxxxxxxxxxxx> writes: >> >>> On Mon, Apr 27, 2015 at 09:04:32AM -0700, Guenter Roeck wrote: >>>> On Fri, Apr 24, 2015 at 12:08:54PM -0700, Eric Anholt wrote: >>>>> Since the WDT is what's used to drive restart and power off, it makes >>>>> more sense to keep it there, where the regs are already mapped and >>>>> definitions for them provided. Note that this means you may need to >>>>> add CONFIG_BCM2835_WDT to retain functionality of your kernel. >>>>> >>>>> Signed-off-by: Eric Anholt <eric@xxxxxxxxxx> >>>>> Cc: linux-watchdog@xxxxxxxxxxxxxxx >>>> >>>> The patch will require a rebase to v4.0-rc1. >>>> >>> s/4.0/4.1/ >> >> It will? It seems to work fine, and the diff's the same. Is there some >> new thing you were expecting in a rebase? >> > All I can say is that it didn't apply for me. Maybe someone else has more luck. If you were trying to apply it to stock 4.1-rc1, it would fail. It was based on the for-rpi-next tree, since that's where I assume it would go in through. If you'd like to take it through your tree I could send you that one, but it'll mean conflicts for someone to resolve later.
Attachment:
signature.asc
Description: PGP signature
