[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAOesGMj2TyxOXG4YxLgRB5NoCLv_B1k1rGPdnw9GDwFrQ7dJGw@mail.gmail.com>
Date: Mon, 7 Mar 2016 11:00:53 -0800
From: Olof Johansson <olof@...om.net>
To: Wim Van Sebroeck <wim@...ana.be>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
Arnd Bergmann <arnd@...db.de>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Fu Wei <fu.wei@...aro.org>, Guenter Roeck <linux@...ck-us.net>,
Andre Przywara <andre.przywara@....com>,
Sudeep Holla <sudeep.holla@....com>
Subject: Re: linux-next: manual merge of the watchdog tree with the arm-soc tree
On Mon, Mar 7, 2016 at 10:54 AM, Wim Van Sebroeck <wim@...ana.be> 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
Powered by blists - more mailing lists