Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422930AbbD2MRl (ORCPT ); Wed, 29 Apr 2015 08:17:41 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:46370 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422762AbbD2MRi (ORCPT ); Wed, 29 Apr 2015 08:17:38 -0400 Message-ID: <5540CB2B.5060100@imgtec.com> Date: Wed, 29 Apr 2015 09:14:35 -0300 From: Ezequiel Garcia User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Guenter Roeck , Andrew Bresticker , Wim Van Sebroeck CC: , , "James Hogan" Subject: Re: [PATCH V3 1/3] watchdog: imgpdc: Allow timeout to be set in device-tree References: <1428080722-29683-1-git-send-email-abrestic@chromium.org> <55400F0F.10204@imgtec.com> <554017A7.9050506@imgtec.com> <554059C7.6070107@roeck-us.net> In-Reply-To: <554059C7.6070107@roeck-us.net> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.100.200.120] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1345 Lines: 44 On 04/29/2015 01:10 AM, Guenter Roeck wrote: > On 04/28/2015 04:28 PM, Ezequiel Garcia wrote: >> >> >> On 04/28/2015 07:51 PM, Ezequiel Garcia wrote: >>> >>> >>> On 04/03/2015 02:05 PM, Andrew Bresticker wrote: >>>> Since the heartbeat is statically initialized to its default value, >>>> watchdog_init_timeout() will never look in the device-tree for a >>>> timeout-sec value. Instead of statically initializing heartbeat, >>>> fall back to the default timeout value if watchdog_init_timeout() >>>> fails. >>>> >>>> Signed-off-by: Andrew Bresticker >>>> Cc: Ezequiel Garcia >>>> Cc: James Hogan >>> >>> Reviewed-by: Ezequiel Garcia >>> >> >> And for the three patches: >> >> Tested-by: Ezequiel Garcia >> >> Any chance these get merged soon(ishly)? >> > > I added the patches to my test branch. I'll send a pull request to > Wim in time for the next commit window, so hopefully the patches > should make it into 4.2. > OK, cool. Thanks a lot. -- Ezequiel -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/