Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932802AbcCHKKU (ORCPT ); Tue, 8 Mar 2016 05:10:20 -0500 Received: from foss.arm.com ([217.140.101.70]:60757 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753525AbcCHKKQ (ORCPT ); Tue, 8 Mar 2016 05:10:16 -0500 Subject: Re: linux-next: manual merge of the watchdog tree with the arm-soc tree To: Olof Johansson References: <20160307150402.191ba735@canb.auug.org.au> <56DD71D6.8040406@arm.com> Cc: Sudeep Holla , Stephen Rothwell , Wim Van Sebroeck , Arnd Bergmann , "linux-arm-kernel@lists.infradead.org" , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Fu Wei , Guenter Roeck , Andre Przywara From: Sudeep Holla Organization: ARM Message-ID: <56DEA504.5070209@arm.com> Date: Tue, 8 Mar 2016 10:10:12 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1341 Lines: 43 On 07/03/16 19:00, Olof Johansson wrote: > On Mon, Mar 7, 2016 at 4:19 AM, Sudeep Holla wrote: >> Hi Olof, >> >> On 07/03/16 05:41, Olof Johansson wrote: >>> >>> Hi Wim, >>> >>> It's much easier for us if all DTS changes go in through the arm-soc >>> trees, to avoid these kind of conflicts. Is this on a branch where you >>> can easily drop it and we pick it up instead, or is it on a now-stable >>> branch? >>> >> >> Sorry for that. Since the patch series was still under discussion and >> v14 was posted 3 days ago, I had not checked with Fu Wei on his plans >> for DTS changes. >> >> Let me know if you want to pick up this single patch directly or want me >> to send PR for that if Wim drops it from his branch. I might have couple >> of DTS warning fixes for juno/vexpress(though I need to wait for Rob's >> acks to them), so I can bundle them together. > > We're short on time for -rc7, most material should have been in by > now. So you might want to send this separately if you think Rob will > time out. > I agree, but the warnings I mentioned got introduced last Friday after Rob updated DTC in -next. > I'm OK with either applying directly or you bundling with other 64-bit > DTS material. Either way, send to arm@kernel.org and we'll pick it up > from there. > OK, will do that. -- Regards, Sudeep