Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759728Ab2EWOz1 (ORCPT ); Wed, 23 May 2012 10:55:27 -0400 Received: from ns1.pc-advies.be ([83.149.101.17]:53948 "EHLO spo001.leaseweb.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758805Ab2EWOzY (ORCPT ); Wed, 23 May 2012 10:55:24 -0400 Date: Wed, 23 May 2012 16:55:13 +0200 From: Wim Van Sebroeck To: Samuel Ortiz 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 Subject: Re: linux-next: manual merge of the watchdog tree with the mfd tree Message-ID: <20120523145513.GJ3074@spo001.leaseweb.com> 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> <20120523142658.GD23600@sortiz-mobl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120523142658.GD23600@sortiz-mobl> User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 814 Lines: 23 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. No problem. I'll take it then. Kind regards, Wim. -- 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/