From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754320AbbHNCAd (ORCPT ); Thu, 13 Aug 2015 22:00:33 -0400 Received: from ozlabs.org ([103.22.144.67]:39527 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751952AbbHNCAb (ORCPT ); Thu, 13 Aug 2015 22:00:31 -0400 Date: Fri, 14 Aug 2015 12:00:29 +1000 From: Stephen Rothwell To: Thierry Reding , Daniel Vetter , , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Maarten Lankhorst Subject: linux-next: manual merge of the drm-tegra tree with the drm-misc tree Message-ID: <20150814120029.101f6df6@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 Thierry, Today's linux-next merge of the drm-tegra tree got conflicts in: drivers/gpu/drm/tegra/dsi.c drivers/gpu/drm/tegra/hdmi.c drivers/gpu/drm/tegra/rgb.c drivers/gpu/drm/tegra/sor.c between commit: 9a69a9ac20f7 ("drm: Make the connector dpms callback return a value, v2") from the drm-misc tree and commits: 171e2e6dd912 ("drm/tegra: dsi: Restore DPMS") 29871b21c48c ("drm/tegra: hdmi: Restore DPMS") 32c3dee11e8e ("drm/tegra: rgb: Restore DPMS") 850bab448034 ("drm/tegra: sor: Restore DPMS") from the drm-tegra tree. I fixed it up (the latter commits removed the code updated by the former) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au