From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753877AbcHVBnx (ORCPT ); Sun, 21 Aug 2016 21:43:53 -0400 Received: from ozlabs.org ([103.22.144.67]:37365 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753093AbcHVBnv (ORCPT ); Sun, 21 Aug 2016 21:43:51 -0400 Date: Mon, 22 Aug 2016 11:43:46 +1000 From: Stephen Rothwell To: Eduardo Valentin Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Zhang Rui Subject: linux-next: please clean up the thermal-soc tree Message-ID: <20160822114346.4cb45ec5@canb.auug.org.au> 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, 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. -- Cheers, Stephen Rothwell