From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754546AbcIEXeg (ORCPT ); Mon, 5 Sep 2016 19:34:36 -0400 Received: from ozlabs.org ([103.22.144.67]:34749 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753732AbcIEXef (ORCPT ); Mon, 5 Sep 2016 19:34:35 -0400 Date: Tue, 6 Sep 2016 09:34:31 +1000 From: Stephen Rothwell To: Eduardo Valentin Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Zhang Rui Subject: Re: linux-next: please clean up the thermal-soc tree Message-ID: <20160906093431.45b64fe8@canb.auug.org.au> In-Reply-To: <20160905130333.GA21673@localhost.localdomain> References: <20160822114346.4cb45ec5@canb.auug.org.au> <20160905130333.GA21673@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Eduardo, On Mon, 5 Sep 2016 06:03:35 -0700 Eduardo Valentin wrote: > > On Mon, Aug 22, 2016 at 11:43:46AM +1000, Stephen Rothwell wrote: > > Hi Eduardo, > > > > The thermal-soc tree now shares quite a few patches (but not commits) > > with the thermal tree. These are causing a few unnecessary conflicts, > > so please clean it up. > > I had to be out for several weeks and my tree was broken during this > time causing the above problem. Sorry for this. > > I have removed the problematic patches out of linux-next way. Thanks for that. -- Cheers, Stephen Rothwell