Re: [PATCH 5/7] watchdog: s3c2410: Constify local structures
From: Krzysztof Kozlowski
Date: Sat Feb 25 2017 - 02:43:12 EST
On Fri, Feb 24, 2017 at 02:05:56PM -0800, Guenter Roeck wrote:
> On 02/24/2017 01:07 PM, Krzysztof Kozlowski wrote:
> > Structures watchdog_device, watchdog_ops and s3c2410_wdt_variant are not
> > modified so they can be made const to increase code safeness.
> >
> > Signed-off-by: Krzysztof Kozlowski <krzk@xxxxxxxxxx>
>
> Conflicts with "watchdog: constify watchdog_ops structures" in my tree.
> I rebased my tree to v4.10 (which I should not really have done ;-), but
> it still doesn't apply due to "fatal: sha1 information is lacking or useless"
> and "error: could not build fake ancestor". The subsequent patches also don't
> apply. You may have to wait until after -rc1, rebase your patches, and
> resubmit.
Sure, I'll resend after merge window. These aren't important fixes so
there is no problem in waiting for merge window to end.
Thanks for reviews.
Best regards,
Krzysztof