From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755397AbbG0BOw (ORCPT ); Sun, 26 Jul 2015 21:14:52 -0400 Received: from ozlabs.org ([103.22.144.67]:50626 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755079AbbG0BOt (ORCPT ); Sun, 26 Jul 2015 21:14:49 -0400 Date: Mon, 27 Jul 2015 11:14:47 +1000 From: Stephen Rothwell To: Dave Airlie Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Vetter Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20150727111447.72daeeb3@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; i586-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 Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_crtc.c between commit: 5677d67ae394 ("drm: Stop resetting connector state to unknown") from Linus' tree and commit: 6295d607ad34 ("drm: Add modeset object iterators") from the drm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/gpu/drm/drm_crtc.c index fed748311b92,1f0da41ae2a1..000000000000 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@@ -5398,9 -5273,12 +5273,9 @@@ void drm_mode_config_reset(struct drm_d if (encoder->funcs->reset) encoder->funcs->reset(encoder); - list_for_each_entry(connector, &dev->mode_config.connector_list, head) - drm_for_each_connector(connector, dev) { - connector->status = connector_status_unknown; - ++ drm_for_each_connector(connector, dev) if (connector->funcs->reset) connector->funcs->reset(connector); - } } EXPORT_SYMBOL(drm_mode_config_reset);