From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752124AbbHMGAq (ORCPT ); Thu, 13 Aug 2015 02:00:46 -0400 Received: from ozlabs.org ([103.22.144.67]:60574 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751378AbbHMGAp (ORCPT ); Thu, 13 Aug 2015 02:00:45 -0400 Date: Thu, 13 Aug 2015 16:00:43 +1000 From: Stephen Rothwell To: Mike Turquette , Stephen Boyd , Rob Clark Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Hai Li Subject: linux-next: manual merge of the clk tree with the drm-msm tree Message-ID: <20150813160043.651ffef6@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; x86_64-pc-linux-gnu) 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 all, Today's linux-next merge of the clk tree got a conflict in: drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c between commit: bdbc06e2309b ("drm/msm/dsi: Save/Restore PLL status across PHY reset") from the drm-msm tree and commit: 3dde2c2b968a ("drm/msm/dsi: Convert to clk_hw based provider APIs") from the clk tree. I fixed it up (the former removed some of the code updated by the latter) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/