From mboxrd@z Thu Jan 1 00:00:00 1970 From: Samuel Ortiz Subject: Re: linux-next: manual merge of the watchdog tree with the mfd tree Date: Wed, 23 May 2012 16:26:58 +0200 Message-ID: <20120523142658.GD23600@sortiz-mobl> References: <20120518152348.1e5070cdc16cfdf00682546d@canb.auug.org.au> <20120518083234.GW3074@spo001.leaseweb.com> <6.2.5.6.2.20120518181141.028c8090@roeck-us.net> <20120522163559.GD3074@spo001.leaseweb.com> <6.2.5.6.2.20120522153050.0284ee38@roeck-us.net> <20120523054430.GH3074@spo001.leaseweb.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mga01.intel.com ([192.55.52.88]:36735 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755854Ab2EWO1C (ORCPT ); Wed, 23 May 2012 10:27:02 -0400 Content-Disposition: inline In-Reply-To: <20120523054430.GH3074@spo001.leaseweb.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Wim Van Sebroeck Cc: Guenter Roeck , Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Aaron Sierra , Randy Dunlap , linux-watchdog@vger.kernel.org, Jean Delvare Hi Wim, On Wed, May 23, 2012 at 07:44:30AM +0200, Wim Van Sebroeck wrote: > Hi Sam, > > Since %04llx with a typecast to u64 is the way to go (Thanks Stephen and Randy)... > > > How do we make sure that Randy's patch makes it upstream ? The iTCO > > patch is currently in Sam's tree. > > Can you carry Randy's patch/fix (since it fixes the change introduced by the iTCO_wdt mfd patch)? > If not then I will apply the patch later on once the iTCO_wdt mfd patch is mainstream. > I'd appreciate if you could take it. I'm trying to avoid taking more patches at this moment. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/