Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753437AbcCGTBH (ORCPT ); Mon, 7 Mar 2016 14:01:07 -0500 Received: from mail-yk0-f175.google.com ([209.85.160.175]:33241 "EHLO mail-yk0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753287AbcCGTAy (ORCPT ); Mon, 7 Mar 2016 14:00:54 -0500 MIME-Version: 1.0 X-Originating-IP: [2620:0:1000:157d:a4c7:c1f9:1ca4:762b] In-Reply-To: <20160307185449.GB16667@spo001.leaseweb.nl> References: <20160307150402.191ba735@canb.auug.org.au> <20160307185449.GB16667@spo001.leaseweb.nl> Date: Mon, 7 Mar 2016 11:00:53 -0800 Message-ID: Subject: Re: linux-next: manual merge of the watchdog tree with the arm-soc tree From: Olof Johansson To: Wim Van Sebroeck Cc: Stephen Rothwell , Arnd Bergmann , "linux-arm-kernel@lists.infradead.org" , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Fu Wei , Guenter Roeck , Andre Przywara , Sudeep Holla Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 409 Lines: 17 On Mon, Mar 7, 2016 at 10:54 AM, Wim Van Sebroeck wrote: > Hi All, > >> 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? >> >> >> -Olof > > I can always redo the tree once you picked it up. Great, thanks! -Olof