From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932494AbbLVBEC (ORCPT ); Mon, 21 Dec 2015 20:04:02 -0500 Received: from ozlabs.org ([103.22.144.67]:59750 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932109AbbLVBEA (ORCPT ); Mon, 21 Dec 2015 20:04:00 -0500 Date: Tue, 22 Dec 2015 12:03:58 +1100 From: Stephen Rothwell To: Daniel Vetter , , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mika Kuoppala Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Message-ID: <20151222120358.0488e5ac@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.29; 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 drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_pm.c between commit: 344df9809f45 ("drm/i915/skl: Disable coarse power gating up until F0") from Linus' tree and commit: 06e668ac91c9 ("drm/i915: Apply broader WaRsDisableCoarsePowerGating for guc also") from the drm-intel tree. I fixed it up (I just used the latter version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au